Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[browser] Fix computing destination sub path and publish extension target path in Wasm SDK #105458

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

Merged
merged 5 commits into from
Jul 26, 2024
Merged

[browser] Fix computing destination sub path and publish extension target path in Wasm SDK #105458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16ca9e7
Fix computing destination subPath
maraf Jul 25, 2024
350dac3
Merge branch 'main' into BrowserFingerprintingFixSatellite
maraf Jul 25, 2024
dc37a2e
Fix target path for blazor publish extensions
maraf Jul 25, 2024
254c0bc
Feedback
maraf Jul 25, 2024
af75c68
Merge branch 'main' into BrowserFingerprintingFixSatellite
maraf Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ public static string GetCandidateRelativePath(ITaskItem candidate, bool fingerpr
{
fileName = Path.GetFileNameWithoutExtension(destinationSubPath);
extension = Path.GetExtension(destinationSubPath);
subPath = destinationSubPath.Substring(fileName.Length + extension.Length);
subPath = Path.GetDirectoryName(destinationSubPath);
if (!string.IsNullOrEmpty(subPath))
subPath += "/";
}

string relativePath;
Expand Down
4 changes: 2 additions & 2 deletions src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ public void WriteBootJson(Stream output, string entryAssemblyName)
resourceList = new();
resourceData.extensions[extensionName] = resourceList;
}
var targetPath = resource.GetMetadata("TargetPath");
var targetPath = endpointByAsset[resource.ItemSpec].ItemSpec;
Debug.Assert(!string.IsNullOrEmpty(targetPath), "Target path for '{0}' must exist.", resource.ItemSpec);
AddResourceToList(resource, resourceList, targetPath);
continue;
Expand Down Expand Up @@ -431,7 +431,7 @@ void AddResourceToList(ITaskItem resource, ResourceHashesByNameDictionary resour
{
if (!resourceList.ContainsKey(resourceKey))
{
Log.LogMessage(MessageImportance.Low, "Added resource '{0}' to the manifest.", resource.ItemSpec);
Log.LogMessage(MessageImportance.Low, "Added resource '{0}' with key '{1}' to the manifest.", resource.ItemSpec, resourceKey);
resourceList.Add(resourceKey, $"sha256-{resource.GetMetadata("Integrity")}");
}
}
Expand Down