Skip to content

Commit ac092cf

Browse files
authored
[wasm-mt] Additional build fixes (#75297)
Foward port changes from `release/7.0` #75171 that were not included in `main` #75162 - when building the InteropServices.JavaScript library, enable threading if MonoWasmBuildVariant is set appropriately. One consequence is that the runtime will (correctly) install the browser synchronization context on the main thread. - for workload build testing, unset MonoWasmBuildVariant when creating the non-threaded runtime
1 parent 9139730 commit ac092cf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

eng/testing/workloads-testing.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<!-- add for non-threaded runtime also -->
172172
<_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.browser-wasm.$(_PackageVersion).nupkg"
173173
Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj"
174-
Properties="@(_DefaultPropsForNuGetBuild, ';')"
174+
Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant="
175175
Dependencies="$(_DefaultRuntimePackNuGetPath)"
176176
Descriptor="single threaded runtime pack"
177177
Condition="'$(_DefaultBuildVariant)' != '.'" />

src/libraries/System.Runtime.InteropServices.JavaScript/src/System.Runtime.InteropServices.JavaScript.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<FeatureWasmThreads Condition="'$(TargetOS)' == 'browser' and '$(WasmEnableThreads)' == 'true'">true</FeatureWasmThreads>
9+
<FeatureWasmThreads Condition="'$(TargetOS)' == 'browser' and ('$(WasmEnableThreads)' == 'true' or '$(MonoWasmBuildVariant)' == 'multithread')">true</FeatureWasmThreads>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>

0 commit comments

Comments
 (0)