From 44ade98354a636789cc0dc4e0b0e7ffad35e0610 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Thu, 13 Jun 2024 15:16:56 +0000 Subject: [PATCH 1/5] Fix. --- src/mono/browser/browser.proj | 10 +++++++++- src/mono/browser/build/BrowserWasmApp.targets | 3 --- src/mono/wasi/build/WasiApp.targets | 5 ----- src/mono/wasi/wasi.proj | 8 ++++++++ src/mono/wasm/build/WasmApp.Common.targets | 9 ++------- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index 12bdcca654264..de5809f5e6012 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -325,7 +325,15 @@ ], "WasmOptConfigurationFlags": [@(WasmOptConfigurationFlags -> '%22%(Identity)%22', ',')], "EmccDefaultExportedFunctions": [@(EmccExportedFunction -> '%22%(Identity)%22', ',')], - "EmccDefaultExportedRuntimeMethods": [@(EmccExportedRuntimeMethod -> '%22%(Identity)%22', ',')] + "EmccDefaultExportedRuntimeMethods": [@(EmccExportedRuntimeMethod -> '%22%(Identity)%22', ',')], + "BoolPropertiesThatTriggerRelinking": [ + { "identity": "InvariantTimezone", "defaultValueInRuntimePack": "false" }, + { "identity": "InvariantGlobalization", "defaultValueInRuntimePack": "false" }, + { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "true" }, + { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "false" }, + { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "true" }, + { "identity": "WasmEnableExceptionHandling", "defaultValueInRuntimePack": "true" }, + ], } } ]]> diff --git a/src/mono/browser/build/BrowserWasmApp.targets b/src/mono/browser/build/BrowserWasmApp.targets index fc8708fed161d..ae7ea4f7f781d 100644 --- a/src/mono/browser/build/BrowserWasmApp.targets +++ b/src/mono/browser/build/BrowserWasmApp.targets @@ -61,9 +61,6 @@ - - <_BoolPropertiesThatTriggerRelinking Include="WasmEnableSIMD" DefaultValueInRuntimePack="true" /> - <_BoolPropertiesThatTriggerRelinking Include="WasmEnableExceptionHandling" DefaultValueInRuntimePack="true" /> diff --git a/src/mono/wasi/build/WasiApp.targets b/src/mono/wasi/build/WasiApp.targets index c2e3ae6f11962..40664b86a7d42 100644 --- a/src/mono/wasi/build/WasiApp.targets +++ b/src/mono/wasi/build/WasiApp.targets @@ -46,11 +46,6 @@ - - <_BoolPropertiesThatTriggerRelinking Include="WasmEnableSIMD" DefaultValueInRuntimePack="false" /> - - - diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj index 120607ce7e9fc..c57ce1c6bfda0 100644 --- a/src/mono/wasi/wasi.proj +++ b/src/mono/wasi/wasi.proj @@ -152,9 +152,17 @@ { "items": { "WasmOptConfigurationFlags": [@(WasmOptConfigurationFlags -> '%22%(Identity)%22', ',')], + "BoolPropertiesThatTriggerRelinking": [ + { "identity": "InvariantTimezone", "defaultValueInRuntimePack": "false" }, + { "identity": "InvariantGlobalization", "defaultValueInRuntimePack": "false" }, + { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "true" }, + { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "false" }, + { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "false" }, + ], } } ]]> + diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 7f9e8230815ab..c95c228fc9d0b 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -113,13 +113,6 @@ - - <_BoolPropertiesThatTriggerRelinking Include="InvariantTimezone" DefaultValueInRuntimePack="false" /> - <_BoolPropertiesThatTriggerRelinking Include="InvariantGlobalization" DefaultValueInRuntimePack="false" /> - <_BoolPropertiesThatTriggerRelinking Include="WasmNativeStrip" DefaultValueInRuntimePack="true" /> - <_BoolPropertiesThatTriggerRelinking Include="WasmSingleFileBundle" DefaultValueInRuntimePack="false" /> - - $(PrepareInputsForWasmBuildDependsOn); @@ -400,6 +393,7 @@ + @@ -411,6 +405,7 @@ + From 1936f6e0aff6e802b8948693bd84558a4d75961f Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Fri, 14 Jun 2024 13:00:58 +0000 Subject: [PATCH 2/5] Fix --- src/mono/browser/browser.proj | 4 ++-- src/mono/wasi/wasi.proj | 6 +++--- src/mono/wasm/build/WasmApp.Common.targets | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index de5809f5e6012..622dc5487b4d7 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -332,8 +332,8 @@ { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "true" }, { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "false" }, { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "true" }, - { "identity": "WasmEnableExceptionHandling", "defaultValueInRuntimePack": "true" }, - ], + { "identity": "WasmEnableExceptionHandling", "defaultValueInRuntimePack": "true" } + ] } } ]]> diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj index c57ce1c6bfda0..38b9145f2a0b0 100644 --- a/src/mono/wasi/wasi.proj +++ b/src/mono/wasi/wasi.proj @@ -157,12 +157,12 @@ { "identity": "InvariantGlobalization", "defaultValueInRuntimePack": "false" }, { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "true" }, { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "false" }, - { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "false" }, - ], + { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "false" } + ] } } ]]> - + diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index c95c228fc9d0b..6aafca7d110a2 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -117,10 +117,10 @@ $(PrepareInputsForWasmBuildDependsOn); _SetupToolchain; + _ReadWasmProps; _SetWasmBuildNativeDefaults; _GetDefaultWasmAssembliesToBundle; _WasmGetRuntimeConfigPath; - _ReadWasmProps; From 6f708b566471fbfdaaf4e83dc09d7a9090ee6de3 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 17 Jun 2024 08:05:15 +0000 Subject: [PATCH 3/5] Feedback. --- src/mono/browser/browser.proj | 16 ++++++++++------ src/mono/wasi/wasi.proj | 14 +++++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/mono/browser/browser.proj b/src/mono/browser/browser.proj index 622dc5487b4d7..81768d43e6a53 100644 --- a/src/mono/browser/browser.proj +++ b/src/mono/browser/browser.proj @@ -23,6 +23,10 @@ $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)', 'runtimes', 'browser-wasm', 'native', 'lib')) $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)', 'runtimes', 'browser-wasm-threads', 'native', 'lib')) + false + false + true + false true true true @@ -327,12 +331,12 @@ "EmccDefaultExportedFunctions": [@(EmccExportedFunction -> '%22%(Identity)%22', ',')], "EmccDefaultExportedRuntimeMethods": [@(EmccExportedRuntimeMethod -> '%22%(Identity)%22', ',')], "BoolPropertiesThatTriggerRelinking": [ - { "identity": "InvariantTimezone", "defaultValueInRuntimePack": "false" }, - { "identity": "InvariantGlobalization", "defaultValueInRuntimePack": "false" }, - { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "true" }, - { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "false" }, - { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "true" }, - { "identity": "WasmEnableExceptionHandling", "defaultValueInRuntimePack": "true" } + { "identity": "InvariantTimezone", "defaultValueInRuntimePack": "$(InvariantTimezone)" }, + { "identity": "InvariantGlobalization", "defaultValueInRuntimePack": "$(InvariantGlobalization)" }, + { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "$(WasmNativeStrip)" }, + { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "$(WasmSingleFileBundle)" }, + { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "$(WasmEnableSIMD)" }, + { "identity": "WasmEnableExceptionHandling", "defaultValueInRuntimePack": "$(WasmEnableExceptionHandling)" } ] } } diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj index 38b9145f2a0b0..16bfd90b8c257 100644 --- a/src/mono/wasi/wasi.proj +++ b/src/mono/wasi/wasi.proj @@ -8,6 +8,10 @@ $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)', 'runtimes', 'wasi-wasm', 'native', 'lib')) $([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)', 'runtimes', 'wasi-wasm-threads', 'native', 'lib')) + false + false + true + false false false $(ArtifactsObjDir)wasi @@ -153,11 +157,11 @@ "items": { "WasmOptConfigurationFlags": [@(WasmOptConfigurationFlags -> '%22%(Identity)%22', ',')], "BoolPropertiesThatTriggerRelinking": [ - { "identity": "InvariantTimezone", "defaultValueInRuntimePack": "false" }, - { "identity": "InvariantGlobalization", "defaultValueInRuntimePack": "false" }, - { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "true" }, - { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "false" }, - { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "false" } + { "identity": "InvariantTimezone", "defaultValueInRuntimePack": "$(InvariantTimezone)" }, + { "identity": "InvariantGlobalization", "defaultValueInRuntimePack": "$(InvariantGlobalization)" }, + { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "$(WasmNativeStrip)" }, + { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "$(WasmSingleFileBundle)" }, + { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "$(WasmEnableSIMD)" }, ] } } From 524665e7c1d1141c1e7c057cc92a8aac0662d38d Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Mon, 17 Jun 2024 11:32:18 +0000 Subject: [PATCH 4/5] Fix wasi wbt. --- src/mono/wasm/build/WasmApp.Common.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 6aafca7d110a2..3ccca6b858614 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -397,7 +397,7 @@ - + From 558b7bd88f541ce207321ca1a0c25164334f2d6c Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Tue, 18 Jun 2024 08:44:04 +0000 Subject: [PATCH 5/5] Fix CI - wbt testing native build should set it to true. --- src/mono/wasi/Wasi.Build.Tests/SdkMissingTests.cs | 4 ++-- src/mono/wasi/wasi.proj | 2 +- src/mono/wasm/build/WasmApp.Common.targets | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mono/wasi/Wasi.Build.Tests/SdkMissingTests.cs b/src/mono/wasi/Wasi.Build.Tests/SdkMissingTests.cs index 580754663c12c..99e8b2a144805 100644 --- a/src/mono/wasi/Wasi.Build.Tests/SdkMissingTests.cs +++ b/src/mono/wasi/Wasi.Build.Tests/SdkMissingTests.cs @@ -31,8 +31,8 @@ public static TheoryData TestDataForNativeBuildFails(strin }; [Theory] - [MemberData(nameof(TestDataForNativeBuildFails), "true")] - [MemberData(nameof(TestDataForNativeBuildFails), "true")] + [MemberData(nameof(TestDataForNativeBuildFails), "truetrue")] + [MemberData(nameof(TestDataForNativeBuildFails), "truetrue")] public void NativeBuildOrPublishFails(string config, string extraProperties, bool publish) { string output = BuildWithInvalidSdkPath(config, extraProperties, publish, expectSuccess: false); diff --git a/src/mono/wasi/wasi.proj b/src/mono/wasi/wasi.proj index 16bfd90b8c257..9c386481a26e1 100644 --- a/src/mono/wasi/wasi.proj +++ b/src/mono/wasi/wasi.proj @@ -161,7 +161,7 @@ { "identity": "InvariantGlobalization", "defaultValueInRuntimePack": "$(InvariantGlobalization)" }, { "identity": "WasmNativeStrip", "defaultValueInRuntimePack": "$(WasmNativeStrip)" }, { "identity": "WasmSingleFileBundle", "defaultValueInRuntimePack": "$(WasmSingleFileBundle)" }, - { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "$(WasmEnableSIMD)" }, + { "identity": "WasmEnableSIMD", "defaultValueInRuntimePack": "$(WasmEnableSIMD)" } ] } } diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 3ccca6b858614..6aafca7d110a2 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -397,7 +397,7 @@ - +