bring accross all the drift ahead of grpc-lite (#233)

mgravell · web-flow · commit c280e6236c6b · 2022-03-31T14:44:55.000+01:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,14 +22,14 @@
     <IncludeSymbols>false</IncludeSymbols>
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
     <Nullable>enable</Nullable>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <!--<CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Shared.ruleset</CodeAnalysisRuleset>-->
 
     <ExampleRefs>local</ExampleRefs> <!-- local or nuget-->
     <PBGRPCLibVersion>1.0.147</PBGRPCLibVersion>
-    <GrpcDotNetVersion>2.37.0</GrpcDotNetVersion>
-    <GoogleProtobufVersion>3.15.6</GoogleProtobufVersion>
-    <GrpcVersion>2.37.0</GrpcVersion>
+    <GrpcDotNetVersion>2.44.0</GrpcDotNetVersion>
+    <GoogleProtobufVersion>3.19.2</GoogleProtobufVersion>
+    <GrpcVersion>2.44.0</GrpcVersion>
 
     <ProtoBufNet2Version>2.4.6</ProtoBufNet2Version>
     <ProtoBufNet3Version>3.0.101</ProtoBufNet3Version>
diff --git a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTicker.Shared/TraderSys.FullStockTicker.Shared.csproj b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTicker.Shared/TraderSys.FullStockTicker.Shared.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerClientApp/TraderSys.FullStockTickerClientApp.csproj b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerClientApp/TraderSys.FullStockTickerClientApp.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UseWPF>true</UseWPF>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerServer/TraderSys.FullStockTickerServer.csproj b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerServer/TraderSys.FullStockTickerServer.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/FullStockTicker/src/TraderSys.StockMarket/TraderSys.StockMarket.csproj b/examples/wcf-port/FullStockTicker/src/TraderSys.StockMarket/TraderSys.StockMarket.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
 </Project>
diff --git a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.ClientConsole/TraderSys.SimpleStockTickerServer.ClientConsole.csproj b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.ClientConsole/TraderSys.SimpleStockTickerServer.ClientConsole.csproj
@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.Shared/TraderSys.SimpleStockTickerServer.Shared.csproj b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.Shared/TraderSys.SimpleStockTickerServer.Shared.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>TraderSys.SimpleStockTickerServer</RootNamespace>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer/TraderSys.SimpleStockTickerServer.csproj b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer/TraderSys.SimpleStockTickerServer.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/SimpleStockTicker/src/TraderSys.StockMarket/TraderSys.StockMarket.csproj b/examples/wcf-port/SimpleStockTicker/src/TraderSys.StockMarket/TraderSys.StockMarket.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
 </Project>
diff --git a/examples/wcf-port/TraderSys/src/TraderSys.PortfolioData/TraderSys.PortfolioData.csproj b/examples/wcf-port/TraderSys/src/TraderSys.PortfolioData/TraderSys.PortfolioData.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/TraderSys/src/TraderSys.Portfolios.ClientConsole/TraderSys.Portfolios.ClientConsole.csproj b/examples/wcf-port/TraderSys/src/TraderSys.Portfolios.ClientConsole/TraderSys.Portfolios.ClientConsole.csproj
@@ -4,6 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/TraderSys/src/TraderSys.Portfolios.Shared/TraderSys.Portfolios.Shared.csproj b/examples/wcf-port/TraderSys/src/TraderSys.Portfolios.Shared/TraderSys.Portfolios.Shared.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>TraderSys.Portfolios</RootNamespace>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/examples/wcf-port/TraderSys/src/TraderSys.Portfolios/TraderSys.Portfolios.csproj b/examples/wcf-port/TraderSys/src/TraderSys.Portfolios/TraderSys.Portfolios.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Nullable>disable</Nullable>
+    <GenerateDocumentationFile>false</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/protobuf-net.Grpc.AspNetCore.Reflection/protobuf-net.Grpc.AspNetCore.Reflection.csproj b/src/protobuf-net.Grpc.AspNetCore.Reflection/protobuf-net.Grpc.AspNetCore.Reflection.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <RootNamespace>ProtoBuf.Grpc.Server.Reflection</RootNamespace>
-    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/protobuf-net.Grpc.AspNetCore/ServicesExtensions.cs b/src/protobuf-net.Grpc.AspNetCore/ServicesExtensions.cs
@@ -63,27 +63,29 @@ protected override bool TryBind<TService, TRequest, TResponse>(ServiceBindContex
                 where TRequest : class
                 where TResponse : class
             {
-                var metadata = bindContext.GetMetadata(stub.Method);
-                
-                var context = (ServiceMethodProviderContext<TService>)bindContext.State;
-                switch (method.Type)
+                if (bindContext.State is ServiceMethodProviderContext<TService> context)
                 {
-                    case MethodType.Unary:
-                        context.AddUnaryMethod(method, metadata, stub.CreateDelegate<UnaryServerMethod<TService, TRequest, TResponse>>());
-                        break;
-                    case MethodType.ClientStreaming:
-                        context.AddClientStreamingMethod(method, metadata, stub.CreateDelegate<ClientStreamingServerMethod<TService, TRequest, TResponse>>());
-                        break;
-                    case MethodType.ServerStreaming:
-                        context.AddServerStreamingMethod(method, metadata, stub.CreateDelegate<ServerStreamingServerMethod<TService, TRequest, TResponse>>());
-                        break;
-                    case MethodType.DuplexStreaming:
-                        context.AddDuplexStreamingMethod(method, metadata, stub.CreateDelegate<DuplexStreamingServerMethod<TService, TRequest, TResponse>>());
-                        break;
-                    default:
-                        return false;
+                    var metadata = bindContext.GetMetadata(stub.Method);
+                    switch (method.Type)
+                    {
+                        case MethodType.Unary:
+                            context.AddUnaryMethod(method, metadata, stub.CreateDelegate<UnaryServerMethod<TService, TRequest, TResponse>>());
+                            break;
+                        case MethodType.ClientStreaming:
+                            context.AddClientStreamingMethod(method, metadata, stub.CreateDelegate<ClientStreamingServerMethod<TService, TRequest, TResponse>>());
+                            break;
+                        case MethodType.ServerStreaming:
+                            context.AddServerStreamingMethod(method, metadata, stub.CreateDelegate<ServerStreamingServerMethod<TService, TRequest, TResponse>>());
+                            break;
+                        case MethodType.DuplexStreaming:
+                            context.AddDuplexStreamingMethod(method, metadata, stub.CreateDelegate<DuplexStreamingServerMethod<TService, TRequest, TResponse>>());
+                            break;
+                        default:
+                            return false;
+                    }
+                    return true;
                 }
-                return true;
+                return base.TryBind(bindContext, method, stub);
             }
         }
     }
