Change all async APIs to use ConfigAwait()

Author: mythz

src/ServiceStack.Text/DefaultMemory.cs

@@ -473,7 +473,7 @@ private static async Task WriteAsyncAndReturn(Stream stream, byte[] bytes, int o
         {
             try
             {
-                await stream.WriteAsync(bytes, offset, count, token);
+                await stream.WriteAsync(bytes, offset, count, token).ConfigAwait();
             }
             finally
             {
@@ -492,11 +492,12 @@ public override async Task WriteAsync(Stream stream, ReadOnlyMemory<byte> value,
                 value.CopyTo(bytes);
                 if (stream is MemoryStream ms)
                 {
+                    // ReSharper disable once MethodHasAsyncOverloadWithCancellation
                     ms.Write(bytes, 0, value.Length);
                 }
                 else
                 {
-                    await stream.WriteAsync(bytes, 0, value.Length, token);
+                    await stream.WriteAsync(bytes, 0, value.Length, token).ConfigAwait();
                 }
             }
             finally
@@ -534,7 +535,7 @@ public override async Task<object> DeserializeAsync(Stream stream, Type type,
                 if (stream.CanSeek)
                     stream.Position = 0;
 
-                ms = await stream.CopyToNewMemoryStreamAsync();
+                ms = await stream.CopyToNewMemoryStreamAsync().ConfigAwait();
             }
 
             return Deserialize(ms, fromPool, type, deserializer);

src/ServiceStack.Text/Env.cs

@@ -301,7 +301,7 @@ private static bool IsInAppContainer
         private static extern int GetCurrentApplicationUserModelId(ref uint applicationUserModelIdLength, byte[] applicationUserModelId);
  #endif
 
-        public static bool ContinueOnCapturedContext = false;
+        public const bool ContinueOnCapturedContext = false;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static ConfiguredTaskAwaitable ConfigAwait(this Task task) => 
@@ -310,5 +310,13 @@ public static ConfiguredTaskAwaitable ConfigAwait(this Task task) =>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static ConfiguredTaskAwaitable<T> ConfigAwait<T>(this Task<T> task) => 
             task.ConfigureAwait(ContinueOnCapturedContext);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static ConfiguredValueTaskAwaitable ConfigAwait(this ValueTask task) => 
+            task.ConfigureAwait(ContinueOnCapturedContext);
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static ConfiguredValueTaskAwaitable<T> ConfigAwait<T>(this ValueTask<T> task) => 
+            task.ConfigureAwait(ContinueOnCapturedContext);
     }
 }

src/ServiceStack.Text/HttpUtils.cs

@@ -7,6 +7,7 @@
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
+using ServiceStack.Text;
 
 namespace ServiceStack
 {
@@ -597,12 +598,12 @@ public static async Task<string> SendStringToUrlAsync(this string url, string me
                 }
             }
 
-            using (var webRes = await webReq.GetResponseAsync())
+            using (var webRes = await webReq.GetResponseAsync().ConfigAwait())
             {
                 responseFilter?.Invoke((HttpWebResponse)webRes);
                 using (var stream = webRes.GetResponseStream())
                 {
-                    return await stream.ReadToEndAsync();
+                    return await stream.ReadToEndAsync().ConfigAwait();
                 }
             }
         }
@@ -720,7 +721,7 @@ public static async Task<byte[]> SendBytesToUrlAsync(this string url, string met
                 }
             }
 
-            var webRes = await webReq.GetResponseAsync();
+            var webRes = await webReq.GetResponseAsync().ConfigAwait();
             responseFilter?.Invoke((HttpWebResponse)webRes);
 
             using (var stream = webRes.GetResponseStream())
