Manually backport #1206

michaelklishin · michaelklishin · commit f90b9caab531 · 2022-05-14T13:12:12.000+04:00
diff --git a/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs b/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs
@@ -48,6 +48,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;
@@ -57,6 +60,7 @@ public static async Task TimeoutAfter(this Task task, TimeSpan timeout)
                 Task supressErrorTask = task.ContinueWith(t => t.Exception.Handle(e => true), TaskContinuationOptions.OnlyOnFaulted);
                 throw new TimeoutException();
             }
+#endif
         }
     }
 

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