[wasm] Remove hardcoded references to net8.0 from WasmApp*targets - #89699

Merged
radical merged 14 commits into
dotnet:mainfrom
radical:wasm-hardcoded-tfm
Aug 3, 2023
Merged

[wasm] Remove hardcoded references to net8.0 from WasmApp*targets#89699
radical merged 14 commits into
dotnet:mainfrom
radical:wasm-hardcoded-tfm

Conversation

@radical

@radicalradical commented Jul 31, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Look for System.Runtime.dll to find the runtime pack directory with the assemblies, so we don't need to figure out the tfm for the path.

  • Cannot use System.Private.CoreLib.dll because that is in native/ instead of lib/net8.0
  • Cannot use RuntimePackAsset because in many places that item isn't available.
    • AOT on helix where we run only the wasm targets on the proxy project.
    • Runtime tests which currently dump all the assemblies, and other bits into a single directory, not following the directory structure of a runtime pack. This also means the RuntimePackAsset cannot easily be synthesized.

Fixes#79109 .

@radicalradical added the arch-wasm WebAssembly architecture label Jul 31, 2023
@ghostghost added the area-Build-mono label Jul 31, 2023
@ghostghost assigned radicalJul 31, 2023
@ghost

ghost commented Jul 31, 2023

Copy link
Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #79109 .

Author:radical
Assignees:-
Labels:

arch-wasm

Milestone:-

@radicalradical mentioned this pull request Jul 31, 2023
Merged
@radical
radical marked this pull request as draft July 31, 2023 01:16
@build-analysisbuild-analysisBot mentioned this pull request Jul 31, 2023
Closed
ViktorHofer
ViktorHofer reviewed Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets Outdated
ViktorHofer
ViktorHofer reviewed Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets Outdated
@radical
radical marked this pull request as ready for review July 31, 2023 23:40
ViktorHofer
ViktorHofer reviewed Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets Outdated
ViktorHofer
ViktorHofer reviewed Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets Outdated

@ViktorHoferViktorHoferAug 1, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why System.IO? System.IO is a pure shim assembly which might get trimmed out in certain scenarios.

@radicalradicalAug 1, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trimmed from the runtime pack?

They are in different paths:
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/native/System.Private.CoreLib.dll
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/lib/net8.0/System.IO.dll

.. and we need the latter one.

@ViktorHoferViktorHoferAug 1, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"C:\Users\vihofer.nuget\packages\microsoft.netcore.app.runtime.win-x64\8.0.0-rc.1.23381.3\runtimes\win-x64\lib\net8.0\System.Private.CoreLib.dll"