@@ -837,13 +838,11 @@ public static async Task<Stream> SendStreamToUrlAsync(this string url, string me
 
             if (requestBody != null)
             {
-                using (var req = PclExport.Instance.GetRequestStream(webReq))
-                {
-                    await requestBody.CopyToAsync(req);
-                }
+                using var req = PclExport.Instance.GetRequestStream(webReq);
+                await requestBody.CopyToAsync(req).ConfigAwait();
             }
 
-            var webRes = await webReq.GetResponseAsync();
+            var webRes = await webReq.GetResponseAsync().ConfigAwait();
             responseFilter?.Invoke((HttpWebResponse)webRes);
 
             var stream = webRes.GetResponseStream();

src/ServiceStack.Text/JsonSerializer.cs

@@ -202,7 +202,7 @@ public static Task<object> DeserializeFromStreamAsync(Type type, Stream stream)
 
         public static async Task<T> DeserializeFromStreamAsync<T>(Stream stream)
         {
-            var obj = await MemoryProvider.Instance.DeserializeAsync(stream, typeof(T), DeserializeFromSpan);
+            var obj = await MemoryProvider.Instance.DeserializeAsync(stream, typeof(T), DeserializeFromSpan).ConfigAwait();
             return (T)obj;
         }
 

src/ServiceStack.Text/NetCoreMemory.cs

@@ -131,7 +131,7 @@ public override async Task WriteAsync(Stream stream, ReadOnlyMemory<byte> value,
             if (stream is MemoryStream ms)
                 ms.Write(value.Span);
             else
-                await stream.WriteAsync(value, token);
+                await stream.WriteAsync(value, token).ConfigAwait();
         }
 
         public override object Deserialize(Stream stream, Type type, DeserializeStringSpanDelegate deserializer)
@@ -162,7 +162,7 @@ public override async Task<object> DeserializeAsync(Stream stream, Type type, De
                 if (stream.CanSeek)
                     stream.Position = 0;
 
-                ms = await stream.CopyToNewMemoryStreamAsync();
+                ms = await stream.CopyToNewMemoryStreamAsync().ConfigAwait();
             }
 
             return Deserialize(ms, fromPool, type, deserializer);

src/ServiceStack.Text/PclExport.Net45.cs

@@ -156,8 +156,8 @@ public override void WriteLine(string format, params object[] args)
 
         public override async Task WriteAndFlushAsync(Stream stream, byte[] bytes)
         {
-            await stream.WriteAsync(bytes, 0, bytes.Length);
-            await stream.FlushAsync();
+            await stream.WriteAsync(bytes, 0, bytes.Length).ConfigAwait();
+            await stream.FlushAsync().ConfigAwait();
         }
 
         public override void AddCompression(WebRequest webReq)

src/ServiceStack.Text/StreamExtensions.cs

@@ -477,14 +477,14 @@ public static async Task WriteToAsync(this MemoryStream stream, Stream output, E
         {
             try
             {
-                await output.WriteAsync(stream.GetBuffer(), 0, (int) stream.Length, token);
+                await output.WriteAsync(stream.GetBuffer(), 0, (int) stream.Length, token).ConfigAwait();
             }
             catch (UnauthorizedAccessException)
             {
                 Tracer.Instance.WriteWarning("MemoryStream in WriteToAsync() wasn't created with a publiclyVisible:true byte[] bufffer, falling back to slow impl");
 
                 var bytes = stream.ToArray();
-                await output.WriteAsync(bytes, 0, bytes.Length, token);
+                await output.WriteAsync(bytes, 0, bytes.Length, token).ConfigAwait();
             }
         }
 
@@ -511,7 +511,7 @@ public static MemoryStream CopyToNewMemoryStream(this Stream stream)
         public static async Task<MemoryStream> CopyToNewMemoryStreamAsync(this Stream stream)
         {
             var ms = MemoryStreamFactory.GetStream();
-            await stream.CopyToAsync(ms);
+            await stream.CopyToAsync(ms).ConfigAwait();
             ms.Position = 0;
             return ms;
         }

src/ServiceStack.Text/TypeSerializer.cs

@@ -226,7 +226,7 @@ public static Task<object> DeserializeFromStreamAsync(Type type, Stream stream)
 
         public static async Task<T> DeserializeFromStreamAsync<T>(Stream stream)
         {
-            var obj = await MemoryProvider.Instance.DeserializeAsync(stream, typeof(T), DeserializeFromSpan);
+            var obj = await MemoryProvider.Instance.DeserializeAsync(stream, typeof(T), DeserializeFromSpan).ConfigAwait();
             return (T)obj;
         }