Merge remote-tracking branch 'Duracell1989/master' into bugfix/cancellation-token-not-cancelling

Author: David García Vives

src/Docker.DotNet/Endpoints/StreamUtil.cs

@@ -1,10 +1,10 @@
+using Newtonsoft.Json;
 using System;
 using System.IO;
 using System.Net.Http;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json;
 
 namespace Docker.DotNet.Models
 {

test/Docker.DotNet.Tests/ISystemOperations.Tests.cs

@@ -119,6 +119,7 @@ await _client.Images.DeleteImageAsync(
                 },
                 cts.Token);
 
+            Thread.Sleep(500); // Let's wait some time before cancelling the monitor stream to make sure we got some progress back.
             cts.Cancel();
 
             await Assert.ThrowsAsync<TaskCanceledException>(() => task);