diff --git a/src/protobuf-net.Grpc.AspNetCore/protobuf-net.Grpc.AspNetCore.csproj b/src/protobuf-net.Grpc.AspNetCore/protobuf-net.Grpc.AspNetCore.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <RootNamespace>ProtoBuf.Grpc.Server</RootNamespace>
-    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/protobuf-net.Grpc.ClientFactory/protobuf-net.Grpc.ClientFactory.csproj b/src/protobuf-net.Grpc.ClientFactory/protobuf-net.Grpc.ClientFactory.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>ProtoBuf.Grpc.ClientFactory</RootNamespace>
-    <LangVersion>preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/protobuf-net.Grpc.Native/Server/ServiceDefinitionCollectionExtensions.cs b/src/protobuf-net.Grpc.Native/Server/ServiceDefinitionCollectionExtensions.cs
@@ -47,7 +47,7 @@ private static int AddCodeFirstImpl(ServiceDefinitionCollection services, object
             IEnumerable<Interceptor>? interceptors)
         {
             var builder = ServerServiceDefinition.CreateBuilder();
-            int count = Binder.Create(log).Bind(builder, serviceType, binderConfiguration, service);
+            int count = ServerBinder.Create(log).Bind(builder, serviceType, binderConfiguration, service);
             var serverServiceDefinition = builder.Build();
             
             if (interceptors is object)
@@ -61,52 +61,5 @@ private static int AddCodeFirstImpl(ServiceDefinitionCollection services, object
             services.Add(serverServiceDefinition);
             return count;
         }
-
-        private class Binder : ServerBinder
-        {
-            private readonly TextWriter? _log;
-            private Binder(TextWriter? log) => _log = log;
-            private static readonly Binder _default = new Binder(null);
-            public static Binder Create(TextWriter? log) => log == null ? _default : new Binder(log);
-
-            protected override void OnServiceBound(object state, string serviceName, Type serviceType, Type serviceContract, int operationCount)
-            {
-                base.OnServiceBound(state, serviceName, serviceType, serviceContract, operationCount);
-                _log?.WriteLine($"{serviceName} bound to {serviceType.Name} : {serviceContract.Name} with {operationCount} operation(s)");
-            }
-
-            protected override void OnError(string message, object?[]? args = null)
-                => _log?.WriteLine("[error] " + message, args ?? Array.Empty<object>());
-
-            protected override void OnWarn(string message, object?[]? args = null)
-                => _log?.WriteLine("[warning] " + message, args ?? Array.Empty<object>());
-
-            protected override bool TryBind<TService, TRequest, TResponse>(ServiceBindContext bindContext, Method<TRequest, TResponse> method, MethodStub<TService> stub)
-                where TService : class
-                where TRequest : class
-                where TResponse : class
-            {
-                var builder = (ServerServiceDefinition.Builder)bindContext.State;
-                switch (method.Type)
-                {
-                    case MethodType.Unary:
-                        builder.AddMethod(method, stub.CreateDelegate<UnaryServerMethod<TRequest, TResponse>>());
-                        break;
-                    case MethodType.ClientStreaming:
-                        builder.AddMethod(method, stub.CreateDelegate<ClientStreamingServerMethod<TRequest, TResponse>>());
-                        break;
-                    case MethodType.ServerStreaming:
-                        builder.AddMethod(method, stub.CreateDelegate<ServerStreamingServerMethod<TRequest, TResponse>>());
-                        break;
-                    case MethodType.DuplexStreaming:
-                        builder.AddMethod(method, stub.CreateDelegate<DuplexStreamingServerMethod<TRequest, TResponse>>());
-                        break;
-                    default:
-                        return false;
-                }
-                _log?.WriteLine($"{method.ServiceName} / {method.Name} ({method.Type}) bound to {stub.Method.DeclaringType?.Name}.{stub.Method.Name}");
-                return true;
-            }
-        }
     }
 }
