diff options
| author | Aleksey Kliger (λgeek) <aleksey@lambdageek.org> | 2022-09-08 18:45:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-08 18:45:06 +0300 |
| commit | f85d3708b12eff11820c97194ff9bc1a7a5d2796 (patch) | |
| tree | e0d47f2c068b12f1cfe41c4c6c14e572dc4c1921 /eng | |
| parent | a20c82f9336a65a7ea3764ac58b4f1acd15dc5d5 (diff) | |
[release/7.0][wasm-mt] Fix pack/build issues in threaded builds (#75171)
* [wasm-mt] Build the threaded CoreLib if MonoWasmBuildVariant is 'multithread'
Also define the perf-tracing feature flag for the threaded and
perf-tracing build variants.
* Also fixup the BCL assemblies
* [wasm-mt] look for WasmEnableThreads in user projects
not WasmEnabelThreading.
Conversely, use `WasmEnablePerfTracing`, not `WasmEnablePerfTrace`.
* include dotnet.worker.js in runtime pack
* use set "preferDirectoryName" to true in WASM templates
* fix whitespace
* when updating RuntimePackNamePatterns don't include net7 component
The workload resolver already did its job by the time this property is
updated, so we need to use patterns that correspond to actual nupkg
names (unversioned), not runtime pack alias names from the
manifest (versioned with 'net7')
* WBT: unset MonoWasmBuildVariant for the non-threaded runtime
For local testing if the built runtime is a multithreaded one, make
and we need to make the normal variant nuget, unset
MonoWasmBuildVariant property
* [WorkloadBuildTasks] remove the workload manifest net6/net7 hack
Starting with 7.0.100-rc.2.22457.6 we already have the versioned
net6/net7 toolchains, so the hack isn't needed anymore (and in fact,
breaks workload installation during testing)
* also build the JS interop library with threading if variant is used
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/liveBuilds.targets | 5 | ||||
| -rw-r--r-- | eng/testing/workloads-testing.targets | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets index 5a3bf10c3e0..6ba9ce67278 100644 --- a/eng/liveBuilds.targets +++ b/eng/liveBuilds.targets @@ -187,6 +187,11 @@ $(LibrariesNativeArtifactsPath)dotnet.timezones.blat; $(LibrariesNativeArtifactsPath)*.dat;" IsNative="true" /> + <!-- for threaded wasm --> + <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'Browser' and Exists('$(LibrariesNativeArtifactsPath)dotnet.worker.js')" + Include=" + $(LibrariesNativeArtifactsPath)dotnet.worker.js" + IsNative="true" /> <LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'Browser'" Include=" $(LibrariesNativeArtifactsPath)src\*.c; diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 537fa502c57..280d9160b9c 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -171,7 +171,7 @@ <!-- add for non-threaded runtime also --> <_NuGetsToBuild Include="$(LibrariesShippingPackagesDir)Microsoft.NETCore.App.Runtime.Mono.browser-wasm.$(_PackageVersion).nupkg" Project="$(InstallerProjectRoot)pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.sfxproj" - Properties="@(_DefaultPropsForNuGetBuild, ';')" + Properties="@(_DefaultPropsForNuGetBuild, ';');MonoWasmBuildVariant=" Dependencies="$(_DefaultRuntimePackNuGetPath)" Descriptor="single threaded runtime pack" Condition="'$(_DefaultBuildVariant)' != '.'" /> |