diff --git a/eng/Versions.props b/eng/Versions.props index 9c3905672b43bd763e708d7d0c45606fa389e800..30dff6f3864305dacc64cda431f66ba3fca18354 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,7 +158,8 @@ 0.12.0-pre.20 2.4.5 3.1.2 - 12.0.3 + 13.0.1 + 1.0.2 2.0.4 4.12.0 2.14.3 diff --git a/src/installer/tests/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj b/src/installer/tests/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj index 570b3efa794ed5a436040456c65545f98ed5f64b..087d0c77a536d8003223481b63b16ef67d092465 100644 --- a/src/installer/tests/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj +++ b/src/installer/tests/Assets/TestProjects/HostApiInvokerApp/HostApiInvokerApp.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/LightupLib/LightupLib.csproj b/src/installer/tests/Assets/TestProjects/LightupLib/LightupLib.csproj index e7fb1c6a065401d413545fd93ddacd47e8432766..976a8423304a08d278637cdd516d587e3fd35b7e 100644 --- a/src/installer/tests/Assets/TestProjects/LightupLib/LightupLib.csproj +++ b/src/installer/tests/Assets/TestProjects/LightupLib/LightupLib.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/PortableApp/PortableApp.csproj b/src/installer/tests/Assets/TestProjects/PortableApp/PortableApp.csproj index 0a72b6bc1fcd7910ee84bbc6132c2450f4431e58..96f7d1396624aedcba5289f76df99f6fdaff2d75 100644 --- a/src/installer/tests/Assets/TestProjects/PortableApp/PortableApp.csproj +++ b/src/installer/tests/Assets/TestProjects/PortableApp/PortableApp.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj b/src/installer/tests/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj index 26b183bbec0853acd668afc1e1ac126a42924acc..bfad7e21bea76c0d41f2a5c37d3ac023e6832588 100644 --- a/src/installer/tests/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj +++ b/src/installer/tests/Assets/TestProjects/PortableTestApp/PortableTestApp.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj b/src/installer/tests/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj index e1f97d2216d9a8b64458126c4f463748116aed57..9cf6012fd61b7c578368f732cecbb5153828a6d4 100644 --- a/src/installer/tests/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj +++ b/src/installer/tests/Assets/TestProjects/SharedFxLookupPortableApp/SharedFxLookupPortableApp.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj b/src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj index 0846750fb7c91892b5c90445accfd0a851365ca3..0e51cdb190b3fc891ebfaf75bd2ffe63f7d35ab0 100644 --- a/src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj +++ b/src/installer/tests/Assets/TestProjects/StandaloneApp/StandaloneApp.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj b/src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj index 14513b05b71a92c0cb0943485b8fcc75782b31ac..19ee347ce0f0d5b737e20af5d90a984a1c0f0659 100644 --- a/src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj +++ b/src/installer/tests/Assets/TestProjects/StandaloneApp20/StandaloneApp20.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj b/src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj index c8593050181b1968155e5d7340f47a76762a7e46..abc14d18be43439c0a575f5baed6f248b6e14f14 100644 --- a/src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj +++ b/src/installer/tests/Assets/TestProjects/StandaloneApp21/StandaloneApp21.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj b/src/installer/tests/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj index 42bc4348e5d5b9193be3ee4065de933d9208b3c2..f06537cca75abc204b61697b1241a14eefca97e7 100644 --- a/src/installer/tests/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj +++ b/src/installer/tests/Assets/TestProjects/StandaloneTestApp/StandaloneTestApp.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj b/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj index cc51ff2471c3e74d2775c1faf7ae02cb08028784..48714afea7d9245eb2241101d17c88dc845b568f 100644 --- a/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj +++ b/src/installer/tests/Assets/TestProjects/StartupHookWithDependency/StartupHookWithDependency.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.props b/src/installer/tests/Assets/TestUtils/TestProjects.props index 3f595ca7026f6f55c8987836e0aa6783e7ad3237..33ab2ba4f032d0db60ff78c1c85cbe59fe9db6e5 100644 --- 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. --> $(TestTargetRid) + + 13.0.1 - \ No newline at end of file + diff --git a/src/installer/tests/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs b/src/installer/tests/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs index 33f248b546e7ed417bdcb3242debfb88e1273ca6..1ecdc674f0f0d65bc9bed01e0c32ff410a079919 100644 --- 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 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")) diff --git 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 index 649b34c500b8798da95e7702018c6ae4507978d9..8b496c191f222c2acaa95f7a7ca0b1e809f32dd8 100644 --- 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 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); } diff --git a/src/installer/tests/TestUtils/RuntimeConfig.cs b/src/installer/tests/TestUtils/RuntimeConfig.cs index 809a5c9d09bbb1f5f9ab27a642a77dcceaa0f24a..b4abe04cdbc90580f273a61d637156f35f22f6e5 100644 --- 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"]; diff --git a/src/installer/tests/TestUtils/TestUtils.csproj b/src/installer/tests/TestUtils/TestUtils.csproj index f22b1c71a602534f76ecbced724a39ddf318bbbb..8b3aa59523726550f9f24f190bbfa0836c9c52c8 100644 --- a/src/installer/tests/TestUtils/TestUtils.csproj +++ b/src/installer/tests/TestUtils/TestUtils.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextJsonWriterTests.cs b/src/libraries/Microsoft.Extensions.DependencyModel/tests/DependencyContextJsonWriterTests.cs index c17a7dc085b552acc9185a89b92eecb87998c18a..48f8deebe99475bf13d7aa9b3205a7c001b8d16a 100644 --- 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); } diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/GenerateRuntimeGraph.cs b/src/libraries/Microsoft.NETCore.Platforms/src/GenerateRuntimeGraph.cs index 263b437bd8e1fc7c81f591bdb62ba7744823777b..8ecc4c2deea9ad6ccbef7a534cf45c156448a7dc 100644 --- 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 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>>(jsonTextReader); } diff --git 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 index 9b92c9ae3656a465948f3343d97d2d367885d18c..45590069c094f2b7db0e3f0b65f2d59b02a861a6 100644 --- 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); diff --git 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 index 1c0302727df093c70ee03d81b35d423ea1c91c34..90d6dbca7be458e43f501678d370f4775ef64b25 100644 --- 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 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 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); diff --git 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 index 15793c465fcf07b667ffeb0b563db7dcda093fe8..9ae890d35397b33b56325be202a6bf49d9430572 100644 --- 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(); var expectedValues = new List(); - var jsonNewtonsoft = new JsonTextReader(new StringReader(jsonString)); + var jsonNewtonsoft = new JsonTextReader(new StringReader(jsonString)) { MaxDepth = null }; while (jsonNewtonsoft.Read()) { if (jsonNewtonsoft.TokenType == JsonToken.String) diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj b/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj index 5e188c3172b61ea86b59c526eaff1a3ab3929953..c05515cdd10624c03160cc517fafc50694ada0be 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj +++ b/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/tests/Common/external/external.csproj b/src/tests/Common/external/external.csproj index 4d6f87eb5716ad5fc42c9959b47214012bbb003a..1e4242242eac909a503626736f24e654a1c85a8f 100644 --- a/src/tests/Common/external/external.csproj +++ b/src/tests/Common/external/external.csproj @@ -68,8 +68,8 @@ - - + + diff --git a/src/tests/ilverify/ILVerificationTests.csproj b/src/tests/ilverify/ILVerificationTests.csproj index fce08babfde3f2ea330ac2488e36349ccd0cab8d..3144da43d0c20c11b6dd9f16c76b2aa2d5defd8f 100644 --- a/src/tests/ilverify/ILVerificationTests.csproj +++ b/src/tests/ilverify/ILVerificationTests.csproj @@ -16,7 +16,7 @@ - +