Fix WASM boot config ContentRoot to use IntermediateOutputPath #124125
+81
−37
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -332,23 +332,11 @@ static bool IsDotNetWasm(string key) | |||||||||||||
|
|
||||||||||||||
| private TaskItem CreatePromotedAsset(ITaskItem asset) | ||||||||||||||
| { | ||||||||||||||
| // Keep ItemSpec pointing to the actual file on disk. | ||||||||||||||
| // DefineStaticWebAssets will resolve fingerprint placeholders in RelativePath | ||||||||||||||
| // and compute Fingerprint/Integrity from the real file. | ||||||||||||||
| var newAsset = new TaskItem(asset.ItemSpec, asset.CloneCustomMetadata()); | ||||||||||||||
| newAsset.SetMetadata("RelativePath", asset.GetMetadata("RelativePath")); | ||||||||||||||
|
|
||||||||||||||
| ApplyPublishProperties(newAsset); | ||||||||||||||
| return newAsset; | ||||||||||||||
|
|
@@ -446,6 +434,10 @@ private void ComputeUpdatedAssemblies( | |||||||||||||
| // when the original assembly they depend on has been linked out. | ||||||||||||||
| var assetsToUpdate = new Dictionary<string, ITaskItem>(); | ||||||||||||||
| var linkedAssets = new Dictionary<string, ITaskItem>(); | ||||||||||||||
| // Secondary lookup by normalized filename for satellite matching. | ||||||||||||||
| // RelatedAsset may use a different base path (e.g., OutputPath/wwwroot) | ||||||||||||||
| // than the asset's build-time Identity (e.g., IntermediateOutputPath/webcil). | ||||||||||||||
| var assetsToUpdateByFileName = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); | ||||||||||||||
|
|
||||||||||||||
| foreach (var kvp in assemblyAssets) | ||||||||||||||
| { | ||||||||||||||
|
|
@@ -459,6 +451,8 @@ private void ComputeUpdatedAssemblies( | |||||||||||||
| { | ||||||||||||||
| // We found the assembly, so it'll have to be updated. | ||||||||||||||
| assetsToUpdate.Add(assetToUpdateItemSpec, asset); | ||||||||||||||
| if (!assetsToUpdateByFileName.ContainsKey(fileName)) | ||||||||||||||
| assetsToUpdateByFileName[fileName] = assetToUpdateItemSpec; | ||||||||||||||
| filesToRemove.Add(existing); | ||||||||||||||
| if (!string.Equals(asset.ItemSpec, existing.GetMetadata("FullPath"), StringComparison.Ordinal)) | ||||||||||||||
| { | ||||||||||||||
|
|
@@ -477,6 +471,18 @@ private void ComputeUpdatedAssemblies( | |||||||||||||
| var satelliteAssembly = kvp.Value; | ||||||||||||||
| var relatedAsset = satelliteAssembly.GetMetadata("RelatedAsset"); | ||||||||||||||
|
|
||||||||||||||
| // Try exact match first, then fall back to filename-based lookup. | ||||||||||||||
| // Normalize to .dll when webcil is enabled since assetsToUpdateByFileName | ||||||||||||||
| // keys are normalized to .dll (line 448) but RelatedAsset paths use .wasm. | ||||||||||||||
|
Comment on lines
+475
to
+476
There was a problem hiding this comment. The comment references a specific source line number ("line 448"), which will become inaccurate as the file changes and makes the explanation harder to maintain. Consider rewriting this to refer to the normalization step without hard-coded line numbers (e.g., "above" or describing the condition).
Suggested change
|
||||||||||||||
| var relatedAssetFileName = Path.GetFileName(relatedAsset); | ||||||||||||||
| if (IsWebCilEnabled) | ||||||||||||||
| relatedAssetFileName = Path.ChangeExtension(relatedAssetFileName, ".dll"); | ||||||||||||||
| if (!assetsToUpdate.ContainsKey(relatedAsset) | ||||||||||||||
| && assetsToUpdateByFileName.TryGetValue(relatedAssetFileName, out var matchedKey)) | ||||||||||||||
| { | ||||||||||||||
| relatedAsset = matchedKey; | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| if (assetsToUpdate.ContainsKey(relatedAsset)) | ||||||||||||||
| { | ||||||||||||||
| assetsToUpdate.Add(satelliteAssembly.ItemSpec, satelliteAssembly); | ||||||||||||||
|
|
@@ -590,9 +596,24 @@ private List<ITaskItem> ProcessCompressedAssets( | |||||||||||||
|
|
||||||||||||||
| private static void UpdateRelatedAssetProperty(ITaskItem asset, TaskItem newAsset, Dictionary<string, ITaskItem> updatedAssetsMap) | ||||||||||||||
| { | ||||||||||||||
| var relatedAsset = asset.GetMetadata("RelatedAsset"); | ||||||||||||||
| if (!updatedAssetsMap.TryGetValue(relatedAsset, out var updatedRelatedAsset)) | ||||||||||||||
| { | ||||||||||||||
| // Fall back to filename matching when RelatedAsset uses a different base path | ||||||||||||||
| // than the asset's build-time Identity (e.g., OutputPath/wwwroot vs obj/webcil). | ||||||||||||||
| var relatedBaseName = Path.GetFileNameWithoutExtension(relatedAsset); | ||||||||||||||
| foreach (var kvp in updatedAssetsMap) | ||||||||||||||
| { | ||||||||||||||
| if (string.Equals(Path.GetFileNameWithoutExtension(kvp.Key), relatedBaseName, StringComparison.OrdinalIgnoreCase)) | ||||||||||||||
| { | ||||||||||||||
| updatedRelatedAsset = kvp.Value; | ||||||||||||||
| break; | ||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
Comment on lines
+599
to
+612
There was a problem hiding this comment.
|
||||||||||||||
| if (updatedRelatedAsset == null) | ||||||||||||||
| { | ||||||||||||||
| throw new InvalidOperationException("Related asset not found."); | ||||||||||||||
|
Comment on lines
+613
to
+615
There was a problem hiding this comment. The InvalidOperationException message ("Related asset not found.") doesn't include which RelatedAsset value failed to resolve, which makes diagnosing build/publish failures harder—especially now that there is fallback matching logic. Consider including the missing RelatedAsset value (and possibly the current asset ItemSpec) in the exception message.
Suggested change
|
||||||||||||||
| } | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| newAsset.SetMetadata("RelatedAsset", updatedRelatedAsset.ItemSpec); | ||||||||||||||
|
|
||||||||||||||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this needs to happen in other places like the definition of the
.wasmfiles as assets (after webcil conversion).I believe the important bit here is that ContentRoot + RelativePath must exist for all assets
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. Added a commit that sets per-item ContentRoot metadata on each
_WebCilAssetsCandidatesitem to%(RootDir)%(Directory)(its own directory). This ensurescandidateFullPath.StartsWith(normalizedContentRoot)is always true inDefineStaticWebAssets.ComputeCandidateIdentity, so Identity equals the physical file path for all candidates — webcil-converted files inobj/webcil/, runtime pack files inpacks/, PDBs fromobj/, etc.The task-level
ContentRootparameter is kept as a fallback but the per-item metadata takes precedence viaComputePropertyValue.