net fw compilaris

Author: ManickaP

src/libraries/System.Net.Http.Json/src/Resources/Strings.resx

@@ -132,4 +132,7 @@
   <data name="SerializeWrongType" xml:space="preserve">
     <value>The specified type {0} must derive from the specific value's type {1}.</value>
   </data>
-</root>
+  <data name="SyncNotSupported" xml:space="preserve">
+    <value>Synchronous serialization of JsonContent is not supported.</value>
+  </data>
+</root>

src/libraries/System.Net.Http.Json/src/System/Net/Http/Json/JsonContent.cs

@@ -116,9 +116,13 @@ private async Task SerializeToStreamAsyncCore(Stream targetStream, bool async, C
                 }
                 else
                 {
+#if NETCOREAPP
                     // Have to use Utf8JsonWriter because JsonSerializer doesn't support sync serialization into stream directly.
                     using Utf8JsonWriter writer = new Utf8JsonWriter(targetStream);
                     JsonSerializer.Serialize(writer, Value, ObjectType, _jsonSerializerOptions);
+#else
+                    throw new NotSupportedException(SR.SyncNotSupported);
+#endif
                 }
             }
         }

src/libraries/System.Net.Http.WinHttpHandler/src/System/Net/Http/NoWriteNoSeekStreamContent.cs

@@ -26,17 +26,17 @@ internal NoWriteNoSeekStreamContent(Stream content)
             _content = content;
         }
 
-        protected override Task SerializeToStreamAsync(Stream stream, TransportContext? context) =>
-            SerializeToStreamAsyncCore(stream, context, async: true, CancellationToken.None);
-
 #if NETCOREAPP
-        protected override void SerializeToStream(Stream stream, TransportContext context, CancellationToken cancellationToken) =>
-            SerializeToStreamAsyncCore(stream, context, async: true, cancellationToken);
-
         protected override void SerializeToStream(Stream stream, TransportContext? context, CancellationToken cancellationToken) =>
             SerializeToStreamAsyncCore(stream, context, async: false, cancellationToken).GetAwaiter().GetResult();
+
+        protected override void SerializeToStreamAsync(Stream stream, TransportContext context, CancellationToken cancellationToken) =>
+            SerializeToStreamAsyncCore(stream, context, async: true, cancellationToken);
 #endif
 
+        protected override Task SerializeToStreamAsync(Stream stream, TransportContext? context) =>
+            SerializeToStreamAsyncCore(stream, context, async: true, CancellationToken.None);
+
         private Task SerializeToStreamAsyncCore(Stream stream, TransportContext? context, bool async, CancellationToken cancellationToken)
         {
             Debug.Assert(stream != null);
@@ -81,6 +81,7 @@ private Task SerializeToStreamAsyncCore(Stream stream, TransportContext? context
             }
             return copyTask;
         }
+
         protected override bool TryComputeLength(out long length)
         {
             length = 0;

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/DecompressionHandler.cs

@@ -126,7 +126,7 @@ protected override void SerializeToStream(Stream stream, TransportContext? conte
             {
                 using (Stream decompressedStream = CreateContentReadStream(cancellationToken))
                 {
-                    decompressedStream.CopyTo(stream, cancellationToken);
+                    decompressedStream.CopyTo(stream);
                 }
             }