Merge remote-tracking branch 'upstream/master' into refactor/first-pass

# Conflicts:
#	.vscode/settings.json

Author: scgbear

.vscode/settings.json

@@ -0,0 +1,4 @@
+# Visual Studio - C#
+**/obj
+**/bin
+*.user

investigations/.gitignore

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29424.173
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetGrpcService", "DotNetGrpcService\DotNetGrpcService.csproj", "{51C71ABB-1D35-4543-898C-0D34EFF832FA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{51C71ABB-1D35-4543-898C-0D34EFF832FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51C71ABB-1D35-4543-898C-0D34EFF832FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51C71ABB-1D35-4543-898C-0D34EFF832FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51C71ABB-1D35-4543-898C-0D34EFF832FA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BB4EB881-58FA-4A49-838A-0F0824C47920}
+	EndGlobalSection
+EndGlobal

investigations/DotNetGrpc/DotNetGrpc.sln

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
+    
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Google.Protobuf" Version="3.10.0" />
     <PackageReference Include="Grpc.Net.Client" Version="2.23.2" />
@@ -16,4 +16,5 @@
   <ItemGroup>
     <Protobuf Include="Protos\greet.proto" GrpcServices="Client" />
   </ItemGroup>
+
 </Project>

investigations/DotNetGrpcClient/DotNetGrpcClient.csproj renamed to investigations/DotNetGrpc/DotNetGrpcClient/DotNetGrpcClient.csproj

@@ -4,9 +4,9 @@
 using DotNetGrpcService;
 using Grpc.Net.Client;
 
-namespace GrpcGreeterClient
+namespace DotNetGrpcClient
 {
-    class Program
+ class Program
     {
         static async Task Main(string[] args)
         {
@@ -18,9 +18,6 @@ static async Task Main(string[] args)
             Console.WriteLine("Calling Python Endpoint...");
             await CallEndpoint("http://localhost:50051", true);
 
-
-            Console.WriteLine("Press any key to exit...");
-            Console.ReadKey();
         }
 
         static GrpcChannel GetChannel(string grpcEndpointAddress, bool isInsecure = false)
@@ -35,8 +32,8 @@ static async Task CallEndpoint(string grpcEndpointAddress, bool isInsecure = fal
             var client = new Greeter.GreeterClient(channel);
 
             var reply = await client.SayHelloAsync(
-                              new HelloRequest { Name = "GreeterClient" });
-            Console.WriteLine("Greeting: " + reply.Message);
+                              new HelloRequest { Name = "GreeterClient-DotNet" });
+            Console.WriteLine($"Response: {reply.Message}");
         }
     }
-}
+}

investigations/DotNetGrpcClient/Program.cs renamed to investigations/DotNetGrpc/DotNetGrpcClient/Program.cs

@@ -18,4 +18,4 @@ message HelloRequest {
 // The response message containing the greetings.
 message HelloReply {
   string message = 1;
-}
+}

investigations/DotNetGrpcService/Protos/greet.proto renamed to investigations/DotNetGrpc/DotNetGrpcClient/Protos/greet.proto

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Protobuf Include="Protos\greet.proto" GrpcServices="Server" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Grpc.AspNetCore" Version="2.23.1" />
+  </ItemGroup>
+
+</Project>

investigations/DotNetGrpc/DotNetGrpcService/DotNetGrpcService.csproj

@@ -19,7 +19,7 @@ public override Task<HelloReply> SayHello(HelloRequest request, ServerCallContex
         {
             return Task.FromResult(new HelloReply
             {
-                Message = "Hello " + request.Name
+                Message = $"Hello {request.Name} from .NET gRPC Server"
             });
         }
     }