') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [wasm-mt] Fix pack/build issues in threaded builds by lambdageek · Pull Request #75162 · dotnet/runtime · GitHub
Skip to content

[wasm-mt] Fix pack/build issues in threaded builds - #75162

Merged
lambdageek merged 6 commits into
dotnet:mainfrom
lambdageek:wasm-mt-spc-build
Sep 7, 2022
Merged

[wasm-mt] Fix pack/build issues in threaded builds#75162
lambdageek merged 6 commits into
dotnet:mainfrom
lambdageek:wasm-mt-spc-build

Conversation

@lambdageek

@lambdageeklambdageek commented Sep 6, 2022

Copy link
Copy Markdown
Member

Addresses the following from #74654:

  • dotnet.worker.js missing from the runtime pack
  • WorkloadManifest.targets.in uses WasmEnableThreading instead of WasmEnableThreads
  • The CoreLibs in the multithread and perftrace build variants don't define the correct feature flags.
  • dotnet new wasmbrowser creates browser.csproj, not <dirname>.csproj

@lambdageek
[wasm-mt] Build the threaded CoreLib if MonoWasmBuildVariant is 'mult…
3e15f05
…ithread'
Also define the perf-tracing feature flag for the threaded and
perf-tracing build variants.
@lambdageek
Also fixup the BCL assemblies
9e0f869
@lambdageek
[wasm-mt] look for WasmEnableThreads in user projects
463adbc
not WasmEnabelThreading.
Conversely, use `WasmEnablePerfTracing`, not `WasmEnablePerfTrace`.
@lambdageek
include dotnet.worker.js in runtime pack
34c4deb
@lambdageek
use set "preferDirectoryName" to true in WASM templates
f01dbfd
@ghostghost added the area-Build-mono label Sep 6, 2022
@ghostghost assigned lambdageekSep 6, 2022
radical
radical reviewed Sep 6, 2022
View reviewed changes
Comment threadeng/liveBuilds.targets Outdated
radical
radical reviewed Sep 6, 2022
View reviewed changes
Comment threadsrc/mono/wasm/templates/templates/browser/.template.config/template.json Outdated
@lambdageek

lambdageek commented Sep 6, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to release/7.0

@github-actions

github-actionsBot commented Sep 6, 2022

Copy link
Copy Markdown
Contributor

Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3003289156

@github-actions

github-actionsBot commented Sep 6, 2022

Copy link
Copy Markdown
Contributor

@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 forWasmEnableThreadsin 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 forWasmEnableThreadsin user projects. Version [wasm-mt] look forWasmEnableThreadsin 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 forWasmEnableThreadsin 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 128

Please backport manually!

@lambdageek

lambdageek commented Sep 6, 2022•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Edit it's because the workload got split up into a net6 and a net7 version in the release/7.0 branch

Not sure why the backport didn't work. it backported cleanly locally. I'll do a manual one in an hour...

@lambdageek

lambdageek commented Sep 6, 2022

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-wasm

@azure-pipelines

azure-pipelinesBot commented Sep 6, 2022

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@lambdageeklambdageek mentioned this pull request Sep 6, 2022
Merged
@lambdageek
lambdageek merged commit 703dc8d into dotnet:mainSep 7, 2022
@lambdageeklambdageek mentioned this pull request Sep 7, 2022
Closed
3 tasks
lambdageek added a commit to lambdageek/runtime that referenced this pull request Sep 8, 2022
@lambdageek
[wasm-mt] Additional build fixes
a28164c
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
@lambdageeklambdageek mentioned this pull request Sep 8, 2022
Merged
lambdageek added a commit that referenced this pull request Sep 12, 2022
@lambdageek
[wasm-mt] Additional build fixes (#75297)
ac092cf
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
@ghostghost locked as resolved and limited conversation to collaborators Oct 7, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@radicalradicalradical approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@pavelsavarapavelsavaraAwaiting requested review from pavelsavarapavelsavara is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar

Assignees

@lambdageeklambdageek

Labels

area-Build-mono

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@lambdageek@radical