Merge pull request #20150 from dotnet-maestro-bot/merge/release/3.1-to-master

[automated] Merge branch 'release/3.1' => 'master'

Author: dougbu

src/SignalR/clients/csharp/Client/test/UnitTests/HubConnectionTests.cs

@@ -448,22 +448,15 @@ public async Task CanAwaitInvokeFromOnHandlerWithServerClosingConnection()
                     return Task.CompletedTask;
                 };
 
-                await connection.ReceiveJsonMessage(new { type = HubProtocolConstants.InvocationMessageType, target = "Echo", arguments = new object[] { "42" } });
+                await connection.ReceiveJsonMessage(new { type = HubProtocolConstants.InvocationMessageType, target = "Echo", arguments = new object[] { "42" } }).OrTimeout();
 
                 // Read sent message first to make sure invoke has been processed and is waiting for a response
                 await connection.ReadSentJsonAsync().OrTimeout();
-                await connection.ReceiveJsonMessage(new { type = HubProtocolConstants.CloseMessageType });
+                await connection.ReceiveJsonMessage(new { type = HubProtocolConstants.CloseMessageType }).OrTimeout();
 
                 await closedTcs.Task.OrTimeout();
 
-                try
-                {
-                    await tcs.Task.OrTimeout();
-                    Assert.True(false);
-                }
-                catch (TaskCanceledException)
-                {
-                }
+                await Assert.ThrowsAsync<TaskCanceledException>(() => tcs.Task.OrTimeout());
             }
         }