Fix order of targets in WasmNestedPublishAppDependsOn#31640
Merged
maraf merged 1 commit intodotnet:mainfrom Apr 6, 2023
Merged
Fix order of targets in WasmNestedPublishAppDependsOn#31640maraf merged 1 commit intodotnet:mainfrom
maraf merged 1 commit intodotnet:mainfrom
Conversation
|
Thanks for your PR, @maraf. |
lewing
approved these changes
Apr 6, 2023
radical
added a commit
that referenced
this pull request
Apr 19, 2023
- 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 #31640
- but the changes in #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
radical
added a commit
that referenced
this pull request
Apr 19, 2023
- 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 #31640 - but the changes in #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
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
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.
Regression from #31154.
The
_GatherBlazorFilesToPublishmust run after_GatherWasmFilesToPublish, becausethe
_GatherBlazorFilesToPublishmodifies metadata on itemWasmAssembliesToBundleadded by_GatherWasmFilesToPublish.Fix for failing Wasm.Build.Test in dotnet/runtime#84368.