diff --git a/src/protobuf-net.Grpc.Native/protobuf-net.Grpc.Native.csproj b/src/protobuf-net.Grpc.Native/protobuf-net.Grpc.Native.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>net461;netstandard2.0;net5.0</TargetFrameworks>
     <RootNamespace>ProtoBuf.Grpc</RootNamespace>
-    <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Grpc.Core" Version="$(GrpcVersion)" />
diff --git a/src/protobuf-net.Grpc.Reflection/protobuf-net.Grpc.Reflection.csproj b/src/protobuf-net.Grpc.Reflection/protobuf-net.Grpc.Reflection.csproj
@@ -3,7 +3,6 @@
     <PropertyGroup>
         <TargetFrameworks>net461;netstandard2.1;netstandard2.0;net5.0</TargetFrameworks>
         <RootNamespace>ProtoBuf.Grpc.Reflection</RootNamespace>
-        <LangVersion>preview</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/protobuf-net.Grpc/CallContext.cs b/src/protobuf-net.Grpc/CallContext.cs
@@ -68,7 +68,7 @@ public ServerCallContext? ServerCallContext
         /// <summary>
         /// The request headers associated with the operation; this will be valid for both server and client operations
         /// </summary>
-        public Metadata RequestHeaders
+        public Metadata? RequestHeaders
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => CallOptions.Headers;
@@ -95,7 +95,7 @@ public DateTime? Deadline
         /// <summary>
         /// The write options associated with the operation; this will be valid for both server and client operations
         /// </summary>
