From f85d3708b12eff11820c97194ff9bc1a7a5d2796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= Date: Thu, 8 Sep 2022 11:45:06 -0400 Subject: [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 --- eng/liveBuilds.targets | 5 +++++ eng/testing/workloads-testing.targets | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'eng') 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" /> + + -- cgit v1.2.3