Remove TestServer workaround handler (#1069)

Author: JamesNK

examples/Tester/Tests/FunctionalTests/Helpers/GrpcTestFixture.cs

@@ -18,8 +18,6 @@
 
 using System;
 using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
@@ -62,12 +60,7 @@ public GrpcTestFixture(Action<IServiceCollection>? initialConfigureServices)
             _host = builder.Start();
             _server = _host.GetTestServer();
 
-            // Need to set the response version to 2.0.
-            // Required because of this TestServer issue - https://github.com/aspnet/AspNetCore/issues/16940
-            var responseVersionHandler = new ResponseVersionHandler();
-            responseVersionHandler.InnerHandler = _server.CreateHandler();
-
-            Handler = responseVersionHandler;
+            Handler = _server.CreateHandler();
         }
 
         public LoggerFactory LoggerFactory { get; }
@@ -81,17 +74,6 @@ public void Dispose()
             _server.Dispose();
         }
 
-        private class ResponseVersionHandler : DelegatingHandler
-        {
-            protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-            {
-                var response = await base.SendAsync(request, cancellationToken);
-                response.Version = request.Version;
-
-                return response;
-            }
-        }
-
         public IDisposable GetTestContext()
         {
             return new GrpcTestContext<TStartup>(this);

test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj

@@ -24,12 +24,18 @@
 
     <ProjectReference Include="..\..\testassets\FunctionalTestsWebsite\FunctionalTestsWebsite.csproj" />
 
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreApp31PackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
 
     <None Update="server1.pfx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreApp31PackageVersion)" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
+  </ItemGroup>
+
 </Project>

test/FunctionalTests/TestServer/Helpers/GrpcTestFixture.cs

@@ -66,12 +66,16 @@ public GrpcTestFixture(Action<IServiceCollection>? initialConfigureServices)
             _host = builder.Start();
             _server = _host.GetTestServer();
 
+#if !NET5_0
             // Need to set the response version to 2.0.
             // Required because of this TestServer issue - https://github.com/aspnet/AspNetCore/issues/16940
-            var responseVersionHandler = new ResponseVersionHandler();
-            responseVersionHandler.InnerHandler = _server.CreateHandler();
+            var handler = new ResponseVersionHandler();
+            handler.InnerHandler = _server.CreateHandler();
+#else
+            var handler = _server.CreateHandler();
+#endif
 
-            var client = new HttpClient(responseVersionHandler);
+            var client = new HttpClient(handler);
             client.BaseAddress = new Uri("http://localhost");
 
             Client = client;
@@ -88,6 +92,7 @@ public void Dispose()
             _server.Dispose();
         }
 
+#if !NET5_0
         private class ResponseVersionHandler : DelegatingHandler
         {
             protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
@@ -98,6 +103,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 return response;
             }
         }
+#endif
 
         public IDisposable GetTestContext()
         {