Write sync to MemoryStream + switch to AsyncLocal in NETStd

Author: mythz

src/ServiceStack.Text/DefaultMemory.cs

@@ -444,7 +444,15 @@ public override Task WriteAsync(Stream stream, ReadOnlyMemory<byte> value, Cance
             try
             {
                 value.CopyTo(bytes);
-                return stream.WriteAsync(bytes, 0, value.Length, token);
+                if (stream is MemoryStream ms)
+                {
+                    ms.Write(bytes, 0, value.Length);
+                    return TypeConstants.EmptyTask;
+                }
+                else
+                {
+                    return stream.WriteAsync(bytes, 0, value.Length, token);
+                }
             }
             finally
             {

src/ServiceStack.Text/JsConfigScope.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Collections.Generic;
 using ServiceStack.Text.Json;
 using ServiceStack.Text.Jsv;
@@ -11,30 +12,42 @@ public sealed class JsConfigScope : Config, IDisposable
         bool disposed;
         readonly JsConfigScope parent;
 
-        [ThreadStatic]
-        private static JsConfigScope head;
+#if NETSTANDARD2_0        
+        private static AsyncLocal<JsConfigScope> head = new AsyncLocal<JsConfigScope>();
+#else
+        [ThreadStatic] private static JsConfigScope head;
+#endif
 
         internal JsConfigScope()
         {
             PclExport.Instance.BeginThreadAffinity();
 
+#if NETSTANDARD2_0        
+            parent = head.Value;
+            head.Value = this;
+#else
             parent = head;
             head = this;
+#endif
         }
 
-        internal static JsConfigScope Current => head;
-
-        public static void DisposeCurrent()
-        {
-            head?.Dispose();
-        }
+        internal static JsConfigScope Current => 
+#if NETSTANDARD2_0        
+            head.Value;
+#else
+            head;
+#endif
 
         public void Dispose()
         {
             if (!disposed)
             {
                 disposed = true;
+#if NETSTANDARD2_0        
+                head.Value = parent;
+#else
                 head = parent;
+#endif
 
                 PclExport.Instance.EndThreadAffinity();
             }

src/ServiceStack.Text/LicenseUtils.cs

@@ -219,7 +219,7 @@ public static void RegisterLicense(string licenseKeyText)
                 var key = VerifyLicenseKeyText(licenseKeyText);
                 ValidateLicenseKey(key);
             }
-            catch (PlatformNotSupportedException pse)
+            catch (PlatformNotSupportedException)
             {
                 // Allow usage in environments like dotnet script
                 __activatedLicense = new __ActivatedLicense(new LicenseKey { Type = LicenseType.Indie });

src/ServiceStack.Text/NetCoreMemory.cs

@@ -107,7 +107,14 @@ public override Task WriteAsync(Stream stream, ReadOnlySpan<char> value, Cancell
 
         public override async Task WriteAsync(Stream stream, ReadOnlyMemory<byte> value, CancellationToken token = default)
         {
-            await stream.WriteAsync(value, token);
+            if (stream is MemoryStream ms)
+            {
+                ms.Write(value.Span);
+            }
+            else
+            {
+                await stream.WriteAsync(value, token);
+            }
         }
 
         public override object Deserialize(Stream stream, Type type, DeserializeStringSpanDelegate deserializer)

src/ServiceStack.Text/StreamExtensions.cs

@@ -317,7 +317,8 @@ public static Task WriteAsync(this Stream stream, ReadOnlyMemory<byte> value, Ca
             MemoryProvider.Instance.WriteAsync(stream, value, token);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Task WriteAsync(this Stream stream, byte[] bytes, CancellationToken token = default) => stream.WriteAsync(bytes, 0, bytes.Length, token);
+        public static Task WriteAsync(this Stream stream, byte[] bytes, CancellationToken token = default) => 
+            MemoryProvider.Instance.WriteAsync(stream, bytes, token);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static Task CopyToAsync(this Stream input, Stream output, CancellationToken token = default) => input.CopyToAsync(output, AsyncBufferSize, token);