feat: Remove TaskCompletionSource cancellation workaround for net6.0 onwards

src/Docker.DotNet/DockerClient.cs

@@ -364,20 +364,13 @@ private async Task<HttpResponseMessage> PrivateMakeRequestAsync(
 
         if (Timeout.InfiniteTimeSpan == timeout)
         {
-            var tcs = new TaskCompletionSource<HttpResponseMessage>(
-                TaskCreationOptions.RunContinuationsAsynchronously);
-
-            using var registration = cancellationToken.Register(
-                () => tcs.TrySetCanceled(cancellationToken));
-
-            return await await Task.WhenAny(tcs.Task, _client.SendAsync(request, completionOption, cancellationToken))
+            return await _client.SendAsync(request, completionOption, cancellationToken)
                 .ConfigureAwait(false);
         }
         else
         {
-            using var timeoutCts = new CancellationTokenSource(timeout);
-
-            using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(timeoutCts.Token, cancellationToken);
+            using var linkedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+            linkedCts.CancelAfter(timeout);
 
             return await _client.SendAsync(request, completionOption, linkedCts.Token)
                 .ConfigureAwait(false);

src/Microsoft.Net.Http.Client/HttpConnection.cs

@@ -2,7 +2,7 @@ namespace Microsoft.Net.Http.Client;
 
 internal sealed class HttpConnection : IDisposable
 {
-    private static readonly ISet<string> DockerStreamHeaders = new HashSet<string>{ "application/vnd.docker.raw-stream", "application/vnd.docker.multiplexed-stream" };
+    private static readonly ISet<string> DockerStreamHeaders = new HashSet<string> { "application/vnd.docker.raw-stream", "application/vnd.docker.multiplexed-stream" };
 
     public HttpConnection(BufferedReadStream transport)
     {
@@ -41,7 +41,7 @@ public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, Can
             List<string> responseLines = await ReadResponseLinesAsync(cancellationToken);
 
             // Receive body and determine the response type (Content-Length, Transfer-Encoding, Opaque)
-            return CreateResponseMessage(responseLines);
+            return CreateResponseMessage(responseLines, cancellationToken);
         }
         catch (Exception ex)
         {
@@ -117,7 +117,7 @@ private async Task<List<string>> ReadResponseLinesAsync(CancellationToken cancel
         return lines;
     }
 
-    private HttpResponseMessage CreateResponseMessage(List<string> responseLines)
+    private HttpResponseMessage CreateResponseMessage(List<string> responseLines, CancellationToken cancellationToken)
     {
         string responseLine = responseLines.First();
         // HTTP/1.1 200 OK
@@ -141,7 +141,7 @@ private HttpResponseMessage CreateResponseMessage(List<string> responseLines)
         {
             response.ReasonPhrase = responseLineParts[2];
         }
-        var content = new HttpConnectionResponseContent(this);
+        var content = new HttpConnectionResponseContent(this, cancellationToken);
         response.Content = content;
 
         foreach (var rawHeader in responseLines.Skip(1))

src/Microsoft.Net.Http.Client/HttpConnectionResponseContent.cs

@@ -3,11 +3,13 @@ namespace Microsoft.Net.Http.Client;
 public class HttpConnectionResponseContent : HttpContent
 {
     private readonly HttpConnection _connection;
+    private readonly CancellationToken _cancellationToken;
     private Stream _responseStream;
 
-    internal HttpConnectionResponseContent(HttpConnection connection)
+    internal HttpConnectionResponseContent(HttpConnection connection, CancellationToken cancellationToken)
     {
         _connection = connection;
+        _cancellationToken = cancellationToken;
     }
 
     internal void ResolveResponseStream(bool chunked, bool isConnectionUpgrade)
@@ -40,11 +42,18 @@ public WriteClosableStream HijackStream()
         return _connection.Transport;
     }
 
-    protected override Task SerializeToStreamAsync(Stream stream, System.Net.TransportContext context)
+    protected override Task SerializeToStreamAsync(Stream stream, TransportContext context)
     {
-        return _responseStream.CopyToAsync(stream);
+        return _responseStream.CopyToAsync(stream, 81920, _cancellationToken);
     }
 
+#if NET6_0_OR_GREATER
+    protected override Task SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken)
+    {
+        return _responseStream.CopyToAsync(stream, cancellationToken);
+    }
+#endif
+
     protected override Task<Stream> CreateContentReadStreamAsync()
     {
         return Task.FromResult(_responseStream);