merge

Author: mgravell

Directory.Build.props

@@ -27,9 +27,9 @@
 
     <ExampleRefs>local</ExampleRefs> <!-- local or nuget-->
     <PBGRPCLibVersion>1.0.147</PBGRPCLibVersion>
-    <GrpcDotNetVersion>2.36.0</GrpcDotNetVersion>
+    <GrpcDotNetVersion>2.37.0</GrpcDotNetVersion>
     <GoogleProtobufVersion>3.15.6</GoogleProtobufVersion>
-    <GrpcVersion>2.36.1</GrpcVersion>
+    <GrpcVersion>2.37.0</GrpcVersion>
 
     <ProtoBufNet2Version>2.4.6</ProtoBufNet2Version>
     <ProtoBufNet3Version>3.0.101</ProtoBufNet3Version>

docs/createProtoFile.md

@@ -0,0 +1,49 @@
+# protobuf-net.Reflection
+
+## What is it?
+
+> ProtoBuf DSL (proto2 / proto3) and descriptor tools for protobuf-net
+
+It use to create .proto file for your service
+
+## Install?
+
+Install [`protobuf-net.Reflection`](https://www.nuget.org/packages/protobuf-net.Reflection) on your project
+
+## How use it?
+
+After install change your service and add these lines: 
+
+``` c#
+var generator = new SchemaGenerator
+{
+    ProtoSyntax = ProtoSyntax.Proto3
+};
+
+var schema = generator.GetSchema<ICalculator>(); // there is also a non-generic overload that takes Type
+
+using (var writer = new System.IO.StreamWriter("services.proto"))
+{
+    await writer.WriteAsync(schema);
+}
+```
+
+Now build your project. Your .proto file is exist on your bin/Debug or bin/Realase
+
+Output example:  
+
+```c#
+syntax = "proto3";
+package Hyper;
+
+message MultiplyRequest {
+   int32 X = 1;
+   int32 Y = 2;
+}
+message MultiplyResult {
+   int32 Result = 1;
+}
+service Calculator {
+   rpc Multiply (MultiplyRequest) returns (MultiplyResult);
+}
+```

docs/index.md

@@ -5,7 +5,8 @@
 - [Package Layout](projects)
 - [Build Tools ("code-first" focus)](https://protobuf-net.github.io/protobuf-net/build_tools)
 - [Build Tools ("contract-first" focus)](https://protobuf-net.github.io/protobuf-net/contract_first)
+- [Create Proto File](createProtoFile)
 
 Other Content
 
-- [My talk on gRPC at the .NET Core Summer Event, 2019](talks/gRPC.pptx)
+- [My talk on gRPC at the .NET Core Summer Event, 2019](talks/gRPC.pptx)

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>ProtoBuf.Grpc.ClientFactory</RootNamespace>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>

src/protobuf-net.Grpc/CallContext.Streaming.cs

@@ -31,21 +31,26 @@ private static async IAsyncEnumerable<TResponse> FullDuplexImpl<TRequest, TRespo
             [EnumeratorCancellation] CancellationToken cancellationToken)
         {
             using var allDone = CancellationTokenSource.CreateLinkedTokenSource(context.CancellationToken, cancellationToken);
+            Task? consumed = null;
             try
             {
                 context = new CallContext(context, allDone.Token);
-                var consumed = Task.Run(() => consumer(source, context).AsTask(), allDone.Token); // note this shares a capture scope
+                consumed = Task.Run(() => consumer(source, context).AsTask(), allDone.Token); // note this shares a capture scope
 
                 await foreach (var value in producer(context).WithCancellation(cancellationToken).ConfigureAwait(false))
                 {
                     yield return value;
                 }
-                await consumed.ConfigureAwait(false);
             }
             finally
             {
                 // stop the producer, in any exit scenario
                 allDone.Cancel();
+                
+                if (consumed != null)
+                {
+                    await consumed.ConfigureAwait(false);
+                }
             }
         }
 
@@ -68,10 +73,11 @@ private static async IAsyncEnumerable<TResponse> FullDuplexImpl<TRequest, TRespo
             [EnumeratorCancellation] CancellationToken cancellationToken)
         {
             using var allDone = CancellationTokenSource.CreateLinkedTokenSource(context.CancellationToken, cancellationToken);
+            Task? consumed = null;
             try
             {
                 context = new CallContext(context, allDone.Token);
-                var consumed = Task.Run(async () =>
+                consumed = Task.Run(async () =>
                 {// note this shares a capture scope
                     await foreach (var value in source.WithCancellation(allDone.Token).ConfigureAwait(false))
                     {
@@ -82,12 +88,16 @@ private static async IAsyncEnumerable<TResponse> FullDuplexImpl<TRequest, TRespo
                 {
                     yield return value;
                 }
-                await consumed.ConfigureAwait(false);
             }
             finally
             {
                 // stop the producer, in any exit scenario
                 allDone.Cancel();
+
+                if (consumed != null)
+                {
+                    await consumed.ConfigureAwait(false);
+                }
             }
         }
 

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

@@ -4,7 +4,7 @@
 namespace ProtoBuf.Grpc.Configuration
 {
     /// <summary>
-    /// Explicitly indicates that a metho represents a gRPC method
+    /// Explicitly indicates that a method represents a gRPC method
     /// </summary>
     [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
     [ImmutableObject(true)]

src/protobuf-net.Grpc/Internal/Reshape.cs

@@ -520,7 +520,14 @@ static async Task SendAll<T>(IClientStreamWriter<T> output, IAsyncEnumerable<T>
             }
             catch
             {
-                allDone.Cancel();
+                if (!allDone.IsCancellationRequested)
+                {
+                    try
+                    {
+                        allDone.Cancel();
+                    }
+                    catch { } // calls to "Cancel" can race, ignore the exception if we lose the race
+                }
                 throw;
             }
         }