Consolidate Newtonsoft versions (#71402)

* Consolidate Newtonsoft versions * Set JsonTextReader's MaxDepth to null In v13, defaults are changed from null to 64. * Revert NetCoreServer used by xharness

Consolidate Newtonsoft versions (#71402)
* Consolidate Newtonsoft versions * Set JsonTextReader's MaxDepth to null In v13, defaults are changed from null to 64. * Revert NetCoreServer used by xharness
35d3f2b7 · Adeel Mujahid · GitHub · 60d3d052 · 35d3f2b7 · 35d3f2b7
24 changed file
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -158,7 +158,8 @@
    <XUnitAnalyzersVersion>0.12.0-pre.20</XUnitAnalyzersVersion>
    <XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>
    <CoverletCollectorVersion>3.1.2</CoverletCollectorVersion>
-    <NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
+    <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
+    <NewtonsoftJsonBsonVersion>1.0.2</NewtonsoftJsonBsonVersion>
    <SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
    <MoqVersion>4.12.0</MoqVersion>
    <FsCheckVersion>2.14.3</FsCheckVersion>

--- a/src/installer/tests/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj
+++ b/src/installer/tests/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

 </Project>
--- a/src/installer/tests/Assets/TestProjects/LightupLib/LightupLib.csproj
+++ b/src/installer/tests/Assets/TestProjects/LightupLib/LightupLib.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

 </Project>
--- a/src/installer/tests/Assets/TestProjects/PortableApp/PortableApp.csproj
+++ b/src/installer/tests/Assets/TestProjects/PortableApp/PortableApp.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

--- a/src/installer/tests/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
+++ b/src/installer/tests/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj
@@ -10,7 +10,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
    <PackageReference Include="xunit.netcore.extensions" Version="1.0.0-prerelease-00206" />
    <PackageReference Include="dotnet-test-xunit" Version="1.0.0-rc2-192208-24" />
  </ItemGroup>

--- a/src/installer/tests/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj
+++ b/src/installer/tests/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

 </Project>
--- a/src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj
+++ b/src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj
@@ -8,7 +8,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

 </Project>
--- a/src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj
+++ b/src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

 </Project>
--- a/src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj
+++ b/src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj
@@ -9,7 +9,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

 </Project>
--- a/src/installer/tests/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
+++ b/src/installer/tests/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj
@@ -13,7 +13,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
    <PackageReference Include="xunit.netcore.extensions" Version="1.0.0-prerelease-00206" />
    <PackageReference Include="dotnet-test-xunit" Version="1.0.0-rc2-192208-24" />
  </ItemGroup>

--- a/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj
+++ b/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj
@@ -6,7 +6,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

 </Project>
--- a/src/installer/tests/Assets/TestUtils/TestProjects.props
+++ b/src/installer/tests/Assets/TestUtils/TestProjects.props
@@ -13,5 +13,7 @@
      win-x86 tests that assumed a win-x64 app host RID based on the runner SDK.
    -->
    <AppHostRuntimeIdentifier>$(TestTargetRid)</AppHostRuntimeIdentifier>
+
+    <NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
  </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
--- a/src/installer/tests/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs
+++ b/src/installer/tests/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs
@@ -449,9 +449,9 @@ public TestApp CreateComponentWithDependencies(Action<NetCoreAppBuilder> customi
                NetCoreAppBuilder builder = NetCoreAppBuilder.PortableForNETCoreApp(componentWithDependencies)
                    .WithProject(p => p.WithAssemblyGroup(null, g => g.WithMainAssembly()))
                    .WithProject("ComponentDependency", "1.0.0", p => p.WithAssemblyGroup(null, g => g.WithAsset("ComponentDependency.dll")))
-                    .WithPackage("Newtonsoft.Json", "9.0.1", p => p.WithAssemblyGroup(null, g => g
+                    .WithPackage("Newtonsoft.Json", "13.0.1", p => p.WithAssemblyGroup(null, g => g
                        .WithAsset("lib/netstandard1.0/Newtonsoft.Json.dll", f => f
-                            .WithVersion("9.0.0.0", "9.0.1.19813")
+                            .WithVersion("13.0.0.0", "13.0.1.25517")
                            .WithFileOnDiskPath("Newtonsoft.Json.dll"))))
                    .WithPackage("Libuv", "1.9.1", p => p
                        .WithNativeLibraryGroup("debian-x64", g => g.WithAsset("runtimes/debian-x64/native/libuv.so"))

--- a/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.ComHost.Tests/ClsidMapTests.cs
+++ b/src/installer/tests/Microsoft.NET.HostModel.Tests/Microsoft.NET.HostModel.ComHost.Tests/ClsidMapTests.cs
@@ -20,7 +20,7 @@ public class ClsidMapTests : IClassFixture<ClsidMapTests.SharedTestState>

        public ClsidMapTests(SharedTestState fixture)
        {
-            sharedTestState = fixture; 
+            sharedTestState = fixture;
        }

        [Fact]
@@ -122,7 +122,7 @@ private JObject CreateClsidMap(TestProjectFixture project)
            }

            using (var clsidMapFile = File.OpenText(clsidMapPath))
-            using (var clsidMapReader = new JsonTextReader(clsidMapFile))
+            using (var clsidMapReader = new JsonTextReader(clsidMapFile) { MaxDepth = null })
            {
                return JObject.Load(clsidMapReader);
            }

--- a/src/installer/tests/TestUtils/RuntimeConfig.cs
+++ b/src/installer/tests/TestUtils/RuntimeConfig.cs
@@ -121,7 +121,7 @@ public static RuntimeConfig FromFile(string path)
            if (File.Exists(path))
            {
                using (TextReader textReader = File.OpenText(path))
-                using (JsonTextReader reader = new JsonTextReader(textReader))
+                using (var reader = new JsonTextReader(textReader) { MaxDepth = null })
                {
                    JObject root = (JObject)JToken.ReadFrom(reader);
                    JObject runtimeOptions = (JObject)root["runtimeOptions"];

--- a/src/installer/tests/TestUtils/TestUtils.csproj
+++ b/src/installer/tests/TestUtils/TestUtils.csproj
@@ -15,7 +15,7 @@
    <PackageReference Include="FluentAssertions" Version="4.19.4" />
    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
    <PackageReference Include="xunit.core" Version="$(XUnitVersion)" ExcludeAssets="build" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
  </ItemGroup>


--- a/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextJsonWriterTests.cs
+++ b/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextJsonWriterTests.cs
@@ -24,7 +24,7 @@ public JObject Save(DependencyContext dependencyContext)
                {
                    using (var textReader = new StreamReader(readStream))
                    {
-                        using (var reader = new JsonTextReader(textReader))
+                        using (var reader = new JsonTextReader(textReader) { MaxDepth = null })
                        {
                            return JObject.Load(reader);
                        }

--- a/src/libraries/Microsoft.NETCore.Platforms/src/GenerateRuntimeGraph.cs
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/GenerateRuntimeGraph.cs
@@ -344,7 +344,7 @@ private void AddRuntimeIdentifiers(ICollection<RuntimeGroup> runtimeGroups)
        {
            var serializer = new JsonSerializer();
            using (var file = File.OpenText(mapFile))
-            using (var jsonTextReader = new JsonTextReader(file))
+            using (var jsonTextReader = new JsonTextReader(file) { MaxDepth = null })
            {
                return serializer.Deserialize<IDictionary<string, IEnumerable<string>>>(jsonTextReader);
            }

--- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonDocumentTests.cs
@@ -553,7 +553,7 @@ public static async Task ParseJson_SequenceBytes_Multi(bool compactData, TestCas

                    using (var stream = new MemoryStream(dataUtf8))
                    using (var streamReader = new StreamReader(stream, Encoding.UTF8, false, 1024, true))
-                    using (JsonTextReader jsonReader = new JsonTextReader(streamReader))
+                    using (var jsonReader = new JsonTextReader(streamReader) { MaxDepth = null })
                    {
                        JToken jToken = JToken.ReadFrom(jsonReader);

@@ -3656,7 +3656,7 @@ private static string GetCompactJson(TestCaseType testCaseType, string jsonStrin
                return existing;
            }

-            using (JsonTextReader jsonReader = new JsonTextReader(new StringReader(jsonString)))
+            using (var jsonReader = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null })
            {
                jsonReader.FloatParseHandling = FloatParseHandling.Decimal;
                JToken jtoken = JToken.ReadFrom(jsonReader);

--- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonTestHelper.cs
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonTestHelper.cs
@@ -28,7 +28,7 @@ internal static partial class JsonTestHelper
        public static string NewtonsoftReturnStringHelper(TextReader reader)
        {
            var sb = new StringBuilder();
-            var json = new JsonTextReader(reader);
+            var json = new JsonTextReader(reader) { MaxDepth = null };
            while (json.Read())
            {
                if (json.Value != null)
@@ -358,7 +358,7 @@ public static string InsertCommentsEverywhere(string jsonString)
            {
                writer.Formatting = Formatting.Indented;

-                var newtonsoft = new JsonTextReader(new StringReader(jsonString));
+                var newtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null };
                writer.WriteComment("comment");
                while (newtonsoft.Read())
                {
@@ -372,7 +372,7 @@ public static string InsertCommentsEverywhere(string jsonString)

        public static List<JsonTokenType> GetTokenTypes(string jsonString)
        {
-            var newtonsoft = new JsonTextReader(new StringReader(jsonString));
+            var newtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null };
            int totalReads = 0;
            while (newtonsoft.Read())
            {
@@ -383,7 +383,7 @@ public static List<JsonTokenType> GetTokenTypes(string jsonString)

            for (int i = 0; i < totalReads; i++)
            {
-                newtonsoft = new JsonTextReader(new StringReader(jsonString));
+                newtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null };
                for (int j = 0; j < i; j++)
                {
                    Assert.True(newtonsoft.Read());
@@ -703,7 +703,7 @@ public static decimal NextDecimal(Random random, double minValue, double maxValu

        public static string GetCompactString(string jsonString)
        {
-            using (JsonTextReader jsonReader = new JsonTextReader(new StringReader(jsonString)))
+            using (var jsonReader = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null })
            {
                jsonReader.FloatParseHandling = FloatParseHandling.Decimal;
                JToken jtoken = JToken.ReadFrom(jsonReader);

--- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Utf8JsonReaderTests.TryGet.cs
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Utf8JsonReaderTests.TryGet.cs
@@ -1026,7 +1026,7 @@ public static void TestingGetString(string jsonString)
            var expectedPropertyNames = new List<string>();
            var expectedValues = new List<string>();

-            var jsonNewtonsoft = new JsonTextReader(new StringReader(jsonString));
+            var jsonNewtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null };
            while (jsonNewtonsoft.Read())
            {
                if (jsonNewtonsoft.TokenType == JsonToken.String)

--- a/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj
+++ b/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj
@@ -10,7 +10,7 @@
  <ItemGroup>
    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.7.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.7" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
  </ItemGroup>


--- a/src/tests/Common/external/external.csproj
+++ b/src/tests/Common/external/external.csproj
@@ -68,8 +68,8 @@
    <PackageReference Include="Microsoft.CodeAnalysis.Compilers" Version="1.1.1" />
    <PackageReference Include="CommandLineParser" Version="2.1.1-beta" />
    <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(TraceEventVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="$(NewtonsoftJsonBsonVersion)" />
    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
    <PackageReference Include="Microsoft.DotNet.XUnitConsoleRunner" Version="$(MicrosoftDotNetXUnitConsoleRunnerVersion)" GeneratePathProperty="True" />
    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />

--- a/src/tests/ilverify/ILVerificationTests.csproj
+++ b/src/tests/ilverify/ILVerificationTests.csproj
@@ -16,7 +16,7 @@
  <Import Project="..\..\coreclr\tools\ILVerification\ILVerification.projitems" />

  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
  </ItemGroup>

  <ItemGroup>