Skip to content

[browser] Fix processing of satellite assemblies from referenced assembly during publish #106696

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
Merged
merged 11 commits into from
Sep 5, 2024
Merged

[browser] Fix processing of satellite assemblies from referenced assembly during publish #106696

merged 11 commits into from
Sep 5, 2024

Conversation

@maraf
Copy link
Member

@maraf maraf commented Aug 20, 2024 •
edited
Loading

  • Fix computation of RelatedAsset to satellite assemblies from <Reference />.
  • Explicitly pass ResolveAssemblyReferencesFindRelatedSatellites=true to nested publish to enable searching for satellite assemblies.
  • WBT for satellite assemblies with <ProjectReference /> & <Reference />.

Context

  • We need to read list of assemblies from nested publish because IL-stripping is not in place (it produces assemblies at a different location).
  • The nested build (in common targets) ResolveAssemblyReferencesFindRelatedSatellites is set to false by default

Fixes #105937

maraf added 3 commits August 20, 2024 15:22
@maraf
Fix related asset computation for satellites from reference (not proj…
48660dd 
…ectReference) where ResolvedFrom contains {RawFileName}
@maraf
WBT
cfa59a0
@maraf
Don't remove files with DestinationSubDirectory from ResolvedFileToPu…
20ab100 
…blish because they can be resource assemblies from References
@maraf maraf added arch-wasm WebAssembly architecture area-Build-mono os-browser Browser variant of arch-wasm labels Aug 20, 2024
@maraf maraf added this to the 10.0.0 milestone Aug 20, 2024
@maraf maraf self-assigned this Aug 20, 2024
ilonatommy
ilonatommy requested changes Aug 21, 2024
View reviewed changes
@maraf maraf requested a review from ilonatommy August 21, 2024 07:38
@maraf

This comment was marked as resolved.

Sign in to view
@build-analysis build-analysis bot mentioned this pull request Aug 21, 2024
Closed
@build-analysis build-analysis bot mentioned this pull request Aug 22, 2024
Open
@lewing

This comment was marked as resolved.

Sign in to view
@maraf
We can't check for RawFileName, because ProjectReference satellites g…
ec9d398 
…oes through the same path and are not discovered by nested publish
@build-analysis build-analysis bot mentioned this pull request Aug 27, 2024
Open
3 tasks
This was referenced Aug 29, 2024
Open
Open
Open
@maraf
Copy link
Member Author

maraf commented Aug 29, 2024 •
edited
Loading

This AOT failure didn't find app assembly AOT module. Based on output it seems it didn't run main (out it didn't provide console writes), but return of 42 from nodejs is expected https://helix.dot.net/api/2019-06-17/jobs/61a94806-100b-49f2-b546-f69dd33afd15/workitems/Workloads-NoWebcil-ST-Wasm.Build.Tests.WasmTemplateTests/console
EDIT: It doesn't fail the same locally in Debug not Release
EDIT2: Seems like just one hit, rerun didn't show it again

@maraf
Copy link
Member Author

maraf commented Sep 2, 2024

What if the main assembly gets linked out, but we add satellites for it?

In console app published trimmed, it copies all satellite assemblies, even for linked out libraries

@maraf maraf marked this pull request as draft September 2, 2024 07:59
@maraf maraf marked this pull request as ready for review September 3, 2024 07:52
@maraf maraf merged commit 40cafd7 into dotnet:main Sep 5, 2024
@maraf maraf deleted the BrowserReferenceSatelliteAssembly branch September 5, 2024 12:26
@maraf
Copy link
Member Author

maraf commented Sep 5, 2024

/backport to release/9.0

@github-actions
Copy link
Contributor

github-actions bot commented Sep 5, 2024

Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/10720328255

@github-actions github-actions bot mentioned this pull request Sep 5, 2024
Merged
4 tasks
jtschuster pushed a commit to jtschuster/runtime that referenced this pull request Sep 17, 2024
@maraf @jtschuster
[browser] Fix processing of satellite assemblies from referenced asse…
059e2cf 
…mbly during publish (dotnet#106696)
sirntar pushed a commit to sirntar/runtime that referenced this pull request Sep 30, 2024
@maraf @sirntar
[browser] Fix processing of satellite assemblies from referenced asse…
73caa98 
…mbly during publish (dotnet#106696)
@github-actions github-actions bot locked and limited conversation to collaborators Oct 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@ilonatommy ilonatommy ilonatommy approved these changes

@lewing lewing Awaiting requested review from lewing

@akoeplinger akoeplinger Awaiting requested review from akoeplinger akoeplinger is a code owner

Assignees

@maraf maraf

Labels

arch-wasm WebAssembly architecture area-Build-mono os-browser Browser variant of arch-wasm

Projects

None yet

Milestone

10.0.0

Development

Successfully merging this pull request may close these issues.

Blazor Wasm different output between build and publish

4 participants

@maraf @lewing @akoeplinger @ilonatommy