From 7e851eec6b7df46b80225e08789491c0f4564dfc Mon Sep 17 00:00:00 2001
From: Ladi Prosek <laprosek@microsoft.com>
Date: Mon, 18 Mar 2024 10:05:02 +0100
Subject: [PATCH 1/2] Use System.Text.Json in Netfx build of MSBuildSdkResolver

---
 ...Microsoft.DotNet.MSBuildSdkResolver.csproj |  8 +++--
 .../WorkloadManifestReader.SystemTextJson.cs  | 29 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
index e5e8ff7f3bc6..5ac025f91c10 100644
--- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
+++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
@@ -13,7 +13,7 @@
 
     <Nullable>Enable</Nullable>
 
-    <UseSystemTextJson Condition="'$(TargetFramework)'!='netstandard2.0' And '$(TargetFramework)'!='net472'">True</UseSystemTextJson>
+    <UseSystemTextJson Condition="'$(TargetFramework)'!='netstandard2.0'">True</UseSystemTextJson>
     <DefineConstants Condition="'$(UseSystemTextJson)'=='True'">$(DefineConstants);USE_SYSTEM_TEXT_JSON</DefineConstants>
 
     <!-- Create FileDefinitions items for ResolveHostfxrCopyLocalContent target -->
@@ -139,13 +139,17 @@
 
     <ItemGroup>
       <ExpectedDependencies Include="Microsoft.Deployment.DotNet.Releases, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      <ExpectedDependencies Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed" />
+      <ExpectedDependencies Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+      <ExpectedDependencies Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
       <ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <ExpectedDependencies Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
       <ExpectedDependencies Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <ExpectedDependencies Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <ExpectedDependencies Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+      <ExpectedDependencies Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+      <ExpectedDependencies Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+      <ExpectedDependencies Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
     </ItemGroup>
 
     <!-- Check that the dependencies of the output assembly match our expectations -->
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.SystemTextJson.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.SystemTextJson.cs
index e845b7d11964..a122d085e6e8 100644
--- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.SystemTextJson.cs
+++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.SystemTextJson.cs
@@ -3,10 +3,7 @@
 
 #if USE_SYSTEM_TEXT_JSON
 
-using System;
 using System.Buffers;
-using System.Collections.Generic;
-using System.IO;
 using System.Text.Json;
 
 namespace Microsoft.NET.Sdk.WorkloadManifestReader
@@ -47,7 +44,7 @@ internal ref struct Utf8JsonStreamReader
             Utf8JsonReader reader;
             readonly Stream stream;
 
-            IMemoryOwner<byte> buffer;
+            byte[]? buffer;
 
             Span<byte> span;
 
@@ -55,9 +52,9 @@ public Utf8JsonStreamReader(Stream stream, JsonReaderOptions readerOptions)
             {
                 this.stream = stream;
 
-                buffer = MemoryPool<byte>.Shared.Rent(segmentSize);
-                var readCount = stream.Read(buffer.Memory.Span);
-                span = buffer.Memory.Slice(0, readCount).Span;
+                buffer = ArrayPool<byte>.Shared.Rent(segmentSize);
+                var readCount = stream.Read(buffer, 0, buffer.Length);
+                span = buffer.AsSpan().Slice(0, readCount);
 
                 if (span.StartsWith(utf8Bom))
                 {
@@ -73,6 +70,11 @@ public bool Read()
                 {
                     if (reader.IsFinalBlock)
                     {
+                        if (buffer != null)
+                        {
+                            ArrayPool<byte>.Shared.Return(buffer);
+                            buffer = null;
+                        }
                         return false;
                     }
 
@@ -86,18 +88,21 @@ public bool Read()
 
                     int remaining = (int)(span.Length - reader.BytesConsumed);
 
-                    var newBuffer = MemoryPool<byte>.Shared.Rent(newSegmentSize);
+                    var newBuffer = ArrayPool<byte>.Shared.Rent(newSegmentSize);
 
                     if (remaining > 0)
                     {
-                        span.Slice((int)reader.BytesConsumed).CopyTo(newBuffer.Memory.Span);
+                        span.Slice((int)reader.BytesConsumed).CopyTo(newBuffer);
                     }
 
-                    var readCount = stream.Read(newBuffer.Memory.Span.Slice(remaining));
+                    var readCount = stream.Read(newBuffer, remaining, newBuffer.Length - remaining);
 
-                    buffer.Dispose();
+                    if (buffer != null)
+                    {
+                        ArrayPool<byte>.Shared.Return(buffer);
+                    }
                     buffer = newBuffer;
-                    span = newBuffer.Memory.Slice(0, remaining + readCount).Span;
+                    span = newBuffer.AsSpan().Slice(0, remaining + readCount);
 
                     reader = new Utf8JsonReader(span, stream.Position >= stream.Length, reader.CurrentState);
                 }

From 5b52adb968152552ec762bf20ae84496dd7db602 Mon Sep 17 00:00:00 2001
From: Ladi Prosek <laprosek@microsoft.com>
Date: Wed, 20 Mar 2024 13:57:23 +0100
Subject: [PATCH 2/2] Override System.Text.Json version

---
 .../Microsoft.DotNet.MSBuildSdkResolver.csproj        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
index 5ac025f91c10..43737989df88 100644
--- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
+++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
@@ -16,6 +16,9 @@
     <UseSystemTextJson Condition="'$(TargetFramework)'!='netstandard2.0'">True</UseSystemTextJson>
     <DefineConstants Condition="'$(UseSystemTextJson)'=='True'">$(DefineConstants);USE_SYSTEM_TEXT_JSON</DefineConstants>
 
+    <!-- Netfx version of the resolver builds against the lowest version of System.Text.Json that's guaranteed to be shipped with MSBuild in VS -->
+    <SystemTextJsonVersionOverride>8.0.0</SystemTextJsonVersionOverride>
+
     <!-- Create FileDefinitions items for ResolveHostfxrCopyLocalContent target -->
     <EmitLegacyAssetsFileItems>true</EmitLegacyAssetsFileItems>
 
@@ -100,7 +103,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- No PackageReference to System.Text.Json necessary, because it's included in .NET 5.0 and higher -->
+    <!-- No PackageReference to System.Text.Json necessary when targeting .NET, because it's included in .NET 5.0 and higher -->
+    <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersionOverride)" Condition="'$(UseSystemTextJson)'=='True' and '$(TargetFramework)'=='net472'"/>
     <PackageReference Include="Newtonsoft.Json" Condition="'$(UseSystemTextJson)'!='True'"/>
 
     <!-- Reference this package to avoid package downgrade errors.  See https://github.com/dotnet/sdk/issues/3044 for details -->
@@ -139,8 +143,8 @@
 
     <ItemGroup>
       <ExpectedDependencies Include="Microsoft.Deployment.DotNet.Releases, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-      <ExpectedDependencies Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
-      <ExpectedDependencies Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+      <ExpectedDependencies Include="System.Text.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
+      <ExpectedDependencies Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
       <ExpectedDependencies Include="Microsoft.Build.Framework, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <ExpectedDependencies Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
       <ExpectedDependencies Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
@@ -149,7 +153,6 @@
       <ExpectedDependencies Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
       <ExpectedDependencies Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
       <ExpectedDependencies Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
-      <ExpectedDependencies Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
     </ItemGroup>
 
     <!-- Check that the dependencies of the output assembly match our expectations -->