-        public WriteOptions WriteOptions
+        public WriteOptions? WriteOptions
         {
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get => CallOptions.WriteOptions;
diff --git a/src/protobuf-net.Grpc/Configuration/ServerBinder.Default.cs b/src/protobuf-net.Grpc/Configuration/ServerBinder.Default.cs
@@ -0,0 +1,108 @@
+﻿using Grpc.Core;
+using System;
+using System.IO;
+
+namespace ProtoBuf.Grpc.Configuration
+{
+    partial class ServerBinder
+    {
+        private static ServerBinder? s_Default;
+        internal static ServerBinder Default => s_Default ??= new ServerBinder(null);
+        TextWriter? _log;
+
+        /// <summary>
+        /// Create a new binder instance.
+        /// </summary>
+        protected ServerBinder() : this(null) { }
+        internal ServerBinder(TextWriter? log)
+        {
+            _log = log;
+        }
+
+        /// <summary>
+        /// The implementing binder should bind the method to the bind-state
+        /// </summary>
+        protected virtual bool TryBind<TService, TRequest, TResponse>(ServiceBindContext bindContext, Method<TRequest, TResponse> method, MethodStub<TService> stub)
+                where TService : class
+                where TRequest : class
+                where TResponse : class
+        {
+            try
+            {
+                if (bindContext.State is ServiceBinderBase binder)
+                {
+                    switch (method.Type)
+                    {
+                        case MethodType.Unary:
+                            binder.AddMethod(method, stub.CreateDelegate<UnaryServerMethod<TRequest, TResponse>>());
+                            break;
+                        case MethodType.ClientStreaming:
+                            binder.AddMethod(method, stub.CreateDelegate<ClientStreamingServerMethod<TRequest, TResponse>>());
+                            break;
+                        case MethodType.ServerStreaming:
+                            binder.AddMethod(method, stub.CreateDelegate<ServerStreamingServerMethod<TRequest, TResponse>>());
+                            break;
+                        case MethodType.DuplexStreaming:
+                            binder.AddMethod(method, stub.CreateDelegate<DuplexStreamingServerMethod<TRequest, TResponse>>());
+                            break;
+                        default:
+                            return false;
+                    }
+                }
+                else if (bindContext.State is ServerServiceDefinition.Builder builder)
+                {
+                    switch (method.Type)
+                    {
+                        case MethodType.Unary:
+                            builder.AddMethod(method, stub.CreateDelegate<UnaryServerMethod<TRequest, TResponse>>());
+                            break;
+                        case MethodType.ClientStreaming:
+                            builder.AddMethod(method, stub.CreateDelegate<ClientStreamingServerMethod<TRequest, TResponse>>());
+                            break;
+                        case MethodType.ServerStreaming:
+                            builder.AddMethod(method, stub.CreateDelegate<ServerStreamingServerMethod<TRequest, TResponse>>());
+                            break;
+                        case MethodType.DuplexStreaming:
+                            builder.AddMethod(method, stub.CreateDelegate<DuplexStreamingServerMethod<TRequest, TResponse>>());
+                            break;
+                        default:
+                            return false;
+                    }
+                }
+                else
+                {
+                    return false; // unexpected state object
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                OnError(ex.Message);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Publish a warning message
+        /// </summary>
+        protected internal virtual void OnWarn(string message, object?[]? args = null)
+            => _log?.WriteLine("[warning] " + message, args ?? Array.Empty<object>());
+
+        /// <summary>
+        /// Publish an error message
+        /// </summary>
+        protected internal virtual void OnError(string message, object?[]? args = null)
+            => _log?.WriteLine("[error] " + message, args ?? Array.Empty<object>());
+
+        /// <summary>
+        /// Reports the number of operations available for a service
+        /// </summary>
+        protected virtual void OnServiceBound(object state, string serviceName, Type serviceType, Type serviceContract, int operationCount)
+            => _log?.WriteLine($"{serviceName} bound to {serviceType.Name} : {serviceContract.Name} with {operationCount} operation(s)");
+
+        /// <summary>
+        /// Create a new binder instance
+        /// </summary>
+        public static ServerBinder Create(TextWriter? log) => log == null ? Default : new ServerBinder(log);
+    }
+}
diff --git a/src/protobuf-net.Grpc/Configuration/ServerBinder.cs b/src/protobuf-net.Grpc/Configuration/ServerBinder.cs
diff --git a/src/protobuf-net.Grpc/ServiceBinderBaseExtensions.cs b/src/protobuf-net.Grpc/ServiceBinderBaseExtensions.cs
diff --git a/src/protobuf-net.Grpc/protobuf-net.Grpc.csproj b/src/protobuf-net.Grpc/protobuf-net.Grpc.csproj
diff --git a/tests/protobuf-net.Grpc.Reflection.Test/protobuf-net.Grpc.Reflection.Test.csproj b/tests/protobuf-net.Grpc.Reflection.Test/protobuf-net.Grpc.Reflection.Test.csproj
diff --git a/tests/protobuf-net.Grpc.Test/Issues/Issue224.cs b/tests/protobuf-net.Grpc.Test/Issues/Issue224.cs
diff --git a/tests/protobuf-net.Grpc.Test/TestBindings.cs b/tests/protobuf-net.Grpc.Test/TestBindings.cs
diff --git a/tests/protobuf-net.Grpc.Test/protobuf-net.Grpc.Test.csproj b/tests/protobuf-net.Grpc.Test/protobuf-net.Grpc.Test.csproj
diff --git a/toys/PlayClient/PlayClient.csproj b/toys/PlayClient/PlayClient.csproj
diff --git a/toys/PlayServer/PlayServer.csproj b/toys/PlayServer/PlayServer.csproj
