Fix warnings when running benchmarks in .NET 7 (#1749)

Author: JamesNK

perf/benchmarkapps/GrpcAspNetCoreServer/GrpcAspNetCoreServer.csproj

@@ -13,6 +13,8 @@
 
     <!-- Turn on preview features so we can use Http3. Can be removed in .NET 7 -->
     <EnablePreviewFeatures>True</EnablePreviewFeatures>
+    <!-- TODO(JamesNK): Workaround https://github.com/grpc/grpc/issues/29672 -->
+    <NoWarn>$(NoWarn);CS8981</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

perf/benchmarkapps/GrpcClient/GrpcClient.csproj

@@ -6,6 +6,8 @@
     <DefineConstants Condition="'$(EnableGrpcWeb)' == 'true'">$(DefineConstants);GRPC_WEB</DefineConstants>
     <!-- Enable server GC to more closely simulate a microservice app making calls -->
     <ServerGarbageCollection>true</ServerGarbageCollection>
+    <!-- TODO(JamesNK): Workaround https://github.com/grpc/grpc/issues/29672 -->
+    <NoWarn>$(NoWarn);CS8981</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

perf/benchmarkapps/GrpcCoreServer/GrpcCoreServer.csproj

@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
+    <!-- TODO(JamesNK): Workaround https://github.com/grpc/grpc/issues/29672 -->
+    <NoWarn>$(NoWarn);CS8981</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

test/FunctionalTests/Web/Client/ServerStreamingMethodTests.cs

@@ -125,34 +125,52 @@ public async Task SendValidRequest_ServerAbort_ClientThrowsAbortException()
             AssertHasLogRpcConnectionError(StatusCode.Aborted, "Aborted from server side.");
         }
 
-        [Test]
-        public async Task SendValidRequest_ClientAbort_ClientThrowsCancelledException()
+        [TestCase(true)]
+        [TestCase(false)]
+        public async Task SendValidRequest_ClientAbort_ClientThrowsCancelledException(bool delayWithCancellationToken)
         {
             var serverAbortedTcs = new TaskCompletionSource<object?>(TaskCreationOptions.RunContinuationsAsynchronously);
             async Task ServerStreamingEcho(ServerStreamingEchoRequest request, IServerStreamWriter<ServerStreamingEchoResponse> responseStream, ServerCallContext context)
             {
                 Logger.LogInformation("Server call started");
 
                 var httpContext = context.GetHttpContext();
-                httpContext.RequestAborted.Register(() => serverAbortedTcs.SetResult(null));
+                httpContext.RequestAborted.Register(() =>
+                {
+                    Logger.LogInformation("Server RequestAborted raised.");
+                    serverAbortedTcs.SetResult(null);
+                });
 
-                for (var i = 0; i < request.MessageCount; i++)
+                try
                 {
-                    try
+                    for (var i = 0; i < request.MessageCount; i++)
                     {
                         Logger.LogInformation($"Server writing message {i}");
                         await responseStream.WriteAsync(new ServerStreamingEchoResponse
                         {
                             Message = request.Message
                         });
 
-                        await Task.Delay(request.MessageInterval.ToTimeSpan(), context.CancellationToken);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        return;
+                        if (delayWithCancellationToken)
+                        {
+                            await Task.Delay(request.MessageInterval.ToTimeSpan(), context.CancellationToken);
+                        }
+                        else
+                        {
+                            await Task.Delay(request.MessageInterval.ToTimeSpan());
+                        }
                     }
                 }
+                catch (Exception ex)
+                {
+                    Logger.LogInformation(ex, "Server error.");
+                    return;
+                }
+                finally
+                {
+                    Logger.LogInformation("Server waiting for RequestAborted.");
+                    await serverAbortedTcs.Task;
+                }
             }
 
             // Arrage
@@ -201,6 +219,7 @@ await responseStream.WriteAsync(new ServerStreamingEchoResponse
             if (EndpointName != TestServerEndpointName.Http1)
             {
                 // Verify the abort reached the server.
+                Logger.LogInformation("Client waiting for notification of abort in server.");
                 await serverAbortedTcs.Task.DefaultTimeout();
             }
         }