[wasm-mt] Fix pack/build issues in threaded builds #75162
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ithread' Also define the perf-tracing feature flag for the threaded and perf-tracing build variants.
not WasmEnabelThreading. Conversely, use `WasmEnablePerfTracing`, not `WasmEnablePerfTrace`.
lambdageek
requested review from
lewing,
radical,
pavelsavara and
marek-safar
as code owners
radical
reviewed
Sep 6, 2022
radical
reviewed
Sep 6, 2022
src/mono/wasm/templates/templates/browser/.template.config/template.json
Outdated
Show resolved
Hide resolved
radical
approved these changes
Sep 6, 2022
|
/backport to release/7.0 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3003289156 |
|
@lambdageek backporting to release/7.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: [wasm-mt] Build the threaded CoreLib if MonoWasmBuildVariant is 'multithread'
Using index info to reconstruct a base tree...
M src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
Falling back to patching base and 3-way merge...
Auto-merging src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
Applying: Also fixup the BCL assemblies
Applying: [wasm-mt] look for WasmEnableThreads in user projects
Using index info to reconstruct a base tree...
A src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in deleted in HEAD and modified in [wasm-mt] look for WasmEnableThreads in user projects. Version [wasm-mt] look for WasmEnableThreads in user projects of src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets.in left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 [wasm-mt] look for WasmEnableThreads in user projects
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
Edit it's because the workload got split up into a net6 and a net7 version in the Not sure why the backport didn't work. it backported cleanly locally. I'll do a manual one in an hour... |
|
/azp run runtime-wasm |
|
Azure Pipelines successfully started running 1 pipeline(s). |
3 tasks
lambdageek
added a commit
to lambdageek/runtime
that referenced
this pull request
Sep 8, 2022
Foward port changes from `release/7.0` dotnet#75171 that were not included in `main` dotnet#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
lambdageek
added a commit
that referenced
this pull request
Sep 12, 2022
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
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses the following from #74654:
dotnet.worker.jsmissing from the runtime packWasmEnableThreadinginstead ofWasmEnableThreadsdotnet new wasmbrowsercreatesbrowser.csproj, not<dirname>.csproj