From 173ad469479f9ee3f8c761648155c373b53cbbd8 Mon Sep 17 00:00:00 2001 From: jc Date: Sun, 11 Jul 2021 22:43:09 +0800 Subject: [PATCH] add desc. --- README.md | 28 +++++++---- ...lus.Application.Protocol.CodeWriter.csproj | 1 + ...Regulus.Application.TemplateCreator.csproj | 1 + Regulus.Network/Regulus.Network.csproj | 1 + .../Regulus.Remote.Client.csproj | 2 +- .../Regulus.Remote.Ghost.csproj | 1 + .../Regulus.Remote.Protocol.csproj | 1 + .../Regulus.Remote.Reactive.csproj | 1 + .../Regulus.Remote.Server.csproj | 1 + .../Regulus.Remote.Soul.csproj | 2 +- .../Regulus.Remote.Standalone.csproj | 1 + .../Regulus.Remote.Tools.Protocol.targets | 11 ----- .../Regulus.Remote.Tools.Protocol.targets | 5 -- .../Assets/readme.txt | 0 .../CodeGenerator.cs | 33 ------------- .../Regulus.Remote.Tools.Protocol.csproj | 46 ------------------- Regulus.Remote/Regulus.Remote.csproj | 1 + .../Regulus.Serialization.csproj | 2 +- Regulus.sln | 10 ---- RegulusUtility | 2 +- 20 files changed, 31 insertions(+), 119 deletions(-) delete mode 100644 Regulus.Remote.Tools.Protocol/Assets/build/Regulus.Remote.Tools.Protocol.targets delete mode 100644 Regulus.Remote.Tools.Protocol/Assets/buildMultiTargeting/Regulus.Remote.Tools.Protocol.targets delete mode 100644 Regulus.Remote.Tools.Protocol/Assets/readme.txt delete mode 100644 Regulus.Remote.Tools.Protocol/CodeGenerator.cs delete mode 100644 Regulus.Remote.Tools.Protocol/Regulus.Remote.Tools.Protocol.csproj diff --git a/README.md b/README.md index 99b136fd..b37bdbfa 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,8 @@ Sample/Common>dotnet new classlib Add references to **Common.csproj**. ```xml - + + ``` Add a sample file,**IFoo.cs**. @@ -173,17 +174,24 @@ Sample/Protocol>dotnet new classlib Add references to **Protocol.csproj**. ```xml - - + ``` -**Generation the protocol code.** -Use ```Regulus.Application.Protocol.CodeWriter.dll``` to generate code to **Protocol** project. -```powershell -Sample>dotnet run --project Regulus/Regulus.Application.Protocol.CodeWriter --common Common.dll --output Protocol -``` At this point, there are two projects, **Common.csproj** and **Protocol.csproj**. + +### Generation the protocol code. +In ```Common.csproj``` specify the code export path. +```xml + + + + + + + +``` +Building **Common** in this way generates a code to **Protocol**. #### Server The following example sets up a server in console. @@ -193,7 +201,7 @@ Sample/Server>dotnet new console Add references to **Server.csproj**. ```xml - + ``` @@ -240,7 +248,7 @@ Sample/Client>dotnet new console Add references to **Client.csproj**. ```xml - + ``` diff --git a/Regulus.Application.Protocol.CodeWriter/Regulus.Application.Protocol.CodeWriter.csproj b/Regulus.Application.Protocol.CodeWriter/Regulus.Application.Protocol.CodeWriter.csproj index fe68eb01..96bafec6 100644 --- a/Regulus.Application.Protocol.CodeWriter/Regulus.Application.Protocol.CodeWriter.csproj +++ b/Regulus.Application.Protocol.CodeWriter/Regulus.Application.Protocol.CodeWriter.csproj @@ -9,6 +9,7 @@ jc true Regulus.Application.Protocol.CodeWriter + regulus remote protocol create tool. diff --git a/Regulus.Application.TemplateCreator/Regulus.Application.TemplateCreator.csproj b/Regulus.Application.TemplateCreator/Regulus.Application.TemplateCreator.csproj index ef117535..618e4793 100644 --- a/Regulus.Application.TemplateCreator/Regulus.Application.TemplateCreator.csproj +++ b/Regulus.Application.TemplateCreator/Regulus.Application.TemplateCreator.csproj @@ -8,6 +8,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc + quick project creation tool. diff --git a/Regulus.Network/Regulus.Network.csproj b/Regulus.Network/Regulus.Network.csproj index 80364350..0e59c2f8 100644 --- a/Regulus.Network/Regulus.Network.csproj +++ b/Regulus.Network/Regulus.Network.csproj @@ -6,6 +6,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc + network kits. diff --git a/Regulus.Remote.Client/Regulus.Remote.Client.csproj b/Regulus.Remote.Client/Regulus.Remote.Client.csproj index d7c89766..debb3772 100644 --- a/Regulus.Remote.Client/Regulus.Remote.Client.csproj +++ b/Regulus.Remote.Client/Regulus.Remote.Client.csproj @@ -7,7 +7,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc - + client. diff --git a/Regulus.Remote.Ghost/Regulus.Remote.Ghost.csproj b/Regulus.Remote.Ghost/Regulus.Remote.Ghost.csproj index f169a016..6490ba1c 100644 --- a/Regulus.Remote.Ghost/Regulus.Remote.Ghost.csproj +++ b/Regulus.Remote.Ghost/Regulus.Remote.Ghost.csproj @@ -5,6 +5,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc + frontend lib. diff --git a/Regulus.Remote.Protocol/Regulus.Remote.Protocol.csproj b/Regulus.Remote.Protocol/Regulus.Remote.Protocol.csproj index ed91f72d..bc78f355 100644 --- a/Regulus.Remote.Protocol/Regulus.Remote.Protocol.csproj +++ b/Regulus.Remote.Protocol/Regulus.Remote.Protocol.csproj @@ -6,6 +6,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc + protocol create lib. diff --git a/Regulus.Remote.Reactive/Regulus.Remote.Reactive.csproj b/Regulus.Remote.Reactive/Regulus.Remote.Reactive.csproj index 15b429cf..f53553ce 100644 --- a/Regulus.Remote.Reactive/Regulus.Remote.Reactive.csproj +++ b/Regulus.Remote.Reactive/Regulus.Remote.Reactive.csproj @@ -6,6 +6,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc + rx integration kit. diff --git a/Regulus.Remote.Server/Regulus.Remote.Server.csproj b/Regulus.Remote.Server/Regulus.Remote.Server.csproj index ba93b716..8a3e74d1 100644 --- a/Regulus.Remote.Server/Regulus.Remote.Server.csproj +++ b/Regulus.Remote.Server/Regulus.Remote.Server.csproj @@ -7,6 +7,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc + server. diff --git a/Regulus.Remote.Soul/Regulus.Remote.Soul.csproj b/Regulus.Remote.Soul/Regulus.Remote.Soul.csproj index ec67d1dd..602767a8 100644 --- a/Regulus.Remote.Soul/Regulus.Remote.Soul.csproj +++ b/Regulus.Remote.Soul/Regulus.Remote.Soul.csproj @@ -6,7 +6,7 @@ true https://github.com/jiowchern/Regulus.Remote jc - + backend lib. diff --git a/Regulus.Remote.Standalone/Regulus.Remote.Standalone.csproj b/Regulus.Remote.Standalone/Regulus.Remote.Standalone.csproj index 82cc844a..2450b52c 100644 --- a/Regulus.Remote.Standalone/Regulus.Remote.Standalone.csproj +++ b/Regulus.Remote.Standalone/Regulus.Remote.Standalone.csproj @@ -7,6 +7,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc + standalone. diff --git a/Regulus.Remote.Tools.Protocol/Assets/build/Regulus.Remote.Tools.Protocol.targets b/Regulus.Remote.Tools.Protocol/Assets/build/Regulus.Remote.Tools.Protocol.targets deleted file mode 100644 index 497aab4e..00000000 --- a/Regulus.Remote.Tools.Protocol/Assets/build/Regulus.Remote.Tools.Protocol.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)..\tasks\netstandard2.0\ - - - - - - \ No newline at end of file diff --git a/Regulus.Remote.Tools.Protocol/Assets/buildMultiTargeting/Regulus.Remote.Tools.Protocol.targets b/Regulus.Remote.Tools.Protocol/Assets/buildMultiTargeting/Regulus.Remote.Tools.Protocol.targets deleted file mode 100644 index 0771d58f..00000000 --- a/Regulus.Remote.Tools.Protocol/Assets/buildMultiTargeting/Regulus.Remote.Tools.Protocol.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Regulus.Remote.Tools.Protocol/Assets/readme.txt b/Regulus.Remote.Tools.Protocol/Assets/readme.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/Regulus.Remote.Tools.Protocol/CodeGenerator.cs b/Regulus.Remote.Tools.Protocol/CodeGenerator.cs deleted file mode 100644 index fb7a4813..00000000 --- a/Regulus.Remote.Tools.Protocol/CodeGenerator.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using System; - -namespace Regulus.Remote.Tools.Protocol -{ - public class CodeGenerator : Microsoft.Build.Utilities.Task - { - [Required] - public string InputFile { get; set; } - [Required] - public string OutputDir { get; set; } - - - public override bool Execute() - { - var inputPath = System.IO.Path.GetFullPath(InputFile); - var outputDir = System.IO.Path.GetFullPath(OutputDir); - Log.LogMessage(MessageImportance.High, $"RegulusRemoteProtocol Input is {inputPath}"); - Log.LogMessage(MessageImportance.High, $"RegulusRemoteProtocol Output is {outputDir}"); - if (!System.IO.File.Exists(inputPath)) - return false; - if (!System.IO.File.Exists(outputDir)) - return false; - - /*var asm = System.Reflection.Assembly.LoadFile(inputPath); - var outputer = new Regulus.Remote.Protocol.CodeOutputer(asm); - outputer.Output(outputDir); */ - - return true; - } - } -} diff --git a/Regulus.Remote.Tools.Protocol/Regulus.Remote.Tools.Protocol.csproj b/Regulus.Remote.Tools.Protocol/Regulus.Remote.Tools.Protocol.csproj deleted file mode 100644 index 2df882a0..00000000 --- a/Regulus.Remote.Tools.Protocol/Regulus.Remote.Tools.Protocol.csproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - netstandard2.0 - - - Regulus.Remote.Tools.Protocol - true - tasks - - true - true - - 0.1.9.1 - https://github.com/jiowchern/Regulus.Remote - jc - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Regulus.Remote/Regulus.Remote.csproj b/Regulus.Remote/Regulus.Remote.csproj index 0db807e6..c821b70b 100644 --- a/Regulus.Remote/Regulus.Remote.csproj +++ b/Regulus.Remote/Regulus.Remote.csproj @@ -6,6 +6,7 @@ 0.1.9.1 https://github.com/jiowchern/Regulus.Remote jc + remote core. diff --git a/Regulus.Serialization/Regulus.Serialization.csproj b/Regulus.Serialization/Regulus.Serialization.csproj index 949cd22e..ed7a529d 100644 --- a/Regulus.Serialization/Regulus.Serialization.csproj +++ b/Regulus.Serialization/Regulus.Serialization.csproj @@ -7,7 +7,7 @@ https://github.com/jiowchern/Regulus.Remote jc - + serialization lib. diff --git a/Regulus.sln b/Regulus.sln index f4dbbf2a..3dd6cfb2 100644 --- a/Regulus.sln +++ b/Regulus.sln @@ -63,9 +63,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Regulus.Remote.Standalone.Test", "Regulus.Remote.Standalone.Test\Regulus.Remote.Standalone.Test.csproj", "{82BAA92B-B238-4F83-B836-9D81C335393F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Regulus.Projects.TestProtocol.Common", "Regulus.Projects.TestProtocol.Common\Regulus.Projects.TestProtocol.Common.csproj", "{FBA5C01D-B12F-4C15-9A1F-2178761DC268}" - ProjectSection(ProjectDependencies) = postProject - {E95CCE80-055C-4E8C-9351-BE92B29DDD68} = {E95CCE80-055C-4E8C-9351-BE92B29DDD68} - EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Regulus.Projects.TestProtocol.Protocol", "Regulus.Projects.TestProtocol.Protocol\Regulus.Projects.TestProtocol.Protocol.csproj", "{C212EC33-8497-470B-AE2B-C993FDF34129}" EndProject @@ -77,8 +74,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Regulus.Utility", "RegulusU EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Regulus.Utility.Test", "RegulusUtility\Regulus.Utility.Test\Regulus.Utility.Test.csproj", "{4C4332A4-962B-494F-882B-5E254CCD7C29}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Regulus.Remote.Tools.Protocol", "Regulus.Remote.Tools.Protocol\Regulus.Remote.Tools.Protocol.csproj", "{E95CCE80-055C-4E8C-9351-BE92B29DDD68}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -177,10 +172,6 @@ Global {4C4332A4-962B-494F-882B-5E254CCD7C29}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C4332A4-962B-494F-882B-5E254CCD7C29}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C4332A4-962B-494F-882B-5E254CCD7C29}.Release|Any CPU.Build.0 = Release|Any CPU - {E95CCE80-055C-4E8C-9351-BE92B29DDD68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E95CCE80-055C-4E8C-9351-BE92B29DDD68}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E95CCE80-055C-4E8C-9351-BE92B29DDD68}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E95CCE80-055C-4E8C-9351-BE92B29DDD68}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -210,7 +201,6 @@ Global {1A57D297-F056-4C80-94DD-267B30A871A3} = {A088BA49-DE34-4F59-AF19-C82A94D7F834} {BBEA4BDD-AE30-4905-9EC8-398D14FC98C7} = {BF82B497-EC2D-4F8B-AF59-02AEC21A6B15} {4C4332A4-962B-494F-882B-5E254CCD7C29} = {F37C2CFD-4962-4E1B-96EB-E5E8928D217B} - {E95CCE80-055C-4E8C-9351-BE92B29DDD68} = {A088BA49-DE34-4F59-AF19-C82A94D7F834} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5F361C65-F7E7-4579-84BF-3D8DB0C9DABA} diff --git a/RegulusUtility b/RegulusUtility index 387b7f02..f3916bc7 160000 --- a/RegulusUtility +++ b/RegulusUtility @@ -1 +1 @@ -Subproject commit 387b7f0222b81889371b5b9d99ef40053e95f1e1 +Subproject commit f3916bc7b584010c31dee47d7ecdb4bd0a84b284