Remove Newtonsoft.Json usage (#40520)

kasperk81 · web-flow · commit 2ce5f7d409de · 2024-04-29T14:28:53.000+02:00
diff --git a/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj b/src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj
@@ -16,9 +16,6 @@
     <!-- https://github.com/dotnet/sdk/issues/14801 -->
     <AssemblyVersion Condition="'$(TargetFramework)'=='net472'">5.0.100.0</AssemblyVersion>
 
-    <UseSystemTextJson Condition="'$(TargetFramework)'!='netstandard2.0' And '$(TargetFramework)'!='net472'">True</UseSystemTextJson>
-    <DefineConstants Condition="'$(UseSystemTextJson)'=='True'">$(DefineConstants);USE_SYSTEM_TEXT_JSON</DefineConstants>
-
     <!--https://github.com/NuGet/Home/issues/3891#issuecomment-377319939-->
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
@@ -63,8 +60,4 @@
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <PackageReference Include="System.Text.Json"  VersionOverride="8.0.0" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Condition="'$(UseSystemTextJson)'!='True'"/>
-  </ItemGroup>
 </Project>
diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
@@ -13,9 +13,6 @@
 
     <Nullable>Enable</Nullable>
 
-    <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>
 
@@ -105,8 +102,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <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 -->
     <PackageReference Include="Microsoft.NETCore.Targets" ExcludeAssets="all" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Microsoft.NET.Sdk.WorkloadManifestReader.csproj
@@ -11,9 +11,6 @@
 
     <Nullable>Enable</Nullable>
     <IsPackable>true</IsPackable>
-
-    <UseSystemTextJson Condition="'$(TargetFramework)'!='netstandard2.0' And '$(TargetFramework)'!='net472'">True</UseSystemTextJson>
-    <DefineConstants Condition="'$(UseSystemTextJson)'=='True'">$(DefineConstants);USE_SYSTEM_TEXT_JSON</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
@@ -25,14 +22,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Condition="'$(UseSystemTextJson)'=='True'" />
-    <PackageReference Include="Newtonsoft.Json" Condition="'$(UseSystemTextJson)'!='True'" />
     <PackageReference Include="Microsoft.Deployment.DotNet.Releases" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <PackageReference Include="System.Text.Json" VersionOverride="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.GlobalJsonReader.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.GlobalJsonReader.cs
@@ -5,12 +5,7 @@
 using Microsoft.NET.Sdk.Localization;
 using static Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadManifestReader;
 
-#if USE_SYSTEM_TEXT_JSON
 using System.Text.Json;
-#else
-using Newtonsoft.Json;
-using JsonTokenType = Newtonsoft.Json.JsonToken;
-#endif
 
 namespace Microsoft.NET.Sdk.WorkloadManifestReader
 {
@@ -27,19 +22,12 @@ public static class GlobalJsonReader
 
                 using var fileStream = File.OpenRead(globalJsonPath);
 
-#if USE_SYSTEM_TEXT_JSON
                 var readerOptions = new JsonReaderOptions
                 {
                     AllowTrailingCommas = true,
                     CommentHandling = JsonCommentHandling.Skip
                 };
                 var reader = new Utf8JsonStreamReader(fileStream, readerOptions);
-#else
-                using var textReader = new StreamReader(fileStream, Encoding.UTF8, true);
-                using var jsonReader = new JsonTextReader(textReader);
-
-                var reader = new Utf8JsonStreamReader(jsonReader);
-#endif
 
                 string? workloadVersion = null;
 
@@ -96,4 +84,3 @@ public static class GlobalJsonReader
         }
     }
 }
-
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.JsonReader.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.JsonReader.cs
@@ -6,12 +6,7 @@
 using static Microsoft.NET.Sdk.WorkloadManifestReader.WorkloadManifestReader;
 using System.Runtime.Serialization;
 
-#if USE_SYSTEM_TEXT_JSON
 using System.Text.Json;
-#else
-using Newtonsoft.Json;
-using JsonTokenType = Newtonsoft.Json.JsonToken;
-#endif
 
 namespace Microsoft.NET.Sdk.WorkloadManifestReader
 {
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.Localization.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.Localization.cs
@@ -4,12 +4,7 @@
 using System.Globalization;
 using System.Runtime.CompilerServices;
 
-
-#if USE_SYSTEM_TEXT_JSON
 using System.Text.Json;
-#else
-using JsonTokenType = Newtonsoft.Json.JsonToken;
-#endif
 
 namespace Microsoft.NET.Sdk.WorkloadManifestReader
 {
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.NewtonsoftJson.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.NewtonsoftJson.cs
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.SystemTextJson.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.SystemTextJson.cs
@@ -1,8 +1,6 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if USE_SYSTEM_TEXT_JSON
-
 using System.Buffers;
 using System.Text.Json;
 
@@ -128,5 +126,3 @@ internal static class JsonTokenTypeExtensions
         public static bool IsInt(this JsonTokenType tokenType) => tokenType == JsonTokenType.Number;
     }
 }
-
-#endif
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadManifestReader.cs
@@ -4,11 +4,7 @@
 using Microsoft.NET.Sdk.Localization;
 using FXVersion = Microsoft.DotNet.MSBuildSdkResolver.FXVersion;
 
-#if USE_SYSTEM_TEXT_JSON
 using System.Text.Json;
