diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index cc7a55f3d7f769..19607c64cbbd0b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.24312.3", + "version": "9.0.0-prerelease.24317.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f80f9f7392e573..6ecf9c25c15322 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 4fb2c4adac4956c542effd0b740b86297cfec759 + d7046f8482b4e470a2c9046998671f86dd69773c https://github.com/dotnet/msquic @@ -48,24 +48,24 @@ https://github.com/dotnet/llvm-project 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/command-line-api - a045dd54a4c44723c215d992288160eb1401bb7f + 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/command-line-api - a045dd54a4c44723c215d992288160eb1401bb7f + 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - d145726036eb9c09a0e3cf03c4f70effd3b31cd7 + 7e4af02521473d89d6144b3da58fef253e498974 - + https://github.com/dotnet/cecil - d145726036eb9c09a0e3cf03c4f70effd3b31cd7 + 7e4af02521473d89d6144b3da58fef253e498974 @@ -174,57 +174,57 @@ https://github.com/dotnet/arcade ef3e671d0a92f5e7ebef53cd15b44b33dd04ef25 - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d https://github.com/dotnet/llvm-project @@ -282,55 +282,55 @@ https://github.com/dotnet/llvm-project 26f8c30340764cfa7fa9090dc01a36c222bf09c1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/runtime - 8fac5af2b11dc98fa0504f6fd06df790164ec958 + d38e5593427f63e513ca3be11c3fdccb07b88ce1 - + https://github.com/dotnet/xharness - 6ce15319de72ab6d4c3b0f4c40f59300cffc5450 + 65d0584b517952962b7a79195b5d7606b52fcbfe - + https://github.com/dotnet/xharness - 6ce15319de72ab6d4c3b0f4c40f59300cffc5450 + 65d0584b517952962b7a79195b5d7606b52fcbfe - + https://github.com/dotnet/xharness - 6ce15319de72ab6d4c3b0f4c40f59300cffc5450 + 65d0584b517952962b7a79195b5d7606b52fcbfe https://github.com/dotnet/arcade @@ -352,13 +352,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization c3acfd159662959ff09f3a0d7663023db48bb78a - + https://github.com/dotnet/hotreload-utils - f1b0f9c44da6713b2eb02b754a8ef653ca035874 + 10963c8df78c0881bc5fad76657fce2ddc6e47b4 - + https://github.com/dotnet/runtime-assets - 40711d8fe9f9971dada6d9f8388f19978bb14223 + ec2da34cd7e31a605d6f30f02021a8d76947c99d https://github.com/dotnet/roslyn @@ -386,14 +386,14 @@ 0b8371953e61f6179f39f1d62ebbd6a251f335e0 - + https://github.com/dotnet/sdk - 651839198c00b7c7b95db37dbb9268b66691fad0 + ea9243f9cb36e56aba4cf6364a4d53a5c2d458fb - + https://github.com/dotnet/sdk - 651839198c00b7c7b95db37dbb9268b66691fad0 + ea9243f9cb36e56aba4cf6364a4d53a5c2d458fb diff --git a/eng/Versions.props b/eng/Versions.props index 7523819dc94a37..37eb2fb5fad342 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ 0.2.0 - 9.0.100-preview.6.24311.23 + 9.0.100-preview.7.24323.5 9.0.0-beta.24311.10 9.0.0-beta.24311.10 @@ -104,10 +104,10 @@ 6.0.0-preview.1.102 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24323.2 6.0.0 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24323.2 6.0.0 1.1.1 @@ -119,39 +119,39 @@ 8.0.0 5.0.0 4.5.5 - 9.0.0-preview.6.24307.2 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24323.2 + 9.0.0-preview.6.24323.2 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24323.2 6.0.0 7.0.0 4.5.4 4.5.0 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24323.2 8.0.0 8.0.0 8.0.0 8.0.0 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 - 9.0.0-beta.24312.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 + 9.0.0-beta.24324.1 1.0.0-prerelease.24223.3 1.0.0-prerelease.24223.3 @@ -162,7 +162,7 @@ 2.0.0 17.10.0-beta1.24272.1 - 2.0.0-beta4.23407.1 + 2.0.0-beta4.24324.3 9.0.0-preview.7.24327.2 3.1.7 @@ -181,10 +181,10 @@ 1.4.0 17.4.0-preview-20220707-01 - 9.0.0-prerelease.24312.3 - 9.0.0-prerelease.24312.3 - 9.0.0-prerelease.24312.3 - 9.0.0-alpha.0.24312.1 + 9.0.0-prerelease.24317.3 + 9.0.0-prerelease.24317.3 + 9.0.0-prerelease.24317.3 + 9.0.0-alpha.0.24324.1 3.12.0 4.5.0 6.0.0 @@ -212,11 +212,11 @@ 8.0.0-preview-20230918.1 - 0.11.4-alpha.24313.1 + 0.11.5-alpha.24324.1 - 9.0.0-preview.6.24307.2 + 9.0.0-preview.6.24323.2 - 9.0.0-preview.6.24312.1 + 9.0.0-preview.7.24324.1 2.3.5 9.0.0-alpha.1.24167.3 diff --git a/global.json b/global.json index 72d6b7044096b5..be2e526591bc82 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24311.10", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "9.0.0-preview.6.24307.2" + "Microsoft.NET.Sdk.IL": "9.0.0-preview.6.24323.2" } } diff --git a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs index c4380ed755a591..5e351203596d43 100644 --- a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/LibraryInitializerTests.cs @@ -16,7 +16,7 @@ namespace Wasm.Build.Tests.TestAppScenarios; -public class LibraryInitializerTests : AppTestBase +public partial class LibraryInitializerTests : AppTestBase { public LibraryInitializerTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) : base(output, buildContext) @@ -36,6 +36,9 @@ public async Task LoadLibraryInitializer() ); } + [GeneratedRegex("MONO_WASM: Failed to invoke 'onRuntimeConfigLoaded' on library initializer '../WasmBasicTestApp.[a-z0-9]+.lib.module.js': Error: Error thrown from library initializer")] + private static partial Regex AbortStartupOnErrorRegex(); + [Fact] public async Task AbortStartupOnError() { @@ -48,6 +51,6 @@ public async Task AbortStartupOnError() BrowserQueryString: new Dictionary { ["throwError"] = "true" }, ExpectedExitCode: 1 )); - Assert.True(result.ConsoleOutput.Any(m => m.Contains("MONO_WASM: Failed to invoke 'onRuntimeConfigLoaded' on library initializer '../WasmBasicTestApp.lib.module.js': Error: Error thrown from library initializer")), "The library initializer test didn't emit expected error message"); + Assert.True(result.ConsoleOutput.Any(m => AbortStartupOnErrorRegex().IsMatch(m)), "The library initializer test didn't emit expected error message"); } }