Merge pull request #1206 from ArminShoeibi/arminshoeibi/use-WaitAsync-net6

Use new Task.WaitAsync() to cancel an await call

Author: michaelklishin

projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs

@@ -38,7 +38,6 @@
 using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;
-
 using RabbitMQ.Client.Exceptions;
 using RabbitMQ.Client.Logging;
 
@@ -48,6 +47,9 @@ internal static class TaskExtensions
 {
     public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
     {
+#if NET6_0_OR_GREATER
+        await task.WaitAsync(timeout).ConfigureAwait(false);
+#else
         if (task == await Task.WhenAny(task, Task.Delay(timeout)).ConfigureAwait(false))
         {
             await task.ConfigureAwait(false);
@@ -57,6 +59,7 @@ public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
             Task supressErrorTask = task.ContinueWith((t, s) => t.Exception.Handle(e => true), null, CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted | TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
             throw new TimeoutException();
         }
+#endif
     }
 }