Why is the mono runtime pack different? The CoreCLR one has System.Private.CoreLib in the lib directory (as it's a managed library). cc @akoeplinger

Trimmed from the runtime pack?

Not from the runtime pack directly, but the linker trims out of some shim assemblies afaik. I wasn't sure if this code path would run before or after but I guess it's before. You could consider using an assembly that is more "core" to the .NETCoreApp shared framework, i.e. System.Runtime but I'm also ok with the current state.

@radicalradicalAug 1, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this fails for AOT/helix where we create a proxy project, and run only the wasm part of the build. And that doesn't have RuntimePackAsset, because none of the targets related to that were run.

I will try to populate RuntimePackAsset in the proxy project, but that will be bit of a hack.

ViktorHofer
ViktorHofer previously approved these changes Aug 1, 2023
View reviewed changes

@ViktorHoferViktorHofer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, looks good. Please double check that _MscorlibPath, _SystemRuntimePath and _WasmAOTSearchPaths include the correct values.

Thank you

@radical

radical commented Aug 1, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-wasm

@azure-pipelines

azure-pipelinesBot commented Aug 1, 2023

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

This was referenced Aug 1, 2023
Closed
Closed
@radical

radical commented Aug 1, 2023

Copy link
Copy Markdown
MemberAuthor

AOT failure might be relevant. Investigating.

@radicalradical added the NO-MERGE The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 1, 2023
@radical

radical commented Aug 1, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-wasm

@azure-pipelines

azure-pipelinesBot commented Aug 1, 2023

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

@radical

radical commented Aug 2, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-wasm

@azure-pipelines

azure-pipelinesBot commented Aug 2, 2023

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

@radical

radical commented Aug 2, 2023

Copy link
Copy Markdown
MemberAuthor

I had to change from using RuntimePackAsset, because it is not available in many setups we test like AOT on helix.
This still does not fix the runtime tests though which seem to just dump all the assemblies into a native folder! I'm working on fixing that.

@radical

radical commented Aug 2, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-wasm

@azure-pipelines

azure-pipelinesBot commented Aug 2, 2023

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

@radical

radical commented Aug 3, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-wasm

@azure-pipelines

azure-pipelinesBot commented Aug 3, 2023

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

@ViktorHofer

ViktorHofer commented Aug 3, 2023

Copy link
Copy Markdown
Member

@radical you added unrelated commits, didn't you?

@radical

radical commented Aug 3, 2023

Copy link
Copy Markdown
MemberAuthor

@radical you added unrelated commits, didn't you?

The merge seems messed up a bit, so git log shows extra commits. But the only actual changes here are the relevant ones. I was avoiding cleaning this up to not mess up reviewing on github (it won't show "changes since last review" if you force-push), but I'll do that now.

radical added 14 commits August 3, 2023 13:57
@radical
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets
6167230
Fixesdotnet#79109 .
@radical
Address feedback from@ViktorHofer
38d74d9
@radical
address review feedback
a358520
@radical
Use System.Runtime.dll instead of System.IO.dll
33a6aa4
@radical
Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…
b0cd025
…s config
@radical
Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)
bc07a51
@radical
WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…
ba1dfdc
… as native build depends on that
@radical
WasmApp.targets: Fix the logic to find runtime pack path with the
1974848
.. assemblies. `RuntimePackAsset` can't be reliably used because it is
not always available in the various test setups used. Instead, find
`System.Runtime.dll` in the runtime pack path, which is already known.
@radical
WasmApp.targets - error check before using the item
d997f9d
@radical
Fix runtime tests, by overriding the path to the assemblies
685a39f
@radical
Fix runtime tests, by overriding the path to the assemblies
cb63377
@radical
Apply the same changes to wasi targets also
1af5539
@radical
fix
5119f43
@radical
fix
6106560
@radical
radicalforce-pushed the wasm-hardcoded-tfm branch from f177757 to 6106560CompareAugust 3, 2023 17:57
@radical

radical commented Aug 3, 2023

Copy link
Copy Markdown
MemberAuthor

Force pushed with the rebased commits.

ViktorHofer
ViktorHofer approved these changes Aug 3, 2023
View reviewed changes

@ViktorHoferViktorHofer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@radical
radical merged commit 2ab3874 into dotnet:mainAug 3, 2023
@radical
radical deleted the wasm-hardcoded-tfm branch August 3, 2023 22:49
@build-analysisbuild-analysisBot mentioned this pull request Aug 4, 2023
Closed
@ghostghost locked as resolved and limited conversation to collaborators Sep 3, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok

Assignees

@radicalradical

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Remove hardcoded TFM in wasm build files

3 participants

@radical@pavelsavara@ViktorHofer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets - #89699
Merged
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Aug 3, 2023
Merged
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets#89699
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Conversation
@radical
@radicalradical
commented
Jul 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Look for System.Runtime.dll to find the runtime pack directory with the assemblies, so we don't need to figure out the tfm for the path.
  • Cannot use System.Private.CoreLib.dll because that is in native/ instead of lib/net8.0
  • Cannot use RuntimePackAsset because in many places that item isn't available.

    • AOT on helix where we run only the wasm targets on the proxy project.
    • Runtime tests which currently dump all the assemblies, and other bits into a single directory, not following the directory structure of a runtime pack. This also means the RuntimePackAsset cannot easily be synthesized.
Fixes#79109 .
@radicalradical
added
the 
arch-wasm
WebAssembly architecture
label
Jul 31, 2023
@ghostghost
added
the 
area-Build-mono

label
Jul 31, 2023
@ghostghost
assigned radicalJul 31, 2023
@ghost
ghost
commented
Jul 31, 2023

Copy link


Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #79109 .
Author:radical
Assignees:-
Labels:
arch-wasm
Milestone:-
@radicalradical
mentioned this pull request
Jul 31, 2023
 Merged

@radical
radical
marked this pull request as draft
July 31, 2023 01:16
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 31, 2023

Closed

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@radical
radical
marked this pull request as ready for review
July 31, 2023 23:40
ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why System.IO? System.IO is a pure shim assembly which might get trimmed out in certain scenarios.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trimmed from the runtime pack?
They are in different paths:
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/native/System.Private.CoreLib.dll
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/lib/net8.0/System.IO.dll
.. and we need the latter one.
@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"C:\Users\vihofer.nuget\packages\microsoft.netcore.app.runtime.win-x64\8.0.0-rc.1.23381.3\runtimes\win-x64\lib\net8.0\System.Private.CoreLib.dll"
Why is the mono runtime pack different? The CoreCLR one has System.Private.CoreLib in the lib directory (as it's a managed library). cc @akoeplinger
Trimmed from the runtime pack?
Not from the runtime pack directly, but the linker trims out of some shim assemblies afaik. I wasn't sure if this code path would run before or after but I guess it's before. You could consider using an assembly that is more "core" to the .NETCoreApp shared framework, i.e. System.Runtime but I'm also ok with the current state.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this fails for AOT/helix where we create a proxy project, and run only the wasm part of the build. And that doesn't have RuntimePackAsset, because none of the targets related to that were run.
I will try to populate RuntimePackAsset in the proxy project, but that will be bit of a hack.
ViktorHofer
ViktorHofer
previously approved these changes
Aug 1, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, looks good. Please double check that _MscorlibPath, _SystemRuntimePath and _WasmAOTSearchPaths include the correct values.
Thank you
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 1, 2023

Closed


Closed

@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
AOT failure might be relevant. Investigating.
@radicalradical
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Aug 1, 2023
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
I had to change from using RuntimePackAsset, because it is not available in many setups we test like AOT on helix.

This still does not fix the runtime tests though which seem to just dump all the assemblies into a native folder! I'm working on fixing that.
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 3, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ViktorHofer
ViktorHofer
commented
Aug 3, 2023

Copy link


Copy Markdown

Member
@radical you added unrelated commits, didn't you?
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
@radical you added unrelated commits, didn't you?
The merge seems messed up a bit, so git log shows extra commits. But the only actual changes here are the relevant ones. I was avoiding cleaning this up to not mess up reviewing on github (it won't show "changes since last review" if you force-push), but I'll do that now.
radical
added 14 commits
August 3, 2023 13:57
@radical
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets
6167230
Fixesdotnet#79109 .
@radical
Address feedback from@ViktorHofer
38d74d9
@radical
address review feedback
a358520
@radical
Use System.Runtime.dll instead of System.IO.dll
33a6aa4
@radical
Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…
b0cd025
…s config
@radical
Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)
bc07a51
@radical
WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…
ba1dfdc
… as native build depends on that
@radical
WasmApp.targets: Fix the logic to find runtime pack path with the
1974848
.. assemblies. `RuntimePackAsset` can't be reliably used because it is
not always available in the various test setups used. Instead, find
`System.Runtime.dll` in the runtime pack path, which is already known.
@radical
WasmApp.targets - error check before using the item
d997f9d
@radical
Fix runtime tests, by overriding the path to the assemblies
685a39f
@radical
Fix runtime tests, by overriding the path to the assemblies
cb63377
@radical
Apply the same changes to wasi targets also
1af5539
@radical
fix
5119f43
@radical
fix
6106560
@radical
radicalforce-pushed
the
wasm-hardcoded-tfm
branch
from
f177757 to
6106560CompareAugust 3, 2023 17:57
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
Force pushed with the rebased commits.
ViktorHofer
ViktorHofer
approved these changes
Aug 3, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks
@radical
radical
merged commit 2ab3874
into
dotnet:mainAug 3, 2023
@radical
radical
deleted the

wasm-hardcoded-tfm

branch
August 3, 2023 22:49
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 4, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 3, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok

Assignees

@radicalradical

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Remove hardcoded TFM in wasm build files


3 participants

@radical@pavelsavara@ViktorHofer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets - #89699
Merged
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Aug 3, 2023
Merged
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets#89699
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Conversation
@radical
@radicalradical
commented
Jul 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Look for System.Runtime.dll to find the runtime pack directory with the assemblies, so we don't need to figure out the tfm for the path.
  • Cannot use System.Private.CoreLib.dll because that is in native/ instead of lib/net8.0
  • Cannot use RuntimePackAsset because in many places that item isn't available.

    • AOT on helix where we run only the wasm targets on the proxy project.
    • Runtime tests which currently dump all the assemblies, and other bits into a single directory, not following the directory structure of a runtime pack. This also means the RuntimePackAsset cannot easily be synthesized.
Fixes#79109 .
@radicalradical
added
the 
arch-wasm
WebAssembly architecture
label
Jul 31, 2023
@ghostghost
added
the 
area-Build-mono

label
Jul 31, 2023
@ghostghost
assigned radicalJul 31, 2023
@ghost
ghost
commented
Jul 31, 2023

Copy link


Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #79109 .
Author:radical
Assignees:-
Labels:
arch-wasm
Milestone:-
@radicalradical
mentioned this pull request
Jul 31, 2023
 Merged

@radical
radical
marked this pull request as draft
July 31, 2023 01:16
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 31, 2023

Closed

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@radical
radical
marked this pull request as ready for review
July 31, 2023 23:40
ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why System.IO? System.IO is a pure shim assembly which might get trimmed out in certain scenarios.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trimmed from the runtime pack?
They are in different paths:
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/native/System.Private.CoreLib.dll
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/lib/net8.0/System.IO.dll
.. and we need the latter one.
@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"C:\Users\vihofer.nuget\packages\microsoft.netcore.app.runtime.win-x64\8.0.0-rc.1.23381.3\runtimes\win-x64\lib\net8.0\System.Private.CoreLib.dll"
Why is the mono runtime pack different? The CoreCLR one has System.Private.CoreLib in the lib directory (as it's a managed library). cc @akoeplinger
Trimmed from the runtime pack?
Not from the runtime pack directly, but the linker trims out of some shim assemblies afaik. I wasn't sure if this code path would run before or after but I guess it's before. You could consider using an assembly that is more "core" to the .NETCoreApp shared framework, i.e. System.Runtime but I'm also ok with the current state.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this fails for AOT/helix where we create a proxy project, and run only the wasm part of the build. And that doesn't have RuntimePackAsset, because none of the targets related to that were run.
I will try to populate RuntimePackAsset in the proxy project, but that will be bit of a hack.
ViktorHofer
ViktorHofer
previously approved these changes
Aug 1, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, looks good. Please double check that _MscorlibPath, _SystemRuntimePath and _WasmAOTSearchPaths include the correct values.
Thank you
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 1, 2023

Closed


Closed

@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
AOT failure might be relevant. Investigating.
@radicalradical
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Aug 1, 2023
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
I had to change from using RuntimePackAsset, because it is not available in many setups we test like AOT on helix.

This still does not fix the runtime tests though which seem to just dump all the assemblies into a native folder! I'm working on fixing that.
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 3, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ViktorHofer
ViktorHofer
commented
Aug 3, 2023

Copy link


Copy Markdown

Member
@radical you added unrelated commits, didn't you?
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
@radical you added unrelated commits, didn't you?
The merge seems messed up a bit, so git log shows extra commits. But the only actual changes here are the relevant ones. I was avoiding cleaning this up to not mess up reviewing on github (it won't show "changes since last review" if you force-push), but I'll do that now.
radical
added 14 commits
August 3, 2023 13:57
@radical
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets
6167230
Fixesdotnet#79109 .
@radical
Address feedback from@ViktorHofer
38d74d9
@radical
address review feedback
a358520
@radical
Use System.Runtime.dll instead of System.IO.dll
33a6aa4
@radical
Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…
b0cd025
…s config
@radical
Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)
bc07a51
@radical
WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…
ba1dfdc
… as native build depends on that
@radical
WasmApp.targets: Fix the logic to find runtime pack path with the
1974848
.. assemblies. `RuntimePackAsset` can't be reliably used because it is
not always available in the various test setups used. Instead, find
`System.Runtime.dll` in the runtime pack path, which is already known.
@radical
WasmApp.targets - error check before using the item
d997f9d
@radical
Fix runtime tests, by overriding the path to the assemblies
685a39f
@radical
Fix runtime tests, by overriding the path to the assemblies
cb63377
@radical
Apply the same changes to wasi targets also
1af5539
@radical
fix
5119f43
@radical
fix
6106560
@radical
radicalforce-pushed
the
wasm-hardcoded-tfm
branch
from
f177757 to
6106560CompareAugust 3, 2023 17:57
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
Force pushed with the rebased commits.
ViktorHofer
ViktorHofer
approved these changes
Aug 3, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks
@radical
radical
merged commit 2ab3874
into
dotnet:mainAug 3, 2023
@radical
radical
deleted the

wasm-hardcoded-tfm

branch
August 3, 2023 22:49
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 4, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 3, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok

Assignees

@radicalradical

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Remove hardcoded TFM in wasm build files


3 participants

@radical@pavelsavara@ViktorHofer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets - #89699
Merged
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Aug 3, 2023
Merged
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets#89699
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Conversation
@radical
@radicalradical
commented
Jul 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Look for System.Runtime.dll to find the runtime pack directory with the assemblies, so we don't need to figure out the tfm for the path.
  • Cannot use System.Private.CoreLib.dll because that is in native/ instead of lib/net8.0
  • Cannot use RuntimePackAsset because in many places that item isn't available.

    • AOT on helix where we run only the wasm targets on the proxy project.
    • Runtime tests which currently dump all the assemblies, and other bits into a single directory, not following the directory structure of a runtime pack. This also means the RuntimePackAsset cannot easily be synthesized.
Fixes#79109 .
@radicalradical
added
the 
arch-wasm
WebAssembly architecture
label
Jul 31, 2023
@ghostghost
added
the 
area-Build-mono

label
Jul 31, 2023
@ghostghost
assigned radicalJul 31, 2023
@ghost
ghost
commented
Jul 31, 2023

Copy link


Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #79109 .
Author:radical
Assignees:-
Labels:
arch-wasm
Milestone:-
@radicalradical
mentioned this pull request
Jul 31, 2023
 Merged

@radical
radical
marked this pull request as draft
July 31, 2023 01:16
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 31, 2023

Closed

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@radical
radical
marked this pull request as ready for review
July 31, 2023 23:40
ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why System.IO? System.IO is a pure shim assembly which might get trimmed out in certain scenarios.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trimmed from the runtime pack?
They are in different paths:
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/native/System.Private.CoreLib.dll
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/lib/net8.0/System.IO.dll
.. and we need the latter one.
@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"C:\Users\vihofer.nuget\packages\microsoft.netcore.app.runtime.win-x64\8.0.0-rc.1.23381.3\runtimes\win-x64\lib\net8.0\System.Private.CoreLib.dll"
Why is the mono runtime pack different? The CoreCLR one has System.Private.CoreLib in the lib directory (as it's a managed library). cc @akoeplinger
Trimmed from the runtime pack?
Not from the runtime pack directly, but the linker trims out of some shim assemblies afaik. I wasn't sure if this code path would run before or after but I guess it's before. You could consider using an assembly that is more "core" to the .NETCoreApp shared framework, i.e. System.Runtime but I'm also ok with the current state.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this fails for AOT/helix where we create a proxy project, and run only the wasm part of the build. And that doesn't have RuntimePackAsset, because none of the targets related to that were run.
I will try to populate RuntimePackAsset in the proxy project, but that will be bit of a hack.
ViktorHofer
ViktorHofer
previously approved these changes
Aug 1, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, looks good. Please double check that _MscorlibPath, _SystemRuntimePath and _WasmAOTSearchPaths include the correct values.
Thank you
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 1, 2023

Closed


Closed

@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
AOT failure might be relevant. Investigating.
@radicalradical
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Aug 1, 2023
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
I had to change from using RuntimePackAsset, because it is not available in many setups we test like AOT on helix.

This still does not fix the runtime tests though which seem to just dump all the assemblies into a native folder! I'm working on fixing that.
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 3, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ViktorHofer
ViktorHofer
commented
Aug 3, 2023

Copy link


Copy Markdown

Member
@radical you added unrelated commits, didn't you?
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
@radical you added unrelated commits, didn't you?
The merge seems messed up a bit, so git log shows extra commits. But the only actual changes here are the relevant ones. I was avoiding cleaning this up to not mess up reviewing on github (it won't show "changes since last review" if you force-push), but I'll do that now.
radical
added 14 commits
August 3, 2023 13:57
@radical
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets
6167230
Fixesdotnet#79109 .
@radical
Address feedback from@ViktorHofer
38d74d9
@radical
address review feedback
a358520
@radical
Use System.Runtime.dll instead of System.IO.dll
33a6aa4
@radical
Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…
b0cd025
…s config
@radical
Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)
bc07a51
@radical
WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…
ba1dfdc
… as native build depends on that
@radical
WasmApp.targets: Fix the logic to find runtime pack path with the
1974848
.. assemblies. `RuntimePackAsset` can't be reliably used because it is
not always available in the various test setups used. Instead, find
`System.Runtime.dll` in the runtime pack path, which is already known.
@radical
WasmApp.targets - error check before using the item
d997f9d
@radical
Fix runtime tests, by overriding the path to the assemblies
685a39f
@radical
Fix runtime tests, by overriding the path to the assemblies
cb63377
@radical
Apply the same changes to wasi targets also
1af5539
@radical
fix
5119f43
@radical
fix
6106560
@radical
radicalforce-pushed
the
wasm-hardcoded-tfm
branch
from
f177757 to
6106560CompareAugust 3, 2023 17:57
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
Force pushed with the rebased commits.
ViktorHofer
ViktorHofer
approved these changes
Aug 3, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks
@radical
radical
merged commit 2ab3874
into
dotnet:mainAug 3, 2023
@radical
radical
deleted the

wasm-hardcoded-tfm

branch
August 3, 2023 22:49
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 4, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 3, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok

Assignees

@radicalradical

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Remove hardcoded TFM in wasm build files


3 participants

@radical@pavelsavara@ViktorHofer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets - #89699
Merged
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Aug 3, 2023
Merged
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets#89699
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Conversation
@radical
@radicalradical
commented
Jul 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Look for System.Runtime.dll to find the runtime pack directory with the assemblies, so we don't need to figure out the tfm for the path.
  • Cannot use System.Private.CoreLib.dll because that is in native/ instead of lib/net8.0
  • Cannot use RuntimePackAsset because in many places that item isn't available.

    • AOT on helix where we run only the wasm targets on the proxy project.
    • Runtime tests which currently dump all the assemblies, and other bits into a single directory, not following the directory structure of a runtime pack. This also means the RuntimePackAsset cannot easily be synthesized.
Fixes#79109 .
@radicalradical
added
the 
arch-wasm
WebAssembly architecture
label
Jul 31, 2023
@ghostghost
added
the 
area-Build-mono

label
Jul 31, 2023
@ghostghost
assigned radicalJul 31, 2023
@ghost
ghost
commented
Jul 31, 2023

Copy link


Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #79109 .
Author:radical
Assignees:-
Labels:
arch-wasm
Milestone:-
@radicalradical
mentioned this pull request
Jul 31, 2023
 Merged

@radical
radical
marked this pull request as draft
July 31, 2023 01:16
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 31, 2023

Closed

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@radical
radical
marked this pull request as ready for review
July 31, 2023 23:40
ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why System.IO? System.IO is a pure shim assembly which might get trimmed out in certain scenarios.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trimmed from the runtime pack?
They are in different paths:
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/native/System.Private.CoreLib.dll
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/lib/net8.0/System.IO.dll
.. and we need the latter one.
@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"C:\Users\vihofer.nuget\packages\microsoft.netcore.app.runtime.win-x64\8.0.0-rc.1.23381.3\runtimes\win-x64\lib\net8.0\System.Private.CoreLib.dll"
Why is the mono runtime pack different? The CoreCLR one has System.Private.CoreLib in the lib directory (as it's a managed library). cc @akoeplinger
Trimmed from the runtime pack?
Not from the runtime pack directly, but the linker trims out of some shim assemblies afaik. I wasn't sure if this code path would run before or after but I guess it's before. You could consider using an assembly that is more "core" to the .NETCoreApp shared framework, i.e. System.Runtime but I'm also ok with the current state.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this fails for AOT/helix where we create a proxy project, and run only the wasm part of the build. And that doesn't have RuntimePackAsset, because none of the targets related to that were run.
I will try to populate RuntimePackAsset in the proxy project, but that will be bit of a hack.
ViktorHofer
ViktorHofer
previously approved these changes
Aug 1, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, looks good. Please double check that _MscorlibPath, _SystemRuntimePath and _WasmAOTSearchPaths include the correct values.
Thank you
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 1, 2023

Closed


Closed

@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
AOT failure might be relevant. Investigating.
@radicalradical
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Aug 1, 2023
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
I had to change from using RuntimePackAsset, because it is not available in many setups we test like AOT on helix.

This still does not fix the runtime tests though which seem to just dump all the assemblies into a native folder! I'm working on fixing that.
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 3, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ViktorHofer
ViktorHofer
commented
Aug 3, 2023

Copy link


Copy Markdown

Member
@radical you added unrelated commits, didn't you?
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
@radical you added unrelated commits, didn't you?
The merge seems messed up a bit, so git log shows extra commits. But the only actual changes here are the relevant ones. I was avoiding cleaning this up to not mess up reviewing on github (it won't show "changes since last review" if you force-push), but I'll do that now.
radical
added 14 commits
August 3, 2023 13:57
@radical
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets
6167230
Fixesdotnet#79109 .
@radical
Address feedback from@ViktorHofer
38d74d9
@radical
address review feedback
a358520
@radical
Use System.Runtime.dll instead of System.IO.dll
33a6aa4
@radical
Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…
b0cd025
…s config
@radical
Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)
bc07a51
@radical
WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…
ba1dfdc
… as native build depends on that
@radical
WasmApp.targets: Fix the logic to find runtime pack path with the
1974848
.. assemblies. `RuntimePackAsset` can't be reliably used because it is
not always available in the various test setups used. Instead, find
`System.Runtime.dll` in the runtime pack path, which is already known.
@radical
WasmApp.targets - error check before using the item
d997f9d
@radical
Fix runtime tests, by overriding the path to the assemblies
685a39f
@radical
Fix runtime tests, by overriding the path to the assemblies
cb63377
@radical
Apply the same changes to wasi targets also
1af5539
@radical
fix
5119f43
@radical
fix
6106560
@radical
radicalforce-pushed
the
wasm-hardcoded-tfm
branch
from
f177757 to
6106560CompareAugust 3, 2023 17:57
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
Force pushed with the rebased commits.
ViktorHofer
ViktorHofer
approved these changes
Aug 3, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks
@radical
radical
merged commit 2ab3874
into
dotnet:mainAug 3, 2023
@radical
radical
deleted the

wasm-hardcoded-tfm

branch
August 3, 2023 22:49
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 4, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 3, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok

Assignees

@radicalradical

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Remove hardcoded TFM in wasm build files


3 participants

@radical@pavelsavara@ViktorHofer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets - #89699
Merged
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Aug 3, 2023
Merged
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets#89699
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Conversation
@radical
@radicalradical
commented
Jul 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Look for System.Runtime.dll to find the runtime pack directory with the assemblies, so we don't need to figure out the tfm for the path.
  • Cannot use System.Private.CoreLib.dll because that is in native/ instead of lib/net8.0
  • Cannot use RuntimePackAsset because in many places that item isn't available.

    • AOT on helix where we run only the wasm targets on the proxy project.
    • Runtime tests which currently dump all the assemblies, and other bits into a single directory, not following the directory structure of a runtime pack. This also means the RuntimePackAsset cannot easily be synthesized.
Fixes#79109 .
@radicalradical
added
the 
arch-wasm
WebAssembly architecture
label
Jul 31, 2023
@ghostghost
added
the 
area-Build-mono

label
Jul 31, 2023
@ghostghost
assigned radicalJul 31, 2023
@ghost
ghost
commented
Jul 31, 2023

Copy link


Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #79109 .
Author:radical
Assignees:-
Labels:
arch-wasm
Milestone:-
@radicalradical
mentioned this pull request
Jul 31, 2023
 Merged

@radical
radical
marked this pull request as draft
July 31, 2023 01:16
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 31, 2023

Closed

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@radical
radical
marked this pull request as ready for review
July 31, 2023 23:40
ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why System.IO? System.IO is a pure shim assembly which might get trimmed out in certain scenarios.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trimmed from the runtime pack?
They are in different paths:
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/native/System.Private.CoreLib.dll
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/lib/net8.0/System.IO.dll
.. and we need the latter one.
@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"C:\Users\vihofer.nuget\packages\microsoft.netcore.app.runtime.win-x64\8.0.0-rc.1.23381.3\runtimes\win-x64\lib\net8.0\System.Private.CoreLib.dll"
Why is the mono runtime pack different? The CoreCLR one has System.Private.CoreLib in the lib directory (as it's a managed library). cc @akoeplinger
Trimmed from the runtime pack?
Not from the runtime pack directly, but the linker trims out of some shim assemblies afaik. I wasn't sure if this code path would run before or after but I guess it's before. You could consider using an assembly that is more "core" to the .NETCoreApp shared framework, i.e. System.Runtime but I'm also ok with the current state.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this fails for AOT/helix where we create a proxy project, and run only the wasm part of the build. And that doesn't have RuntimePackAsset, because none of the targets related to that were run.
I will try to populate RuntimePackAsset in the proxy project, but that will be bit of a hack.
ViktorHofer
ViktorHofer
previously approved these changes
Aug 1, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, looks good. Please double check that _MscorlibPath, _SystemRuntimePath and _WasmAOTSearchPaths include the correct values.
Thank you
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 1, 2023

Closed


Closed

@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
AOT failure might be relevant. Investigating.
@radicalradical
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Aug 1, 2023
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
I had to change from using RuntimePackAsset, because it is not available in many setups we test like AOT on helix.

This still does not fix the runtime tests though which seem to just dump all the assemblies into a native folder! I'm working on fixing that.
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 3, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ViktorHofer
ViktorHofer
commented
Aug 3, 2023

Copy link


Copy Markdown

Member
@radical you added unrelated commits, didn't you?
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
@radical you added unrelated commits, didn't you?
The merge seems messed up a bit, so git log shows extra commits. But the only actual changes here are the relevant ones. I was avoiding cleaning this up to not mess up reviewing on github (it won't show "changes since last review" if you force-push), but I'll do that now.
radical
added 14 commits
August 3, 2023 13:57
@radical
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets
6167230
Fixesdotnet#79109 .
@radical
Address feedback from@ViktorHofer
38d74d9
@radical
address review feedback
a358520
@radical
Use System.Runtime.dll instead of System.IO.dll
33a6aa4
@radical
Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…
b0cd025
…s config
@radical
Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)
bc07a51
@radical
WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…
ba1dfdc
… as native build depends on that
@radical
WasmApp.targets: Fix the logic to find runtime pack path with the
1974848
.. assemblies. `RuntimePackAsset` can't be reliably used because it is
not always available in the various test setups used. Instead, find
`System.Runtime.dll` in the runtime pack path, which is already known.
@radical
WasmApp.targets - error check before using the item
d997f9d
@radical
Fix runtime tests, by overriding the path to the assemblies
685a39f
@radical
Fix runtime tests, by overriding the path to the assemblies
cb63377
@radical
Apply the same changes to wasi targets also
1af5539
@radical
fix
5119f43
@radical
fix
6106560
@radical
radicalforce-pushed
the
wasm-hardcoded-tfm
branch
from
f177757 to
6106560CompareAugust 3, 2023 17:57
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
Force pushed with the rebased commits.
ViktorHofer
ViktorHofer
approved these changes
Aug 3, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks
@radical
radical
merged commit 2ab3874
into
dotnet:mainAug 3, 2023
@radical
radical
deleted the

wasm-hardcoded-tfm

branch
August 3, 2023 22:49
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 4, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 3, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok

Assignees

@radicalradical

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Remove hardcoded TFM in wasm build files


3 participants

@radical@pavelsavara@ViktorHofer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets - #89699
Merged
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Aug 3, 2023
Merged
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets#89699
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Conversation
@radical
@radicalradical
commented
Jul 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Look for System.Runtime.dll to find the runtime pack directory with the assemblies, so we don't need to figure out the tfm for the path.
  • Cannot use System.Private.CoreLib.dll because that is in native/ instead of lib/net8.0
  • Cannot use RuntimePackAsset because in many places that item isn't available.

    • AOT on helix where we run only the wasm targets on the proxy project.
    • Runtime tests which currently dump all the assemblies, and other bits into a single directory, not following the directory structure of a runtime pack. This also means the RuntimePackAsset cannot easily be synthesized.
Fixes#79109 .
@radicalradical
added
the 
arch-wasm
WebAssembly architecture
label
Jul 31, 2023
@ghostghost
added
the 
area-Build-mono

label
Jul 31, 2023
@ghostghost
assigned radicalJul 31, 2023
@ghost
ghost
commented
Jul 31, 2023

Copy link


Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #79109 .
Author:radical
Assignees:-
Labels:
arch-wasm
Milestone:-
@radicalradical
mentioned this pull request
Jul 31, 2023
 Merged

@radical
radical
marked this pull request as draft
July 31, 2023 01:16
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 31, 2023

Closed

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@radical
radical
marked this pull request as ready for review
July 31, 2023 23:40
ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why System.IO? System.IO is a pure shim assembly which might get trimmed out in certain scenarios.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trimmed from the runtime pack?
They are in different paths:
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/native/System.Private.CoreLib.dll
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/lib/net8.0/System.IO.dll
.. and we need the latter one.
@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"C:\Users\vihofer.nuget\packages\microsoft.netcore.app.runtime.win-x64\8.0.0-rc.1.23381.3\runtimes\win-x64\lib\net8.0\System.Private.CoreLib.dll"
Why is the mono runtime pack different? The CoreCLR one has System.Private.CoreLib in the lib directory (as it's a managed library). cc @akoeplinger
Trimmed from the runtime pack?
Not from the runtime pack directly, but the linker trims out of some shim assemblies afaik. I wasn't sure if this code path would run before or after but I guess it's before. You could consider using an assembly that is more "core" to the .NETCoreApp shared framework, i.e. System.Runtime but I'm also ok with the current state.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this fails for AOT/helix where we create a proxy project, and run only the wasm part of the build. And that doesn't have RuntimePackAsset, because none of the targets related to that were run.
I will try to populate RuntimePackAsset in the proxy project, but that will be bit of a hack.
ViktorHofer
ViktorHofer
previously approved these changes
Aug 1, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, looks good. Please double check that _MscorlibPath, _SystemRuntimePath and _WasmAOTSearchPaths include the correct values.
Thank you
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 1, 2023

Closed


Closed

@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
AOT failure might be relevant. Investigating.
@radicalradical
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Aug 1, 2023
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
I had to change from using RuntimePackAsset, because it is not available in many setups we test like AOT on helix.

This still does not fix the runtime tests though which seem to just dump all the assemblies into a native folder! I'm working on fixing that.
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 3, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ViktorHofer
ViktorHofer
commented
Aug 3, 2023

Copy link


Copy Markdown

Member
@radical you added unrelated commits, didn't you?
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
@radical you added unrelated commits, didn't you?
The merge seems messed up a bit, so git log shows extra commits. But the only actual changes here are the relevant ones. I was avoiding cleaning this up to not mess up reviewing on github (it won't show "changes since last review" if you force-push), but I'll do that now.
radical
added 14 commits
August 3, 2023 13:57
@radical
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets
6167230
Fixesdotnet#79109 .
@radical
Address feedback from@ViktorHofer
38d74d9
@radical
address review feedback
a358520
@radical
Use System.Runtime.dll instead of System.IO.dll
33a6aa4
@radical
Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…
b0cd025
…s config
@radical
Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)
bc07a51
@radical
WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…
ba1dfdc
… as native build depends on that
@radical
WasmApp.targets: Fix the logic to find runtime pack path with the
1974848
.. assemblies. `RuntimePackAsset` can't be reliably used because it is
not always available in the various test setups used. Instead, find
`System.Runtime.dll` in the runtime pack path, which is already known.
@radical
WasmApp.targets - error check before using the item
d997f9d
@radical
Fix runtime tests, by overriding the path to the assemblies
685a39f
@radical
Fix runtime tests, by overriding the path to the assemblies
cb63377
@radical
Apply the same changes to wasi targets also
1af5539
@radical
fix
5119f43
@radical
fix
6106560
@radical
radicalforce-pushed
the
wasm-hardcoded-tfm
branch
from
f177757 to
6106560CompareAugust 3, 2023 17:57
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
Force pushed with the rebased commits.
ViktorHofer
ViktorHofer
approved these changes
Aug 3, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks
@radical
radical
merged commit 2ab3874
into
dotnet:mainAug 3, 2023
@radical
radical
deleted the

wasm-hardcoded-tfm

branch
August 3, 2023 22:49
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 4, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 3, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok

Assignees

@radicalradical

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Remove hardcoded TFM in wasm build files


3 participants

@radical@pavelsavara@ViktorHofer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets - #89699
Merged
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Aug 3, 2023
Merged
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets#89699
radical merged 14 commits into
dotnet:mainfrom 
radical:wasm-hardcoded-tfm
Conversation
@radical
@radicalradical
commented
Jul 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Look for System.Runtime.dll to find the runtime pack directory with the assemblies, so we don't need to figure out the tfm for the path.
  • Cannot use System.Private.CoreLib.dll because that is in native/ instead of lib/net8.0
  • Cannot use RuntimePackAsset because in many places that item isn't available.

    • AOT on helix where we run only the wasm targets on the proxy project.
    • Runtime tests which currently dump all the assemblies, and other bits into a single directory, not following the directory structure of a runtime pack. This also means the RuntimePackAsset cannot easily be synthesized.
Fixes#79109 .
@radicalradical
added
the 
arch-wasm
WebAssembly architecture
label
Jul 31, 2023
@ghostghost
added
the 
area-Build-mono

label
Jul 31, 2023
@ghostghost
assigned radicalJul 31, 2023
@ghost
ghost
commented
Jul 31, 2023

Copy link


Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
Issue Details
Fixes #79109 .
Author:radical
Assignees:-
Labels:
arch-wasm
Milestone:-
@radicalradical
mentioned this pull request
Jul 31, 2023
 Merged

@radical
radical
marked this pull request as draft
July 31, 2023 01:16
@build-analysisbuild-analysisBot
mentioned this pull request
Jul 31, 2023

Closed

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Jul 31, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@radical
radical
marked this pull request as ready for review
July 31, 2023 23:40
ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

ViktorHofer
ViktorHofer
reviewed
Aug 1, 2023
View reviewed changes
Comment threadsrc/mono/wasm/build/WasmApp.Native.targets
Outdated

@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why System.IO? System.IO is a pure shim assembly which might get trimmed out in certain scenarios.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trimmed from the runtime pack?
They are in different paths:
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/native/System.Private.CoreLib.dll
./Microsoft.NETCore.App.Runtime.Mono.browser-wasm/8.0.0-dev/runtimes/browser-wasm/lib/net8.0/System.IO.dll
.. and we need the latter one.
@ViktorHoferViktorHoferAug 1, 2023•

edited

Loading

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"C:\Users\vihofer.nuget\packages\microsoft.netcore.app.runtime.win-x64\8.0.0-rc.1.23381.3\runtimes\win-x64\lib\net8.0\System.Private.CoreLib.dll"
Why is the mono runtime pack different? The CoreCLR one has System.Private.CoreLib in the lib directory (as it's a managed library). cc @akoeplinger
Trimmed from the runtime pack?
Not from the runtime pack directly, but the linker trims out of some shim assemblies afaik. I wasn't sure if this code path would run before or after but I guess it's before. You could consider using an assembly that is more "core" to the .NETCoreApp shared framework, i.e. System.Runtime but I'm also ok with the current state.
@radicalradicalAug 1, 2023

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this fails for AOT/helix where we create a proxy project, and run only the wasm part of the build. And that doesn't have RuntimePackAsset, because none of the targets related to that were run.
I will try to populate RuntimePackAsset in the proxy project, but that will be bit of a hack.
ViktorHofer
ViktorHofer
previously approved these changes
Aug 1, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that works, looks good. Please double check that _MscorlibPath, _SystemRuntimePath and _WasmAOTSearchPaths include the correct values.
Thank you
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 1, 2023

Closed


Closed

@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
AOT failure might be relevant. Investigating.
@radicalradical
added
the 
NO-MERGE
The PR is not ready for merge yet (see discussion for detailed reasons)
label
Aug 1, 2023
@radical
radical
commented
Aug 1, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 1, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
I had to change from using RuntimePackAsset, because it is not available in many setups we test like AOT on helix.

This still does not fix the runtime tests though which seem to just dump all the assemblies into a native folder! I'm working on fixing that.
@radical
radical
commented
Aug 2, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 2, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
/azp run runtime-wasm
@azure-pipelines
azure-pipelinesBot
commented
Aug 3, 2023

Copy link


Copy Markdown


Azure Pipelines successfully started running 1 pipeline(s).
@ViktorHofer
ViktorHofer
commented
Aug 3, 2023

Copy link


Copy Markdown

Member
@radical you added unrelated commits, didn't you?
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
@radical you added unrelated commits, didn't you?
The merge seems messed up a bit, so git log shows extra commits. But the only actual changes here are the relevant ones. I was avoiding cleaning this up to not mess up reviewing on github (it won't show "changes since last review" if you force-push), but I'll do that now.
radical
added 14 commits
August 3, 2023 13:57
@radical
[wasm] Remove hardcoded references to net8.0 from WasmApp*targets
6167230
Fixesdotnet#79109 .
@radical
Address feedback from@ViktorHofer
38d74d9
@radical
address review feedback
a358520
@radical
Use System.Runtime.dll instead of System.IO.dll
33a6aa4
@radical
Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…
b0cd025
…s config
@radical
Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)
bc07a51
@radical
WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…
ba1dfdc
… as native build depends on that
@radical
WasmApp.targets: Fix the logic to find runtime pack path with the
1974848
.. assemblies. `RuntimePackAsset` can't be reliably used because it is
not always available in the various test setups used. Instead, find
`System.Runtime.dll` in the runtime pack path, which is already known.
@radical
WasmApp.targets - error check before using the item
d997f9d
@radical
Fix runtime tests, by overriding the path to the assemblies
685a39f
@radical
Fix runtime tests, by overriding the path to the assemblies
cb63377
@radical
Apply the same changes to wasi targets also
1af5539
@radical
fix
5119f43
@radical
fix
6106560
@radical
radicalforce-pushed
the
wasm-hardcoded-tfm
branch
from
f177757 to
6106560CompareAugust 3, 2023 17:57
@radical
radical
commented
Aug 3, 2023

Copy link


Copy Markdown

MemberAuthor
Force pushed with the rebased commits.
ViktorHofer
ViktorHofer
approved these changes
Aug 3, 2023
View reviewed changes
@ViktorHoferViktorHofer
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks
@radical
radical
merged commit 2ab3874
into
dotnet:mainAug 3, 2023
@radical
radical
deleted the

wasm-hardcoded-tfm

branch
August 3, 2023 22:49
@build-analysisbuild-analysisBot
mentioned this pull request
Aug 4, 2023

Closed

@ghostghost
locked as resolved and limited conversation to collaborators
Sep 3, 2023
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@ViktorHoferViktorHoferViktorHofer approved these changes
@lewinglewingAwaiting requested review from lewing
@steveisoksteveisokAwaiting requested review from steveisok

Assignees

@radicalradical

Labels

arch-wasmWebAssembly architecturearea-Build-mono

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Remove hardcoded TFM in wasm build files


3 participants

@radical@pavelsavara@ViktorHofer