- fix #110 (implicit operator NRE)

- rev pb-net ref and fix schema test
- add example for #111
- add repro for #109

Author: mgravell

src/protobuf-net.Grpc.Reflection/protobuf-net.Grpc.Reflection.csproj

@@ -8,9 +8,9 @@
 
     <ItemGroup>
         <!-- note this uses v3 features that are not back-ported to v2 -->
-        <PackageReference Include="protobuf-net.Reflection" Version="3.0.21" />
-        <PackageReference Include="protobuf-net" Version="3.0.21" />
-        <PackageReference Include="protobuf-net.Core" Version="3.0.21" />
+        <PackageReference Include="protobuf-net.Reflection" Version="3.0.24" />
+        <PackageReference Include="protobuf-net" Version="3.0.24" />
+        <PackageReference Include="protobuf-net.Core" Version="3.0.24" />
     </ItemGroup>
 
     <ItemGroup>

src/protobuf-net.Grpc/Configuration/ClientFactory.cs

@@ -31,7 +31,7 @@ public static ClientFactory Create(BinderConfiguration? binderConfiguration = nu
         /// <summary>
         /// Get the binder configuration associated with this instance
         /// </summary>
-        public static implicit operator BinderConfiguration(ClientFactory value) => value.BinderConfiguration;
+        public static implicit operator BinderConfiguration(ClientFactory? value) => value?.BinderConfiguration ?? BinderConfiguration.Default;
 
         /// <summary>
         /// Create a service-client backed by a CallInvoker

tests/protobuf-net.Grpc.Reflection.Test/SchemaGeneration.cs

@@ -45,11 +45,11 @@ message MyResponse {
 }
 service MyService {
    rpc AsyncEmpty (.google.protobuf.Empty) returns (.google.protobuf.Empty);
-   rpc ClientStreaming (MyResponse) returns (stream MyRequest);
-   rpc FullDuplex (stream MyResponse) returns (stream MyRequest);
-   rpc ServerStreaming (stream MyResponse) returns (MyRequest);
+   rpc ClientStreaming (stream MyRequest) returns (MyResponse);
+   rpc FullDuplex (stream MyRequest) returns (stream MyResponse);
+   rpc ServerStreaming (MyRequest) returns (stream MyResponse);
    rpc SyncEmpty (.google.protobuf.Empty) returns (.google.protobuf.Empty);
-   rpc Unary (MyResponse) returns (MyRequest);
+   rpc Unary (MyRequest) returns (MyResponse);
 }
 ", schema, ignoreLineEndingDifferences: true);
         }

tests/protobuf-net.Grpc.Test.Integration/Issues/Issue109.cs

@@ -0,0 +1,44 @@
+using Grpc.Core;
+using System.Threading.Tasks;
+using ProtoBuf.Grpc.Server;
+using Xunit;
+
+namespace protobuf_net.Grpc.Test.Integration.Issues
+{
+    public class Issue109 // Server refuses to die!
+    {
+        [Fact(Skip = "definitely fails, but needs Grpc.Core input")]
+        public async Task Issue_109()
+        {
+            var port = 10050;
+
+            var server = new Server()
+            {
+                Ports = { new ServerPort("localhost", port, ServerCredentials.Insecure) }
+            };
+            // it seems that the port is already in use at this point
+
+            // try all kinds of ways to release the port
+            await server.ShutdownAsync();
+            // await server.KillAsync(); // kill also doesn't release, but can't Shutdown *and* Kill
+            await server.ShutdownTask;
+            
+
+            var server2 = new Server()
+            {
+                Ports = { new ServerPort("localhost", port, ServerCredentials.Insecure) }
+            };
+
+            // server2.Services.Add(...) // note: repros even without any services
+            server2.Start(); // <--- crash, socket is still in use.
+        }
+
+        public interface IVoid
+        {
+            ValueTask Void();
+        }
+        public class FooService : IVoid {
+            ValueTask IVoid.Void() => default;
+        }
+    }
+}

tests/protobuf-net.Grpc.Test.IntegrationUpLevel/protobuf-net.Grpc.Test.IntegrationUpLevel.csproj

@@ -11,7 +11,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
-		<PackageReference Include="protobuf-net" Version="3.0.21" />
+		<PackageReference Include="protobuf-net" Version="3.0.24" />
 		<PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
 		<PackageReference Include="xunit" Version="2.4.1" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">

tests/protobuf-net.Grpc.Test/Issues/Issue111.cs

@@ -0,0 +1,30 @@
+using Grpc.Core;
+using ProtoBuf.Grpc;
+using Xunit;
+
+namespace protobuf_net.Grpc.Test.Issues
+{
+    public class Issue111
+    {
+        [Fact]
+        public void DirectOptions()
+        {
+            var options = new CallOptions(new Metadata
+            {
+                { "Authorization", $"Bearer abc" }
+            });
+            Assert.Equal("Bearer abc", options.Headers.GetString("Authorization"));
+        }
+
+        [Fact]
+        public void TwoStepOptions()
+        {
+            var headers = new Metadata
+            {
+                { "Authorization", $"Bearer abc" }
+            };
+            var options = new CallOptions(headers);
+            Assert.Equal("Bearer abc", options.Headers.GetString("Authorization"));
+        }
+    }
+}