From b5bff86025d99ac0f34e81293aea38efda1ab56f Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 25 Oct 2024 19:28:35 +0200 Subject: [PATCH 1/5] [wasm] Re-enable skiasharp WBT tests --- src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs | 1 - src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs | 4 ++-- src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs index 25bd5c7f4d06b..c93ec2c6af452 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs @@ -22,7 +22,6 @@ public MiscTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildC [InlineData("Debug", false)] [InlineData("Release", true)] [InlineData("Release", false)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/103566")] public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink) { string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{GetRandomId()}"; diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs index b61f4b13cf922..9d432028781f5 100644 --- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs +++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs @@ -629,8 +629,8 @@ internal BuildPaths GetBuildPaths(BuildArgs buildArgs, bool forPublish = true) } protected static string GetSkiaSharpReferenceItems() - => @" - + => @" + "; protected static string s_mainReturns42 = @" diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs index 8444f54308d5b..555cfa73fad17 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs @@ -51,7 +51,6 @@ public void ProjectWithNativeReference(BuildArgs buildArgs, RunHost host, string [Theory] [BuildAndRun(aot: false)] [BuildAndRun(aot: true)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/103566")] public void ProjectUsingSkiaSharp(BuildArgs buildArgs, RunHost host, string id) { string projectName = $"AppUsingSkiaSharp"; From c7e15ba0f0603260412d0c986d31ec20241ed21d Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Fri, 25 Oct 2024 21:33:49 +0200 Subject: [PATCH 2/5] Disable Debug/AOT combination That would trigger build error, because we don't support that combination anymore --- src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs index 555cfa73fad17..990d331f0c580 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeLibraryTests.cs @@ -50,7 +50,7 @@ public void ProjectWithNativeReference(BuildArgs buildArgs, RunHost host, string [Theory] [BuildAndRun(aot: false)] - [BuildAndRun(aot: true)] + [BuildAndRun(aot: true, config: "Release")] public void ProjectUsingSkiaSharp(BuildArgs buildArgs, RunHost host, string id) { string projectName = $"AppUsingSkiaSharp"; From e320fd67aabede113e274d0d569ca6d7be70bd3e Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Wed, 30 Oct 2024 20:58:34 +0100 Subject: [PATCH 3/5] Change order of native libs Put NativeFileReference files after the runtime libs. This server as a workaround of #109289 --- src/mono/browser/build/BrowserWasmApp.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mono/browser/build/BrowserWasmApp.targets b/src/mono/browser/build/BrowserWasmApp.targets index 728c600a74022..0eb91f207d8c8 100644 --- a/src/mono/browser/build/BrowserWasmApp.targets +++ b/src/mono/browser/build/BrowserWasmApp.targets @@ -362,8 +362,6 @@ <_WasmExtraJSFile Include="$(_WasmRuntimePackSrcDir)\*.%(JSFileType.Identity)" Kind="%(JSFileType.Kind)" /> <_WasmExtraJSFile Include="$(_WasmRuntimePackSrcDir)\es6\*.%(JSFileType.Identity)" Kind="%(JSFileType.Kind)" /> - <_WasmNativeFileForLinking Include="@(NativeFileReference)" /> - @@ -466,6 +464,7 @@ <_WasmNativeFileForLinking Condition="'$(_WasmSIMDLib)' != ''" Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmSIMDLib)" /> <_WasmNativeFileForLinking Remove="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmEHLibToExclude)" /> <_WasmNativeFileForLinking Remove="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmSIMDLibToExclude)" /> + <_WasmNativeFileForLinking Include="@(NativeFileReference)" /> <_WasmExtraJSFile Include="@(Content)" Condition="'%(Content.Extension)' == '.js'" /> From a7ab4659da43b5a843ec4bf97e138c452842b177 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Mon, 18 Nov 2024 22:34:27 +0100 Subject: [PATCH 4/5] Update llvm, emsdk and icu deps --- eng/Version.Details.xml | 160 ++++++++++++++++++++-------------------- eng/Versions.props | 64 ++++++++-------- 2 files changed, 112 insertions(+), 112 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44f37abdef19e..3b43f2be5d864 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 780c9748fffbe52d73eb00b06a74add257f7aca4 + fab86913c2513c26d997776758866c100ce986dc https://github.com/dotnet/msquic @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a https://github.com/dotnet/command-line-api @@ -64,14 +64,14 @@ b897087e8b76481a9213ae422f5dc16f64a124b5 - + https://github.com/dotnet/emsdk - e965cbbf7eae80e2a62e46f0fcf68ab8f47792c4 + e7fb22a6e083ab5886b9adbff7e84d4015dbd888 - + https://github.com/dotnet/emsdk - e965cbbf7eae80e2a62e46f0fcf68ab8f47792c4 + e7fb22a6e083ab5886b9adbff7e84d4015dbd888 @@ -222,89 +222,89 @@ https://github.com/dotnet/runtime-assets 8254bfd574d0f7a89450a2e191d9e9f3dfb8ad59 - + https://github.com/dotnet/llvm-project - 3eb501e13a7ced23e21fff28647a7b1bf5cc13f1 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - 3eb501e13a7ced23e21fff28647a7b1bf5cc13f1 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - 3eb501e13a7ced23e21fff28647a7b1bf5cc13f1 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - 3eb501e13a7ced23e21fff28647a7b1bf5cc13f1 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - 3eb501e13a7ced23e21fff28647a7b1bf5cc13f1 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - 3eb501e13a7ced23e21fff28647a7b1bf5cc13f1 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - 3eb501e13a7ced23e21fff28647a7b1bf5cc13f1 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a - + https://github.com/dotnet/llvm-project - cb75d3a5d108bcab298682c62814109a7651b277 + 6fb3dcbf3ffc947795cee859501ff5f946c98e4a https://github.com/dotnet/runtime @@ -442,37 +442,37 @@ https://github.com/NuGet/NuGet.Client 8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8 - + https://github.com/dotnet/node - 78c56619da525bd37de4c2828092762fb4fa03c4 + 1e43410e056dea7692e0c618c514c0f3016e217c - + https://github.com/dotnet/node - 78c56619da525bd37de4c2828092762fb4fa03c4 + 1e43410e056dea7692e0c618c514c0f3016e217c - + https://github.com/dotnet/node - 78c56619da525bd37de4c2828092762fb4fa03c4 + 1e43410e056dea7692e0c618c514c0f3016e217c - + https://github.com/dotnet/node - 78c56619da525bd37de4c2828092762fb4fa03c4 + 1e43410e056dea7692e0c618c514c0f3016e217c - + https://github.com/dotnet/node - 78c56619da525bd37de4c2828092762fb4fa03c4 + 1e43410e056dea7692e0c618c514c0f3016e217c - + https://github.com/dotnet/node - 78c56619da525bd37de4c2828092762fb4fa03c4 + 1e43410e056dea7692e0c618c514c0f3016e217c - + https://github.com/dotnet/node - 78c56619da525bd37de4c2828092762fb4fa03c4 + 1e43410e056dea7692e0c618c514c0f3016e217c - + https://github.com/dotnet/node - 78c56619da525bd37de4c2828092762fb4fa03c4 + 1e43410e056dea7692e0c618c514c0f3016e217c diff --git a/eng/Versions.props b/eng/Versions.props index 54de087efb0f8..cf8d61f315a89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,56 +216,56 @@ 0.11.5-alpha.24521.1 - 10.0.0-alpha.1.24531.1 + 10.0.0-alpha.1.24568.3 2.4.3 9.0.0-alpha.1.24167.3 - 19.1.0-alpha.1.24523.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24523.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24523.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24523.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24523.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24523.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24523.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 - 10.0.0-alpha.1.24524.3 + 10.0.0-alpha.1.24568.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportVersion) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 - 19.1.0-alpha.1.24517.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 + 19.1.0-alpha.1.24565.1 3.1.7 1.0.406601 $(MicrosoftDotNetApiCompatTaskVersion) - 10.0.0-alpha.1.24523.1 + 10.0.0-alpha.1.24554.4 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) From 9d26d9dde8593e902cd63c037a5835cd410aef34 Mon Sep 17 00:00:00 2001 From: Radek Doulik Date: Tue, 19 Nov 2024 09:23:09 +0100 Subject: [PATCH 5/5] Revert "Change order of native libs" This reverts commit e320fd67aabede113e274d0d569ca6d7be70bd3e. --- src/mono/browser/build/BrowserWasmApp.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mono/browser/build/BrowserWasmApp.targets b/src/mono/browser/build/BrowserWasmApp.targets index 0eb91f207d8c8..728c600a74022 100644 --- a/src/mono/browser/build/BrowserWasmApp.targets +++ b/src/mono/browser/build/BrowserWasmApp.targets @@ -362,6 +362,8 @@ <_WasmExtraJSFile Include="$(_WasmRuntimePackSrcDir)\*.%(JSFileType.Identity)" Kind="%(JSFileType.Kind)" /> <_WasmExtraJSFile Include="$(_WasmRuntimePackSrcDir)\es6\*.%(JSFileType.Identity)" Kind="%(JSFileType.Kind)" /> + <_WasmNativeFileForLinking Include="@(NativeFileReference)" /> + @@ -464,7 +466,6 @@ <_WasmNativeFileForLinking Condition="'$(_WasmSIMDLib)' != ''" Include="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmSIMDLib)" /> <_WasmNativeFileForLinking Remove="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmEHLibToExclude)" /> <_WasmNativeFileForLinking Remove="$(MicrosoftNetCoreAppRuntimePackRidNativeDir)$(_WasmSIMDLibToExclude)" /> - <_WasmNativeFileForLinking Include="@(NativeFileReference)" /> <_WasmExtraJSFile Include="@(Content)" Condition="'%(Content.Extension)' == '.js'" />