diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5a3fbf5d4a78d..26f761c6f2c7d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23326.1", + "version": "8.0.0-prerelease.23360.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ca799cb48e83..af1fb0c364b92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 8b4b43391312d2f6bf508d9ad0003010f0a771d6 + 5cbe29a3ea16c6d20d8f6c551a80e05c5b714aba https://github.com/dotnet/msquic @@ -85,14 +85,14 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759b - + https://github.com/dotnet/cecil - 3e46711f5a933551557286d211970faa08b07b7e + 1a6a83a8f50e1119f1007b1e3c211d3289ba6901 - + https://github.com/dotnet/emsdk - 60a73f97a0ec16c25ce4d36b1bcff1fedb831716 + afbff08914374ed6790324635b9346d1256680fc @@ -107,136 +107,136 @@ - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/sourcelink - 4d2c8bf58e8cb7900ec2d9077c155572e2d3cd88 + a1eed1e0522f47f4fbf60ed5f8caef3679208d66 - + https://github.com/dotnet/xliff-tasks - b0368bfd6df87d2e30b1191d81c477b5419a9f29 + 10a822a79bde97ca45faa76dc4ec33b85533728a - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 https://github.com/dotnet/llvm-project @@ -294,46 +294,46 @@ https://github.com/dotnet/llvm-project 623e8749b46c5d3929d292bcc9a29c3202f51dcf - + https://github.com/dotnet/runtime - eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e + ab7c4528edb5301cb849f5e114b7f3cc1dea8149 - + https://github.com/dotnet/runtime - eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e + ab7c4528edb5301cb849f5e114b7f3cc1dea8149 - + https://github.com/dotnet/runtime - eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e + ab7c4528edb5301cb849f5e114b7f3cc1dea8149 - + https://github.com/dotnet/runtime - eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e + ab7c4528edb5301cb849f5e114b7f3cc1dea8149 - + https://github.com/dotnet/runtime - eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e + ab7c4528edb5301cb849f5e114b7f3cc1dea8149 - + https://github.com/dotnet/runtime - eaa9717d90115cea43b4cdd7a2a49e6d3c3d780e + ab7c4528edb5301cb849f5e114b7f3cc1dea8149 - + https://github.com/dotnet/xharness - 747cfb23923a644ee43b012c5bcd7b738a485b8e + ca022cb79bab7a3402802dadec2755e267156793 - + https://github.com/dotnet/xharness - 747cfb23923a644ee43b012c5bcd7b738a485b8e + ca022cb79bab7a3402802dadec2755e267156793 - + https://github.com/dotnet/xharness - 747cfb23923a644ee43b012c5bcd7b738a485b8e + ca022cb79bab7a3402802dadec2755e267156793 - + https://github.com/dotnet/arcade - 8ac0e1280f04bc897998a1f33bf6f27fe2146561 + 2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -351,13 +351,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 001c9cc7e8b0769fab874e6298dd179960d2639c - + https://github.com/dotnet/hotreload-utils - b575971675af1423c0fd133c2f103bca1c7bdee5 + 8362ec8461084d6bcbec2e4371741d0caf2e2e0e - + https://github.com/dotnet/runtime-assets - f8fb817328383c60534d11d57fd884d3b527d6c2 + 7333879999019e28e47f58879180cba54f5e1843 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 0217d8eb4a8ea..3b6320e984ae2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,27 +83,28 @@ 8.0.100-preview.7.23329.3 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 2.5.1-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 - 8.0.0-beta.23328.2 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 2.5.1-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 + 8.0.0-beta.23361.1 6.0.0-preview.1.102 - 8.0.0-preview.7.23325.2 + 8.0.0-preview.7.23359.3 6.0.0 + 8.0.0-preview.7.23359.3 8.0.0-preview.7.23325.2 16.0.5-alpha.1.23354.1 16.0.5-alpha.1.23354.1 @@ -131,27 +132,27 @@ 5.0.0 5.0.0 7.0.0 - 8.0.0-preview.7.23325.2 + 8.0.0-preview.7.23359.3 6.0.0 7.0.0 4.5.4 4.5.0 - 8.0.0-preview.7.23325.2 + 8.0.0-preview.7.23359.3 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 - 8.0.0-beta.23326.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 + 8.0.0-beta.23360.1 1.0.0-prerelease.23354.4 1.0.0-prerelease.23354.4 @@ -178,10 +179,10 @@ 1.1.0 17.4.0-preview-20220707-01 - 8.0.0-prerelease.23326.1 - 8.0.0-prerelease.23326.1 - 8.0.0-prerelease.23326.1 - 8.0.0-alpha.0.23326.2 + 8.0.0-prerelease.23360.3 + 8.0.0-prerelease.23360.3 + 8.0.0-prerelease.23360.3 + 8.0.0-alpha.0.23360.1 2.4.2 1.0.0 2.4.5 @@ -208,11 +209,11 @@ 7.0.0-preview-20221010.1 - 8.0.0-preview.7.23325.2 + 8.0.0-preview.7.23359.3 - 0.11.4-alpha.23327.1 + 0.11.4-alpha.23360.2 - 8.0.0-preview.7.23326.2 + 8.0.0-preview.7.23360.1 2.1.7 8.0.0-alpha.1.23180.2 @@ -235,7 +236,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport --> - 8.0.0-preview.7.23326.1 + 8.0.0-preview.7.23361.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion) 1.1.87-gba258badda diff --git a/eng/testing/tests.wasm.targets b/eng/testing/tests.wasm.targets index c09fe52717a02..4dc6b71005449 100644 --- a/eng/testing/tests.wasm.targets +++ b/eng/testing/tests.wasm.targets @@ -21,6 +21,7 @@ reset-to-zero full + true diff --git a/global.json b/global.json index cf2fbdb9e1d5c..015b2bd8da057 100644 --- a/global.json +++ b/global.json @@ -8,11 +8,11 @@ "dotnet": "8.0.100-preview.5.23303.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23328.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23328.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23328.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23361.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23361.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23325.2" + "Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23359.3" } } diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/TrimmingTests/System.Text.Json.TrimmingTests.proj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/TrimmingTests/System.Text.Json.TrimmingTests.proj index db59eac29e719..6d9885fed2a91 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/TrimmingTests/System.Text.Json.TrimmingTests.proj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/TrimmingTests/System.Text.Json.TrimmingTests.proj @@ -60,8 +60,16 @@ + + + + + + + + - System.Text.Json.JsonSerializer.IsReflectionEnabledByDefault + JsonSerializerIsReflectionEnabledByDefault diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index f664245538828..e0fbccfc2303e 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -139,7 +139,7 @@ - + diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs index cb24f659c96c9..5ec8b4539eb59 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/BuildEnvironment.cs @@ -106,6 +106,7 @@ public BuildEnvironment() // `runtime` repo's build environment sets these, and they // mess up the build for the test project, which is using a different // dotnet + EnvVars["DOTNET_ROOT"] = sdkForWorkloadPath; EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath; EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0"; EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1"; diff --git a/src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs b/src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs index b13b6011de265..5ab27489622ae 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Common/RunCommand.cs @@ -11,7 +11,7 @@ public class RunCommand : DotNetCommand public RunCommand(BuildEnvironment buildEnv, ITestOutputHelper _testOutput, string label="") : base(buildEnv, _testOutput, false, label) { WithEnvironmentVariables(buildEnv.EnvVars); - WithEnvironmentVariable("DOTNET_ROOT", buildEnv.DotNet); + WithEnvironmentVariable("DOTNET_ROOT", Path.GetDirectoryName(buildEnv.DotNet)!); WithEnvironmentVariable("DOTNET_INSTALL_DIR", Path.GetDirectoryName(buildEnv.DotNet)!); WithEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0"); WithEnvironmentVariable("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "1");