-#else
-using JsonTokenType = Newtonsoft.Json.JsonToken;
-#endif
 
 namespace Microsoft.NET.Sdk.WorkloadManifestReader
 {
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadPackId.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadPackId.cs
@@ -1,10 +1,8 @@
 ﻿// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if USE_SYSTEM_TEXT_JSON
 using System.Text.Json;
 using System.Text.Json.Serialization;
-#endif
 
 namespace Microsoft.NET.Sdk.WorkloadManifestReader
 {
@@ -47,13 +45,11 @@ public WorkloadPackId(string id)
         public static bool operator !=(WorkloadPackId a, WorkloadPackId b) => !a.Equals(b);
     }
 
-#if USE_SYSTEM_TEXT_JSON
     internal class PackIdJsonConverter : JsonConverter<WorkloadPackId>
     {
         public override WorkloadPackId Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
             new(reader.GetString() ?? string.Empty);
 
         public override void Write(Utf8JsonWriter writer, WorkloadPackId value, JsonSerializerOptions options) => writer.WriteStringValue(value.ToString());
     }
-#endif
 }
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs
@@ -5,9 +5,7 @@
 using Microsoft.DotNet.Workloads.Workload;
 using Microsoft.NET.Sdk.Localization;
 using FXVersion = Microsoft.DotNet.MSBuildSdkResolver.FXVersion;
-#if USE_SYSTEM_TEXT_JSON
 using System.Text.Json.Serialization;
-#endif
 
 namespace Microsoft.NET.Sdk.WorkloadManifestReader
 {
@@ -674,9 +672,7 @@ public PackInfo(WorkloadPackId id, string version, WorkloadPackKind kind, string
             /// <summary>
             /// The workload pack ID. The NuGet package ID <see cref="ResolvedPackageId"/> may differ from this.
             /// </summary>
-#if USE_SYSTEM_TEXT_JSON
             [JsonConverter(typeof(PackIdJsonConverter))]
-#endif
             public WorkloadPackId Id { get; }
 
             public string Version { get; }
diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadSet.cs
@@ -5,13 +5,7 @@
 using Microsoft.DotNet.MSBuildSdkResolver;
 using Strings = Microsoft.NET.Sdk.Localization.Strings;
 
-
-#if USE_SYSTEM_TEXT_JSON
 using System.Text.Json;
-#else
-using Newtonsoft.Json;
-#endif
-
 
 namespace Microsoft.NET.Sdk.WorkloadManifestReader
 {
@@ -73,16 +67,12 @@ public static WorkloadSet FromDictionaryForJson(IDictionary<string, string?> dic
 
         public static WorkloadSet FromJson(string json, SdkFeatureBand defaultFeatureBand)
         {
-#if USE_SYSTEM_TEXT_JSON
             var jsonSerializerOptions = new JsonSerializerOptions()
             {
                 AllowTrailingCommas = true,
                 ReadCommentHandling = JsonCommentHandling.Skip
             };
             return FromDictionaryForJson(JsonSerializer.Deserialize<IDictionary<string, string>>(json, jsonSerializerOptions)!, defaultFeatureBand);
-#else
-            return FromDictionaryForJson(JsonConvert.DeserializeObject<IDictionary<string, string>>(json)!, defaultFeatureBand);
-#endif
         }
 
         public Dictionary<string, string> ToDictionaryForJson()
@@ -93,11 +83,7 @@ public Dictionary<string, string> ToDictionaryForJson()
 
         public string ToJson()
         {
-#if USE_SYSTEM_TEXT_JSON
             var json = JsonSerializer.Serialize(ToDictionaryForJson(), new JsonSerializerOptions() { WriteIndented = true });
-#else
-            var json = JsonConvert.SerializeObject(ToDictionaryForJson(), Formatting.Indented);
-#endif
             return json;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`		`-#if USE_SYSTEM_TEXT_JSON`
`5`		`-`
`6`	`4`	`using System.Buffers;`
`7`	`5`	`using System.Text.Json;`
`8`	`6`
`@@ -128,5 +126,3 @@ internal static class JsonTokenTypeExtensions`
`128`	`126`	`public static bool IsInt(this JsonTokenType tokenType) => tokenType == JsonTokenType.Number;`
`129`	`127`	`}`
`130`	`128`	`}`
`131`		`-`
`132`		`-#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`// Licensed to the .NET Foundation under one or more agreements.`
`2`	`2`	`// The .NET Foundation licenses this file to you under the MIT license.`
`3`	`3`
`4`		`-#if USE_SYSTEM_TEXT_JSON`
`5`	`4`	`using System.Text.Json;`
`6`	`5`	`using System.Text.Json.Serialization;`
`7`		`-#endif`
`8`	`6`
`9`	`7`	`namespace Microsoft.NET.Sdk.WorkloadManifestReader`
`10`	`8`	`{`
`@@ -47,13 +45,11 @@ public WorkloadPackId(string id)`
`47`	`45`	`public static bool operator !=(WorkloadPackId a, WorkloadPackId b) => !a.Equals(b);`
`48`	`46`	`}`
`49`	`47`
`50`		`-#if USE_SYSTEM_TEXT_JSON`
`51`	`48`	`internal class PackIdJsonConverter : JsonConverter<WorkloadPackId>`
`52`	`49`	`{`
`53`	`50`	`public override WorkloadPackId Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>`
`54`	`51`	`new(reader.GetString() ?? string.Empty);`
`55`	`52`
`56`	`53`	`public override void Write(Utf8JsonWriter writer, WorkloadPackId value, JsonSerializerOptions options) => writer.WriteStringValue(value.ToString());`
`57`	`54`	`}`
`58`		`-#endif`
`59`	`55`	`}`