New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged

radical merged 14 commits into dotnet:main from radical:wasm-hardcoded-tfm

Aug 3, 2023

Member

radical commented Jul 31, 2023 •

edited

Loading

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 .

radical added the arch-wasm label

dotnet-issue-labeler bot added the area-Build-mono label

ghost assigned radical

ghost commented Jul 31, 2023

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:	-

radical requested review from ViktorHofer, lewing and steveisok

July 31, 2023 00:40

radical mentioned this pull request

Use live illink for trimming tests #88929

Merged

radical marked this pull request as draft

July 31, 2023 01:16

build-analysis bot mentioned this pull request

Tracking issue for CI build timeouts #76454

Closed

ViktorHofer reviewed

View reviewed changes

src/mono/wasm/build/WasmApp.Native.targets Outdated Show resolved Hide resolved

ViktorHofer reviewed

View reviewed changes

src/mono/wasm/build/WasmApp.Native.targets Outdated Show resolved Hide resolved

radical marked this pull request as ready for review

July 31, 2023 23:40

ViktorHofer reviewed

View reviewed changes

src/mono/wasm/build/WasmApp.Native.targets Outdated Show resolved Hide resolved

ViktorHofer reviewed

View reviewed changes

src/mono/wasm/build/WasmApp.Native.targets Outdated

    
                    <!-- find the path with the assemblies, so we don't have to hardcode the tfm.

                         Cannot use System.Private.Corelib since that is in a different directory -->

                    <_SystemIOPath>@(RuntimePackAsset->WithMetadataValue('Filename', 'System.IO'))</_SystemIOPath>

Member

ViktorHofer Aug 1, 2023 •

edited

Loading

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

Member Author

radical Aug 1, 2023

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.

Member

ViktorHofer Aug 1, 2023 •

edited

Loading

"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.

Member Author

radical Aug 1, 2023

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 previously approved these changes

View reviewed changes

Member

ViktorHofer left a comment

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

Thank you

Member Author

radical commented Aug 1, 2023

/azp run runtime-wasm

azure-pipelines bot commented Aug 1, 2023

Azure Pipelines successfully started running 1 pipeline(s).

This was referenced Aug 1, 2023

[browser] mono runtime already exited with 0 #89425

Closed

[WASM][Debugger]Test timed out: DebuggerTests.BreakpointTests.DebuggerTests.BreakpointTests.CreateGoodBreakpoint #89453

Closed

Member Author

radical commented Aug 1, 2023

AOT failure might be relevant. Investigating.

radical added the NO-MERGE label

Member Author

radical commented Aug 1, 2023

/azp run runtime-wasm

azure-pipelines bot commented Aug 1, 2023

Azure Pipelines successfully started running 1 pipeline(s).

Member Author

radical commented Aug 2, 2023

/azp run runtime-wasm

azure-pipelines bot commented Aug 2, 2023

Azure Pipelines successfully started running 1 pipeline(s).

Member Author

radical commented Aug 2, 2023

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.

Member Author

radical commented Aug 2, 2023

/azp run runtime-wasm

azure-pipelines bot commented Aug 2, 2023

Azure Pipelines successfully started running 1 pipeline(s).

radical requested a review from ViktorHofer

August 2, 2023 20:23

radical requested a review from MichalStrehovsky as a code owner

August 3, 2023 15:42

radical removed request for marek-safar, lambdageek, lateralusX and MichalStrehovsky

August 3, 2023 15:43

Member Author

radical commented Aug 3, 2023

/azp run runtime-wasm

azure-pipelines bot commented Aug 3, 2023

Azure Pipelines successfully started running 1 pipeline(s).

Member

ViktorHofer commented Aug 3, 2023

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

Member Author

radical commented Aug 3, 2023

@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


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

Fixes dotnet#79109 .


          Address feedback from @ViktorHofer

38d74d9


          address review feedback

a358520


          Use System.Runtime.dll instead of System.IO.dll

33a6aa4


          Fix local run with BuildAOTTestsOnHelix=true, to get the correct task…

b0cd025

…s config


          Add $(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)

bc07a51


          WasmApp.LocalBuild.props: populate a synthetic RuntimePackAsset item,…

ba1dfdc

… as native build depends on that


          WasmApp.targets: Fix the logic to find runtime pack path with the

.. 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.


          WasmApp.targets - error check before using the item

d997f9d


          Fix runtime tests, by overriding the path to the assemblies

685a39f


          Fix runtime tests, by overriding the path to the assemblies

cb63377


          Apply the same changes to wasi targets also

1af5539

fix

5119f43

fix

radical force-pushed the wasm-hardcoded-tfm branch from f177757 to 6106560 Compare

August 3, 2023 17:57

Member Author

radical commented Aug 3, 2023

Force pushed with the rebased commits.

ViktorHofer approved these changes

View reviewed changes

Member

ViktorHofer left a comment

Thanks

radical merged commit 2ab3874 into dotnet:main

radical deleted the wasm-hardcoded-tfm branch

August 3, 2023 22:49

build-analysis bot mentioned this pull request

Build race condition in Microsoft.NET.WebAssembly.Webcil.dll #89987

Closed

ghost locked as resolved and limited conversation to collaborators

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

arch-wasm area-Build-mono