diff --git a/Akari.Prototype.Client/Akari.Prototype.Client.csproj b/Akari.Prototype.Client/Akari.Prototype.Client.csproj index c916575..7d17bab 100644 --- a/Akari.Prototype.Client/Akari.Prototype.Client.csproj +++ b/Akari.Prototype.Client/Akari.Prototype.Client.csproj @@ -9,4 +9,7 @@ + + + diff --git a/Akari.Prototype.Server/Akari.Prototype.Server.csproj b/Akari.Prototype.Server/Akari.Prototype.Server.csproj index 3880de8..9185d4e 100644 --- a/Akari.Prototype.Server/Akari.Prototype.Server.csproj +++ b/Akari.Prototype.Server/Akari.Prototype.Server.csproj @@ -1,13 +1,9 @@ - + net5.0 - - - - @@ -15,4 +11,8 @@ + + + + diff --git a/Akari.Prototype.Server/Protos/greet.proto b/Akari.Prototype.Server/Protos/greet.proto deleted file mode 100644 index 94b8b43..0000000 --- a/Akari.Prototype.Server/Protos/greet.proto +++ /dev/null @@ -1,21 +0,0 @@ -syntax = "proto3"; - -option csharp_namespace = "Akari.Prototype.Server"; - -package greet; - -// The greeting service definition. -service Greeter { - // Sends a greeting - rpc SayHello (HelloRequest) returns (HelloReply); -} - -// The request message containing the user's name. -message HelloRequest { - string name = 1; -} - -// The response message containing the greetings. -message HelloReply { - string message = 1; -} diff --git a/Akari.Prototype.Server/Services/AkariService.cs b/Akari.Prototype.Server/Services/AkariService.cs index 4da6fe3..1ec588a 100644 --- a/Akari.Prototype.Server/Services/AkariService.cs +++ b/Akari.Prototype.Server/Services/AkariService.cs @@ -1,6 +1,6 @@ -using Akari.Prototype.Protos; using Akari.Prototype.Server.Services; using Akari.Prototype.Server.Utils; +using Akari.Prototype.Shared.Protos; using Google.Protobuf; using Grpc.Core; using Microsoft.Extensions.Logging; diff --git a/Akari.Prototype.Shared/Akari.Prototype.Shared.csproj b/Akari.Prototype.Shared/Akari.Prototype.Shared.csproj new file mode 100644 index 0000000..ce8975e --- /dev/null +++ b/Akari.Prototype.Shared/Akari.Prototype.Shared.csproj @@ -0,0 +1,24 @@ + + + + net5.0 + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + diff --git a/Akari.Prototype.Server/Protos/akari.proto b/Akari.Prototype.Shared/Protos/akari.proto similarity index 90% rename from Akari.Prototype.Server/Protos/akari.proto rename to Akari.Prototype.Shared/Protos/akari.proto index b94c3c3..3c6d2f6 100644 --- a/Akari.Prototype.Server/Protos/akari.proto +++ b/Akari.Prototype.Shared/Protos/akari.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option csharp_namespace = "Akari.Prototype.Protos"; +option csharp_namespace = "Akari.Prototype.Shared.Protos"; package akari; diff --git a/Akari.Prototype.sln b/Akari.Prototype.sln index 690ceb6..c17042b 100644 --- a/Akari.Prototype.sln +++ b/Akari.Prototype.sln @@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Akari.Prototype.Server", "A EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akari.Prototype.Client", "Akari.Prototype.Client\Akari.Prototype.Client.csproj", "{3CEA1E09-B799-42B5-A258-A5E549FEC0ED}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akari.Prototype.Shared", "Akari.Prototype.Shared\Akari.Prototype.Shared.csproj", "{F0555B06-E172-490C-BF5D-AFA8D837358B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {3CEA1E09-B799-42B5-A258-A5E549FEC0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {3CEA1E09-B799-42B5-A258-A5E549FEC0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {3CEA1E09-B799-42B5-A258-A5E549FEC0ED}.Release|Any CPU.Build.0 = Release|Any CPU + {F0555B06-E172-490C-BF5D-AFA8D837358B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0555B06-E172-490C-BF5D-AFA8D837358B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0555B06-E172-490C-BF5D-AFA8D837358B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0555B06-E172-490C-BF5D-AFA8D837358B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE