Manually backport #1206

michaelklishin · michaelklishin · commit fa9d37d8aa27 · 2022-05-15T16:04:07.000+04:00
(cherry picked from commit f90b9ca)
diff --git a/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs b/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs
@@ -47,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);
@@ -56,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
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ internal static class TaskExtensions`
`47`	`47`	`{`
`48`	`48`	`public static async Task TimeoutAfter(this Task task, TimeSpan timeout)`
`49`	`49`	`{`
	`50`	`+#if NET6_0_OR_GREATER`
	`51`	`+ await task.WaitAsync(timeout).ConfigureAwait(false);`
	`52`	`+#else`
`50`	`53`	`if (task == await Task.WhenAny(task, Task.Delay(timeout)).ConfigureAwait(false))`
`51`	`54`	`{`
`52`	`55`	`await task.ConfigureAwait(false);`
`@@ -56,6 +59,7 @@ public static async Task TimeoutAfter(this Task task, TimeSpan timeout)`
`56`	`59`	`Task supressErrorTask = task.ContinueWith((t, s) => t.Exception.Handle(e => true), null, CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted \| TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);`
`57`	`60`	`throw new TimeoutException();`
`58`	`61`	`}`
	`62`	`+#endif`
`59`	`63`	`}`
`60`	`64`	`}`
`61`	`65`