Update many NuGet packages to latest verions (#1221)

JamesNK · web-flow · commit 761bfe8f7156 · 2021-03-09T13:30:49.000+13:00
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -23,7 +23,7 @@
   <ItemGroup Condition="'$(IsGrpcPublishedPackage)' == 'true'">
     <None Include="$(PackageIconFullPath)" Pack="true" PackagePath="\"/>
 
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="$(MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="$(MicrosoftCodeAnalysisNetAnalyzersPackageVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubPackageVersion)" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -1,30 +1,30 @@
 <Project>
   <PropertyGroup>
     <BenchmarkDotNetPackageVersion>0.12.1</BenchmarkDotNetPackageVersion>
-    <GoogleProtobufPackageVersion>3.14.0</GoogleProtobufPackageVersion>
+    <GoogleProtobufPackageVersion>3.15.5</GoogleProtobufPackageVersion>
     <GrpcDotNetPackageVersion>2.33.1</GrpcDotNetPackageVersion>  <!-- Used by example projects -->
     <GrpcPackageVersion>2.35.0</GrpcPackageVersion>
-    <MicrosoftAspNetCoreAppPackageVersion>5.0.0</MicrosoftAspNetCoreAppPackageVersion>
+    <MicrosoftAspNetCoreAppPackageVersion>5.0.3</MicrosoftAspNetCoreAppPackageVersion>
     <MicrosoftAspNetCoreApp31PackageVersion>3.1.3</MicrosoftAspNetCoreApp31PackageVersion>
     <MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
     <MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
-    <MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>3.0.0</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersPackageVersion>5.0.3</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
     <MicrosoftExtensionsLoggingTestingPackageVersion>2.1.1</MicrosoftExtensionsLoggingTestingPackageVersion>
     <MicrosoftExtensionsPackageVersion>3.0.3</MicrosoftExtensionsPackageVersion>
-    <MicrosoftNETTestSdkPackageVersion>16.6.1</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>16.9.1</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftSourceLinkGitHubPackageVersion>1.0.0</MicrosoftSourceLinkGitHubPackageVersion>
     <MicrosoftTyePackageVersion>0.5.0-alpha.20555.1</MicrosoftTyePackageVersion>
     <MicrosoftWin32RegistryLinePackageVersion>4.6.0</MicrosoftWin32RegistryLinePackageVersion>
-    <MoqPackageVersion>4.10.0</MoqPackageVersion>
+    <MoqPackageVersion>4.16.1</MoqPackageVersion>
     <NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
-    <NunitPackageVersion>3.12.0</NunitPackageVersion>
+    <NunitPackageVersion>3.13.1</NunitPackageVersion>
     <Nunit3TestAdapterPackageVersion>3.16.1</Nunit3TestAdapterPackageVersion>
     <OpenTelemetryPackageVersion>0.6.0-beta.1</OpenTelemetryPackageVersion>
     <ProtobufNetGrpcPackageVersion>1.0.140</ProtobufNetGrpcPackageVersion>
     <SystemCommandLinePackageVersion>2.0.0-beta1.20214.1</SystemCommandLinePackageVersion>
     <SystemCommandLineRenderingPackageVersion>0.3.0-alpha.20214.1</SystemCommandLineRenderingPackageVersion>
     <SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
-    <SystemIOPipelinesPackageVersion>4.7.2</SystemIOPipelinesPackageVersion>
+    <SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
     <SystemMemoryPackageVersion>4.5.3</SystemMemoryPackageVersion>
     <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0</SystemNetHttpWinHttpHandlerPackageVersion>
     <SystemSecurityPrincipalWindowsPackageVersion>4.6.0</SystemSecurityPrincipalWindowsPackageVersion>
diff --git a/src/Grpc.AspNetCore.Server.ClientFactory/GrpcServerHttpClientBuilderExtensions.cs b/src/Grpc.AspNetCore.Server.ClientFactory/GrpcServerHttpClientBuilderExtensions.cs
@@ -84,8 +84,7 @@ private static void ValidateGrpcClient(IHttpClientBuilder builder)
                 if (service.ServiceType == typeof(IConfigureOptions<GrpcClientFactoryOptions>))
                 {
                     // Builder is from AddGrpcClient if options have been configured with the same name
-                    var namedOptions = service.ImplementationInstance as ConfigureNamedOptions<GrpcClientFactoryOptions>;
-                    if (namedOptions != null && string.Equals(builder.Name, namedOptions.Name, StringComparison.Ordinal))
+                    if (service.ImplementationInstance is ConfigureNamedOptions<GrpcClientFactoryOptions> namedOptions && string.Equals(builder.Name, namedOptions.Name, StringComparison.Ordinal))
                     {
                         return;
                     }
diff --git a/src/Grpc.AspNetCore.Server.Reflection/GrpcReflectionServiceExtensions.cs b/src/Grpc.AspNetCore.Server.Reflection/GrpcReflectionServiceExtensions.cs
@@ -69,8 +69,7 @@ public static IServiceCollection AddGrpcReflection(this IServiceCollection servi
                     var descriptorPropertyInfo = definitionType?.GetProperty("Descriptor", BindingFlags.Public | BindingFlags.Static);
                     if (descriptorPropertyInfo != null)
                     {
-                        var serviceDescriptor = descriptorPropertyInfo.GetValue(null) as Google.Protobuf.Reflection.ServiceDescriptor;
-                        if (serviceDescriptor != null)
+                        if (descriptorPropertyInfo.GetValue(null) is Google.Protobuf.Reflection.ServiceDescriptor serviceDescriptor)
                         {
                             serviceDescriptors.Add(serviceDescriptor);
                             continue;
diff --git a/src/Grpc.AspNetCore.Server/GrpcServiceOptions.cs b/src/Grpc.AspNetCore.Server/GrpcServiceOptions.cs
@@ -71,7 +71,7 @@ public int? MaxReceiveMessageSize
         /// Gets or sets a value indicating whether detailed error messages are sent to the peer.
         /// Detailed error messages include details from exceptions thrown on the server.
         /// </summary>
-        public bool? EnableDetailedErrors { get; set; } = null;
+        public bool? EnableDetailedErrors { get; set; }
 
         /// <summary>
         /// Gets or sets the compression algorithm used to compress messages sent from the server.
diff --git a/src/Grpc.AspNetCore.Server/Internal/PipeExtensions.cs b/src/Grpc.AspNetCore.Server/Internal/PipeExtensions.cs
@@ -262,7 +262,6 @@ public static async ValueTask<T> ReadSingleMessageAsync<T>(this PipeReader input
             {
                 GrpcServerLog.ReadingMessage(logger);
 
-                ReadOnlySequence<byte>? data;
                 while (true)
                 {
                     var completeMessage = false;
@@ -278,7 +277,7 @@ public static async ValueTask<T> ReadSingleMessageAsync<T>(this PipeReader input
 
                         if (!buffer.IsEmpty)
                         {
-                            if (TryReadMessage(ref buffer, serverCallContext, out data))
+                            if (TryReadMessage(ref buffer, serverCallContext, out var data))
                             {
                                 completeMessage = true;
 
diff --git a/src/Grpc.AspNetCore.Server/Internal/X509CertificateHelpers.cs b/src/Grpc.AspNetCore.Server/Internal/X509CertificateHelpers.cs
@@ -73,8 +73,8 @@ private static class X509SubjectAlternativeNameConstants
             private static readonly char s_delimiter;
             private static readonly string? s_separator;
 
-            private static bool s_successfullyInitialized = false;
-            private static Exception? s_initializationException;
+            private static readonly bool s_successfullyInitialized;
+            private static readonly Exception? s_initializationException;
 
             public static string Identifier
             {
diff --git a/src/Grpc.Net.Client/GrpcChannel.cs b/src/Grpc.Net.Client/GrpcChannel.cs
@@ -81,7 +81,7 @@ public sealed class GrpcChannel : ChannelBase, IDisposable
         internal bool DisableClientDeadline;
         internal long MaxTimerDueTime = uint.MaxValue - 1; // Max System.Threading.Timer due time
 
-        private bool _shouldDisposeHttpClient;
+        private readonly bool _shouldDisposeHttpClient;
 
         internal GrpcChannel(Uri address, GrpcChannelOptions channelOptions) : base(address.Authority)
         {
diff --git a/src/Grpc.Net.Client/Internal/GrpcCall.cs b/src/Grpc.Net.Client/Internal/GrpcCall.cs
@@ -570,8 +570,7 @@ private async Task RunCall(HttpRequestMessage request, TimeSpan? timeout)
                 }
                 catch (Exception ex)
                 {
-                    Exception resolvedException;
-                    ResolveException(ErrorStartingCallMessage, ex, out status, out resolvedException);
+                    ResolveException(ErrorStartingCallMessage, ex, out status, out var resolvedException);
 
                     finished = FinishCall(request, diagnosticSourceEnabled, activity, status.Value);
                     _responseTcs?.TrySetException(resolvedException);
diff --git a/src/Grpc.Net.Client/Internal/HttpContentClientStreamReader.cs b/src/Grpc.Net.Client/Internal/HttpContentClientStreamReader.cs
@@ -145,7 +145,11 @@ private async Task<bool> MoveNextCore(CancellationToken cancellationToken)
                 {
                     try
                     {
+#if NET5_0
+                        _responseStream = await _httpResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
+#else
                         _responseStream = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);
+#endif
                     }
                     catch (ObjectDisposedException)
                     {
diff --git a/src/Grpc.Net.Client/Internal/StreamExtensions.cs b/src/Grpc.Net.Client/Internal/StreamExtensions.cs
@@ -159,7 +159,7 @@ private static Status CreateUnknownMessageEncodingMessageStatus(string unsupport
                 {
                     // Check that there is no additional content in the stream for a single message
                     // There is no ReadByteAsync on stream. Reuse header array with ReadAsync, we don't need it anymore
-                    if (await responseStream.ReadAsync(buffer).ConfigureAwait(false) > 0)
+                    if (await responseStream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false) > 0)
                     {
                         throw new InvalidDataException("Unexpected data after finished reading message.");
                     }
diff --git a/src/Grpc.Net.ClientFactory/Internal/DefaultClientActivator.cs b/src/Grpc.Net.ClientFactory/Internal/DefaultClientActivator.cs
@@ -35,12 +35,7 @@ internal class DefaultClientActivator<TClient> where TClient : class
 
         public DefaultClientActivator(IServiceProvider services)
         {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            _services = services;
+            _services = services ?? throw new ArgumentNullException(nameof(services));
         }
 
         public ObjectFactory Activator
diff --git a/src/Shared/CommonGrpcProtocolHelpers.cs b/src/Shared/CommonGrpcProtocolHelpers.cs
@@ -101,7 +101,7 @@ private static string BuildErrorMessage(Exception ex)
             {
                 if (!first)
                 {
-                    sb.Append(" ");
+                    sb.Append(' ');
                 }
                 else
                 {
diff --git a/src/Shared/HttpHandlerFactory.cs b/src/Shared/HttpHandlerFactory.cs
@@ -79,8 +79,7 @@ public static bool HasHttpHandlerType(HttpMessageHandler handler, string handler
             }
 
             HttpMessageHandler? currentHandler = handler;
-            DelegatingHandler? delegatingHandler;
-            while ((delegatingHandler = currentHandler as DelegatingHandler) != null)
+            while (currentHandler is DelegatingHandler delegatingHandler)
             {
                 currentHandler = delegatingHandler.InnerHandler;
 
diff --git a/test/FunctionalTests/Infrastructure/GrpcTestContext.cs b/test/FunctionalTests/Infrastructure/GrpcTestContext.cs
@@ -27,7 +27,7 @@
 
 namespace Grpc.AspNetCore.FunctionalTests.Infrastructure
 {
-    public class GrpcTestContext : IDisposable
+    public sealed class GrpcTestContext : IDisposable
     {
         private readonly ServiceProvider _serviceProvider;
         private readonly ConcurrentDictionary<string, ILogger> _serverLoggers;
@@ -108,7 +108,7 @@ public void Dispose()
 
         private string GetTestName()
         {
-            var className = TestContext.CurrentContext.Test.ClassName;
+            var className = TestContext.CurrentContext.Test.ClassName!;
             var periodIndex = className.LastIndexOf('.');
             if (periodIndex > 0)
             {
diff --git a/test/Grpc.AspNetCore.Server.ClientFactory.Tests/DefaultGrpcClientFactoryTests.cs b/test/Grpc.AspNetCore.Server.ClientFactory.Tests/DefaultGrpcClientFactoryTests.cs
@@ -46,7 +46,7 @@ public void EnableCallContextPropagation_NotFromGrpcClientFactory_ThrowError()
             var services = new ServiceCollection();
             var clientBuilder = services.AddHttpClient("TestClient");
 
-            var ex = Assert.Throws<InvalidOperationException>(() => clientBuilder.EnableCallContextPropagation());
+            var ex = Assert.Throws<InvalidOperationException>(() => clientBuilder.EnableCallContextPropagation())!;
             Assert.AreEqual("EnableCallContextPropagation must be used with a gRPC client.", ex.Message);
         }
 
@@ -57,7 +57,7 @@ public void EnableCallContextPropagation_NotFromGrpcClientFactoryAndExistingGrpc
             services.AddGrpcClient<Greeter.GreeterClient>();
             var clientBuilder = services.AddHttpClient("TestClient");
 
-            var ex = Assert.Throws<InvalidOperationException>(() => clientBuilder.EnableCallContextPropagation());
+            var ex = Assert.Throws<InvalidOperationException>(() => clientBuilder.EnableCallContextPropagation())!;
             Assert.AreEqual("EnableCallContextPropagation must be used with a gRPC client.", ex.Message);
         }
 
diff --git a/test/Grpc.AspNetCore.Server.Tests/GrpcEndpointRouteBuilderExtensionsTests.cs b/test/Grpc.AspNetCore.Server.Tests/GrpcEndpointRouteBuilderExtensionsTests.cs
@@ -45,7 +45,7 @@ public void MapGrpcService_WithoutServices_RaiseError()
             var routeBuilder = CreateTestEndpointRouteBuilder(services.BuildServiceProvider(validateScopes: true));
 
             // Act & Assert
-            var ex = Assert.Throws<InvalidOperationException>(() => routeBuilder.MapGrpcService<Greeter.GreeterBase>());
+            var ex = Assert.Throws<InvalidOperationException>(() => routeBuilder.MapGrpcService<Greeter.GreeterBase>())!;
             Assert.AreEqual("Unable to find the required services. Please add all the required services by calling " +
                     "'IServiceCollection.AddGrpc' inside the call to 'ConfigureServices(...)' in the application startup code.", ex.Message);
         }
@@ -59,7 +59,7 @@ public void MapGrpcService_CantBind_RaiseError()
             var routeBuilder = CreateTestEndpointRouteBuilder(services.BuildServiceProvider(validateScopes: true));
 
             // Act & Assert
-            var ex = Assert.Throws<InvalidOperationException>(() => routeBuilder.MapGrpcService<ErrorService>());
+            var ex = Assert.Throws<InvalidOperationException>(() => routeBuilder.MapGrpcService<ErrorService>())!;
             Assert.AreEqual("Error binding gRPC service 'ErrorService'.", ex.Message);
             Assert.AreEqual("Error!", ex.InnerException?.InnerException?.Message);
         }
@@ -296,7 +296,7 @@ public void MapGrpcService_NoMatchingCompressionProvider_ThrowError()
             var ex = Assert.Throws<InvalidOperationException>(() =>
             {
                 routeBuilder.MapGrpcService<GreeterWithAttributeService>();
-            });
+            })!;
 
             // Assert
             Assert.AreEqual("Error binding gRPC service 'GreeterWithAttributeService'.", ex.Message);
diff --git a/test/Grpc.AspNetCore.Server.Tests/InterceptorCollectionTests.cs b/test/Grpc.AspNetCore.Server.Tests/InterceptorCollectionTests.cs
@@ -48,7 +48,7 @@ public void Add_NonGenericInterceptorBaseType_ThrowError()
             var interceptors = new InterceptorCollection();
 
             // Act
-            var ex = Assert.Throws<ArgumentException>(() => interceptors.Add(typeof(Interceptor)));
+            var ex = Assert.Throws<ArgumentException>(() => interceptors.Add(typeof(Interceptor)))!;
 
             // Assert
             Assert.AreEqual("Type must inherit from Grpc.Core.Interceptors.Interceptor. (Parameter 'interceptorType')", ex.Message);
@@ -76,7 +76,7 @@ public void Add_GenericInterceptorBaseType_AddedToCollection()
             var interceptors = new InterceptorCollection();
 
             // Act
-            var ex = Assert.Throws<ArgumentException>(() => interceptors.Add<Interceptor>());
+            var ex = Assert.Throws<ArgumentException>(() => interceptors.Add<Interceptor>())!;
 
             // Assert
             Assert.AreEqual("Type must inherit from Grpc.Core.Interceptors.Interceptor. (Parameter 'interceptorType')", ex.Message);
diff --git a/test/Grpc.AspNetCore.Server.Tests/PercentEncodingHelpersTests.cs b/test/Grpc.AspNetCore.Server.Tests/PercentEncodingHelpersTests.cs
@@ -141,13 +141,13 @@ public void PercentEncode_LargeUnicodeString_OverflowErrorThrown()
             var originalText = new string('元', int.MaxValue / 8);
 
             // Act
-            var ex = Assert.Throws<InvalidOperationException>(() => PercentEncodingHelpers.PercentEncode(originalText));
+            var ex = Assert.Throws<InvalidOperationException>(() => PercentEncodingHelpers.PercentEncode(originalText))!;
 
             // Assert
             Assert.AreEqual("Value is too large to encode.", ex.Message);
         }
 
-        private static TestCaseData[] ValidPercentEncodingTestCases =
+        private static readonly TestCaseData[] ValidPercentEncodingTestCases =
         {
             new TestCaseData("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~", "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.~"),
             new TestCaseData("\x00", "%00"),
diff --git a/test/Grpc.AspNetCore.Server.Tests/ServerCallContextExtensionsTests.cs b/test/Grpc.AspNetCore.Server.Tests/ServerCallContextExtensionsTests.cs
@@ -43,7 +43,7 @@ public void GetHttpContext_CustomServerCallContext_Error()
         {
             var serverCallContext = new TestServerCallContext(DateTime.MinValue, CancellationToken.None);
 
-            var ex = Assert.Throws<InvalidOperationException>(() => serverCallContext.GetHttpContext());
+            var ex = Assert.Throws<InvalidOperationException>(() => serverCallContext.GetHttpContext())!;
             Assert.AreEqual("Could not get HttpContext from ServerCallContext. HttpContext can only be accessed when gRPC services are hosted by ASP.NET Core.", ex.Message);
         }
 
diff --git a/test/Grpc.AspNetCore.Server.Tests/Web/GrpcWebProtocolHelpersTests.cs b/test/Grpc.AspNetCore.Server.Tests/Web/GrpcWebProtocolHelpersTests.cs
@@ -133,7 +133,7 @@ public void WriteTrailers_InvalidHeaderName_Error()
             var output = new ArrayBufferWriter<byte>();
 
             // Act
-            var ex = Assert.Throws<InvalidOperationException>(() => GrpcWebProtocolHelpers.WriteTrailers(trailers, output));
+            var ex = Assert.Throws<InvalidOperationException>(() => GrpcWebProtocolHelpers.WriteTrailers(trailers, output))!;
 
             // Assert
             Assert.AreEqual("Invalid non-ASCII or control character in header: 0x000D", ex.Message);
@@ -148,7 +148,7 @@ public void WriteTrailers_InvalidHeaderValue_Error()
             var output = new ArrayBufferWriter<byte>();
 
             // Act
-            var ex = Assert.Throws<InvalidOperationException>(() => GrpcWebProtocolHelpers.WriteTrailers(trailers, output));
+            var ex = Assert.Throws<InvalidOperationException>(() => GrpcWebProtocolHelpers.WriteTrailers(trailers, output))!;
 
             // Assert
             Assert.AreEqual("Invalid non-ASCII or control character in header: 0x007F", ex.Message);
diff --git a/test/Grpc.Net.Client.Tests/CancellationTests.cs b/test/Grpc.Net.Client.Tests/CancellationTests.cs
@@ -132,7 +132,7 @@ public void AsyncClientStreamingCall_CancellationDuringSend_TrailersThrowsInvali
             // Assert
             cts.Cancel();
 
-            var ex = Assert.Throws<InvalidOperationException>(() => call.GetTrailers());
+            var ex = Assert.Throws<InvalidOperationException>(() => call.GetTrailers())!;
 
             Assert.AreEqual("Can't get the call trailers because the call has not completed successfully.", ex.Message);
             Assert.AreEqual(StatusCode.Cancelled, call.GetStatus().StatusCode);
diff --git a/test/Grpc.Net.Client.Tests/GetStatusTests.cs b/test/Grpc.Net.Client.Tests/GetStatusTests.cs
@@ -258,7 +258,7 @@ public async Task AsyncUnaryCall_CallInProgress_ThrowError()
 
             // Act
             var call = invoker.AsyncUnaryCall<HelloRequest, HelloReply>(ClientTestHelpers.ServiceMethod, string.Empty, new CallOptions(), new HelloRequest());
-            var ex = Assert.Throws<InvalidOperationException>(() => call.GetStatus());
+            var ex = Assert.Throws<InvalidOperationException>(() => call.GetStatus())!;
 
             // Assert
             Assert.AreEqual("Unable to get the status because the call is not complete.", ex.Message);
diff --git a/test/Grpc.Net.Client.Tests/GetTrailersTests.cs b/test/Grpc.Net.Client.Tests/GetTrailersTests.cs
diff --git a/test/Grpc.Net.Client.Tests/GrpcCallSerializationContextTests.cs b/test/Grpc.Net.Client.Tests/GrpcCallSerializationContextTests.cs
diff --git a/test/Grpc.Net.Client.Tests/GrpcChannelTests.cs b/test/Grpc.Net.Client.Tests/GrpcChannelTests.cs
diff --git a/test/Grpc.Net.Client.Tests/ServiceConfigTests.cs b/test/Grpc.Net.Client.Tests/ServiceConfigTests.cs
diff --git a/test/Grpc.Net.ClientFactory.Tests/DefaultGrpcClientFactoryTests.cs b/test/Grpc.Net.ClientFactory.Tests/DefaultGrpcClientFactoryTests.cs
diff --git a/test/Grpc.Net.ClientFactory.Tests/GrpcClientServiceExtensionsTests.cs b/test/Grpc.Net.ClientFactory.Tests/GrpcClientServiceExtensionsTests.cs
diff --git a/test/Grpc.Net.ClientFactory.Tests/GrpcHttpClientBuilderExtensionsTests.cs b/test/Grpc.Net.ClientFactory.Tests/GrpcHttpClientBuilderExtensionsTests.cs
diff --git a/testassets/InteropTestsNativeServer/InteropServer.cs b/testassets/InteropTestsNativeServer/InteropServer.cs

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ private static void ValidateGrpcClient(IHttpClientBuilder builder)`
`84`	`84`	`if (service.ServiceType == typeof(IConfigureOptions<GrpcClientFactoryOptions>))`
`85`	`85`	`{`
`86`	`86`	`// Builder is from AddGrpcClient if options have been configured with the same name`
`87`		`- var namedOptions = service.ImplementationInstance as ConfigureNamedOptions<GrpcClientFactoryOptions>;`
`88`		`- if (namedOptions != null && string.Equals(builder.Name, namedOptions.Name, StringComparison.Ordinal))`
	`87`	`+ if (service.ImplementationInstance is ConfigureNamedOptions<GrpcClientFactoryOptions> namedOptions && string.Equals(builder.Name, namedOptions.Name, StringComparison.Ordinal))`
`89`	`88`	`{`
`90`	`89`	`return;`
`91`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,7 @@ public static IServiceCollection AddGrpcReflection(this IServiceCollection servi`
`69`	`69`	`var descriptorPropertyInfo = definitionType?.GetProperty("Descriptor", BindingFlags.Public \| BindingFlags.Static);`
`70`	`70`	`if (descriptorPropertyInfo != null)`
`71`	`71`	`{`
`72`		`- var serviceDescriptor = descriptorPropertyInfo.GetValue(null) as Google.Protobuf.Reflection.ServiceDescriptor;`
`73`		`- if (serviceDescriptor != null)`
	`72`	`+ if (descriptorPropertyInfo.GetValue(null) is Google.Protobuf.Reflection.ServiceDescriptor serviceDescriptor)`
`74`	`73`	`{`
`75`	`74`	`serviceDescriptors.Add(serviceDescriptor);`
`76`	`75`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,6 @@ public static async ValueTask<T> ReadSingleMessageAsync<T>(this PipeReader input`
`262`	`262`	`{`
`263`	`263`	`GrpcServerLog.ReadingMessage(logger);`
`264`	`264`
`265`		`- ReadOnlySequence<byte>? data;`
`266`	`265`	`while (true)`
`267`	`266`	`{`
`268`	`267`	`var completeMessage = false;`
`@@ -278,7 +277,7 @@ public static async ValueTask<T> ReadSingleMessageAsync<T>(this PipeReader input`
`278`	`277`
`279`	`278`	`if (!buffer.IsEmpty)`
`280`	`279`	`{`
`281`		`- if (TryReadMessage(ref buffer, serverCallContext, out data))`
	`280`	`+ if (TryReadMessage(ref buffer, serverCallContext, out var data))`
`282`	`281`	`{`
`283`	`282`	`completeMessage = true;`
`284`	`283`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ private static class X509SubjectAlternativeNameConstants`
`73`	`73`	`private static readonly char s_delimiter;`
`74`	`74`	`private static readonly string? s_separator;`
`75`	`75`
`76`		`- private static bool s_successfullyInitialized = false;`
`77`		`- private static Exception? s_initializationException;`
	`76`	`+ private static readonly bool s_successfullyInitialized;`
	`77`	`+ private static readonly Exception? s_initializationException;`
`78`	`78`
`79`	`79`	`public static string Identifier`
`80`	`80`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public sealed class GrpcChannel : ChannelBase, IDisposable`
`81`	`81`	`internal bool DisableClientDeadline;`
`82`	`82`	`internal long MaxTimerDueTime = uint.MaxValue - 1; // Max System.Threading.Timer due time`
`83`	`83`
`84`		`- private bool _shouldDisposeHttpClient;`
	`84`	`+ private readonly bool _shouldDisposeHttpClient;`
`85`	`85`
`86`	`86`	`internal GrpcChannel(Uri address, GrpcChannelOptions channelOptions) : base(address.Authority)`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -570,8 +570,7 @@ private async Task RunCall(HttpRequestMessage request, TimeSpan? timeout)`
`570`	`570`	`}`
`571`	`571`	`catch (Exception ex)`
`572`	`572`	`{`
`573`		`- Exception resolvedException;`
`574`		`- ResolveException(ErrorStartingCallMessage, ex, out status, out resolvedException);`
	`573`	`+ ResolveException(ErrorStartingCallMessage, ex, out status, out var resolvedException);`
`575`	`574`
`576`	`575`	`finished = FinishCall(request, diagnosticSourceEnabled, activity, status.Value);`
`577`	`576`	`_responseTcs?.TrySetException(resolvedException);`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,11 @@ private async Task<bool> MoveNextCore(CancellationToken cancellationToken)`
`145`	`145`	`{`
`146`	`146`	`try`
`147`	`147`	`{`
	`148`	`+#if NET5_0`
	`149`	`+ _responseStream = await _httpResponse.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);`
	`150`	`+#else`
`148`	`151`	`_responseStream = await _httpResponse.Content.ReadAsStreamAsync().ConfigureAwait(false);`
	`152`	`+#endif`
`149`	`153`	`}`
`150`	`154`	`catch (ObjectDisposedException)`
`151`	`155`	`{`