From 61a37928a5ad7080d7d61c0f4dfde394628fc623 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Wed, 7 Feb 2024 09:30:06 +0000 Subject: [PATCH 1/3] Invert the logic: prepare MT nuget for ST and ST nuget for MT. --- eng/testing/workloads-browser.targets | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/testing/workloads-browser.targets b/eng/testing/workloads-browser.targets index a312347ff12f6b..a2e831957fe0f4 100644 --- a/eng/testing/workloads-browser.targets +++ b/eng/testing/workloads-browser.targets @@ -47,9 +47,10 @@ - <_BuildVariant Condition="'$(WasmEnableThreads)' == 'true'">multithread - <_Descriptor Condition="'$(WasmEnableThreads)' == 'true'">runtime pack for $(_BuildVariant) - <_Descriptor Condition="'$(WasmEnableThreads)' != 'true'">single threaded runtime pack + <_IsMTNugetMissing Condition="'$(WasmEnableThreads)' != 'true'">true + <_BuildVariant Condition="'$(_IsMTNugetMissing)' == 'true'">multithread + <_Descriptor Condition="'$(_IsMTNugetMissing)' == 'true'">runtime pack for $(_BuildVariant) + <_Descriptor Condition="'$(_IsMTNugetMissing)' != 'true'">single threaded runtime pack <_DefaultRuntimePackNuGetPath>$([System.String]::Join('.', $(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono, $(_BuildVariant), @@ -70,7 +71,7 @@ <_NuGetsToBuild Include="$(_DefaultRuntimePackNuGetPath)" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" Dependencies="$(_DefaultRuntimePackNuGetPath)" - Properties="@(_DefaultPropsForNuGetBuild, ';');WasmEnableThreads=$(WasmEnableThreads)" + Properties="@(_DefaultPropsForNuGetBuild, ';');WasmEnableThreads=$(_IsMTNugetMissing)" Descriptor="$(_Descriptor)"/> From 22024982d5f12089a128c58c4612adedf0be1fc8 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Wed, 7 Feb 2024 11:41:23 +0100 Subject: [PATCH 2/3] We have only 2 runtimes now. --- eng/testing/workloads-browser.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/testing/workloads-browser.targets b/eng/testing/workloads-browser.targets index a2e831957fe0f4..c05fe09c66485d 100644 --- a/eng/testing/workloads-browser.targets +++ b/eng/testing/workloads-browser.targets @@ -41,7 +41,7 @@ - From 6fc38a77d32e52ef31394ccb3e606007d17a1d40 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Wed, 7 Feb 2024 11:55:11 +0000 Subject: [PATCH 3/3] Added clarification --- eng/testing/workloads-browser.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/testing/workloads-browser.targets b/eng/testing/workloads-browser.targets index c05fe09c66485d..f41bf098e8d04d 100644 --- a/eng/testing/workloads-browser.targets +++ b/eng/testing/workloads-browser.targets @@ -68,6 +68,8 @@ Text="Expected to find either one or two in $(LibrariesShippingPackagesDir): @(_RuntimePackNugetAvailable->'%(FileName)%(Extension)')" /> + <_NuGetsToBuild Include="$(_DefaultRuntimePackNuGetPath)" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" Dependencies="$(_DefaultRuntimePackNuGetPath)"