library updates

mgravell · mgravell · commit c95a139cc88b · 2021-01-25T16:20:46.000Z
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -27,12 +27,12 @@
 
     <ExampleRefs>local</ExampleRefs> <!-- local or nuget-->
     <PBGRPCLibVersion>1.0.110</PBGRPCLibVersion>
-    <GrpcDotNetVersion>2.33.1</GrpcDotNetVersion>
+    <GrpcDotNetVersion>2.34.0</GrpcDotNetVersion>
     <GoogleProtobufVersion>3.14.0</GoogleProtobufVersion>
-    <GrpcVersion>2.33.1</GrpcVersion>
+    <GrpcVersion>2.34.0</GrpcVersion>
 
     <ProtoBufNet2Version>2.4.6</ProtoBufNet2Version>
-    <ProtoBufNet3Version>3.0.62</ProtoBufNet3Version>
+    <ProtoBufNet3Version>3.0.73</ProtoBufNet3Version>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release' or '$(Configuration)'=='VS'">
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
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
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.7.0" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
-    <PackageReference Include="protobuf-net" Version="3.0.29" />
+    <PackageReference Include="protobuf-net" Version="3.0.73" />
     <PackageReference Include="protobuf-net.Grpc" Version="1.0.123" />
   </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
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.33.1" />
+    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.34.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0" />
   </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
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.31.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.34.0" />
   </ItemGroup>
 
   <ItemGroup>
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
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Net.Client" Version="2.30.0" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.34.0" />
   </ItemGroup>
 
   <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
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="System.ServiceModel.Primitives" Version="4.8.0" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
-    <PackageReference Include="protobuf-net" Version="3.0.29" />
+    <PackageReference Include="protobuf-net" Version="3.0.73" />
   </ItemGroup>
 
   <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
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.30.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.34.0" />
   </ItemGroup>
 
   <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
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.30.0" />
+    <PackageReference Include="Grpc.Net.ClientFactory" Version="2.34.0" />
   </ItemGroup>
 
   <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
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.30.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.34.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.7" />
   </ItemGroup>
 
diff --git a/src/protobuf-net.Grpc/ChannelAsyncEnumerableExtensions.cs b/src/protobuf-net.Grpc/ChannelAsyncEnumerableExtensions.cs
@@ -33,9 +33,9 @@ public static async IAsyncEnumerable<T> AsAsyncEnumerable<T>(this ChannelReader<
         {
             while (await reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false))
             {
-                while (reader.TryRead(out T item))
+                while (reader.TryRead(out T? item))
                 {
-                    yield return item;
+                    yield return item!;
                 }
             }
         }
@@ -79,9 +79,9 @@ static void TryCompleteWriter(object? state)
             {
                 while (await channel.Reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false))
                 {
-                    while (channel.Reader.TryRead(out T item))
+                    while (channel.Reader.TryRead(out T? item))
                     {
-                        yield return item;
+                        yield return item!;
                     }
                 }
             }
diff --git a/src/protobuf-net.Grpc/Configuration/ServiceBinder.cs b/src/protobuf-net.Grpc/Configuration/ServiceBinder.cs
@@ -19,7 +19,7 @@ public class ServiceBinder
         /// </summary>
         protected ServiceBinder() { }
 
-        private Dictionary<Type, InterfaceMapping> _map = new Dictionary<Type, InterfaceMapping>();
+        private readonly Dictionary<Type, InterfaceMapping> _map = new Dictionary<Type, InterfaceMapping>();
         private InterfaceMapping GetMap(Type contractType, Type serviceType)
         {
             if (!_map.TryGetValue(contractType, out var interfaceMapping))
diff --git a/tests/protobuf-net.Grpc.Reflection.Test/ReflectionServiceTests.cs b/tests/protobuf-net.Grpc.Reflection.Test/ReflectionServiceTests.cs
@@ -17,7 +17,7 @@ namespace protobuf_net.Grpc.Reflection.Test
 
     public class ReflectionServiceTests
     {
-        private static Lazy<MethodInfo> AddImportMethod = new Lazy<MethodInfo>(() => typeof(FileDescriptorProto).GetMethod("AddImport", BindingFlags.NonPublic | BindingFlags.Instance));
+        private static readonly Lazy<MethodInfo> AddImportMethod = new Lazy<MethodInfo>(() => typeof(FileDescriptorProto).GetMethod("AddImport", BindingFlags.NonPublic | BindingFlags.Instance)!);
 
         [Theory]
         [MemberData(nameof(Dependencies))]
@@ -42,7 +42,7 @@ public async Task ShouldIncludeDependenciesInCorrectOrder(Type service, string s
                     {
                         // Use reflection.
                         var addImportMethod = AddImportMethod.Value;
-                        addImportMethod.Invoke(fileDescriptor, new object[] {dependency, true, default});
+                        addImportMethod.Invoke(fileDescriptor, new object?[] {dependency, true, default});
                     }
 
                     fileDescriptorSet.Files.Add(fileDescriptor);

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public static async IAsyncEnumerable<T> AsAsyncEnumerable<T>(this ChannelReader<`
`33`	`33`	`{`
`34`	`34`	`while (await reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false))`
`35`	`35`	`{`
`36`		`- while (reader.TryRead(out T item))`
	`36`	`+ while (reader.TryRead(out T? item))`
`37`	`37`	`{`
`38`		`- yield return item;`
	`38`	`+ yield return item!;`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
`@@ -79,9 +79,9 @@ static void TryCompleteWriter(object? state)`
`79`	`79`	`{`
`80`	`80`	`while (await channel.Reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false))`
`81`	`81`	`{`
`82`		`- while (channel.Reader.TryRead(out T item))`
	`82`	`+ while (channel.Reader.TryRead(out T? item))`
`83`	`83`	`{`
`84`		`- yield return item;`
	`84`	`+ yield return item!;`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`