[wasm] Fix regression in blazor+aot #31870
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- For blazor AOT, the blazor targets explicitly skip
`Microsoft.JSInterop.WebAssembly.dll` in `_GatherBlazorFilesToPublish` target.
- it is done by marking the assembly item in
`@(WasmAssembliesToBundle)` with `%(AOT_InternalForceToInterpret)="true"`.
- this target needs to run after `_GatherWasmFilesToPublish` which builds
the list of assemblies to AOT in `@(WasmAssembliesToBundle)`
- the order of these two targets was corrected in dotnet#31640
- but the changes in dotnet#31559 added the
target twice, resulting in the order:
`_GatherBlazorFilesToPublish;_GatherWasmFilesToPublish;_GatherBlazorFilesToPublish`
1. in which the first `_GatherBlazorFilesToPublish` tries to remove
the assembly from an empty list
2. then `_GatherWasmFilesToPublish` populates the list
3. and the last instance of `_GatherBlazorFilesToPublish` target
doesn't run because it has already run before in (2).
- thus the assembly never gets removed from the list.
Fixes: dotnet/runtime#85010
ghost
added
Area-AspNetCore
|
Thanks for your PR, @radical. |
lewing
approved these changes
Apr 18, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For blazor AOT, the blazor targets explicitly skip
Microsoft.JSInterop.WebAssembly.dllin_GatherBlazorFilesToPublishtarget.@(WasmAssembliesToBundle)with%(AOT_InternalForceToInterpret)="true".this target needs to run after
_GatherWasmFilesToPublishwhich builds the list of assemblies to AOT in@(WasmAssembliesToBundle)the order of these two targets was corrected in Fix order of targets in WasmNestedPublishAppDependsOn #31640
but the changes in Move asset compression to the StaticWebAssets SDK #31559 added the target twice, resulting in the order:
_GatherBlazorFilesToPublish;_GatherWasmFilesToPublish;_GatherBlazorFilesToPublish_GatherBlazorFilesToPublishtries to remove the assembly from an empty list_GatherWasmFilesToPublishpopulates the list_GatherBlazorFilesToPublishtarget doesn't run because it has already run before in (2).thus the assembly never gets removed from the list.
Fixes: dotnet/runtime#85010