Skip to content
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

[browser] Fix fingerprinting of relinked dotnet.js during build #86048

Merged
merged 15 commits into from
Jun 2, 2023
Merged

[browser] Fix fingerprinting of relinked dotnet.js during build #86048

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e417620
Fix reading version of relinked dotnet.js during build
maraf May 10, 2023
a04d2a6
Merge remote-tracking branch 'upstream/main' into WasmSdkFixAotVersio…
maraf May 12, 2023
a628547
Support .NET 7 file name
maraf May 15, 2023
d9f607e
Add WBT test
maraf May 15, 2023
ee6424a
Feedback 1
maraf May 16, 2023
7d8ee61
Merge remote-tracking branch 'upstream/main' into WasmSdkFixAotVersio…
maraf May 31, 2023
9976b03
Regex
maraf May 31, 2023
a07aaec
Fix typo
maraf May 31, 2023
a483702
Fix ordering in assert
maraf May 31, 2023
569edfa
Merge remote-tracking branch 'origin/main' into WasmSdkFixAotVersionF…
radical May 31, 2023
064e0d3
fix tests
radical May 31, 2023
a4a89dc
Fix publish fingerprinting
maraf Jun 1, 2023
9a95f2d
Merge remote-tracking branch 'origin/main' into WasmSdkFixAotVersionF…
radical Jun 1, 2023
ce74357
ConvertDllsToWebCil: fix path concatenation
radical Jun 1, 2023
65272df
Merge remote-tracking branch 'origin/main' into WasmSdkFixAotVersionF…
radical Jun 1, 2023
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
5 changes: 5 additions & 0 deletions ...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,15 @@ Copyright (c) .NET Foundation. All rights reserved.
<Target Name="_ResolveWasmOutputs" DependsOnTargets="ResolveReferences;PrepareResourceNames;ComputeIntermediateSatelliteAssemblies;_ResolveWasmConfiguration;_WasmNativeForBuild">
<ItemGroup>
<_WasmConfigFileCandidates Include="@(StaticWebAsset)" Condition="'%(SourceType)' == 'Discovered'" />
<_DotNetJsItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'dotnet.native' and '%(Extension)' == '.js'" />

<!-- Remove dotnet.js/wasm from runtime pack, in favor of the relinked ones in @(WasmNativeAsset) -->
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
Condition="@(WasmNativeAsset->Count()) > 0 and ( '%(FileName)' == 'dotnet' or '%(FileName)' == 'dotnet.native' ) and ('%(Extension)' == '.wasm' or '%(Extension)' == '.js')" />
</ItemGroup>
<PropertyGroup>
<_DotNetJsBuildVersion>%(_DotNetJsItem.NuGetPackageVersion)</_DotNetJsBuildVersion>
</PropertyGroup>

<ComputeWasmBuildAssets
Candidates="@(ReferenceCopyLocalPaths->Distinct());@(WasmNativeAsset)"
Expand All @@ -201,6 +205,7 @@ Copyright (c) .NET Foundation. All rights reserved.
ProjectSatelliteAssemblies="@(IntermediateSatelliteAssembliesWithTargetPath)"
TimeZoneSupport="$(_BlazorEnableTimeZoneSupport)"
InvariantGlobalization="$(_WasmInvariantGlobalization)"
DotNetJsVersion="$(_DotNetJsBuildVersion)"
CopySymbols="$(_WasmCopyOutputSymbolsToOutputDirectory)"
OutputPath="$(OutputPath)"
FingerprintDotNetJs="$(WasmFingerprintDotnetJs)"
Expand Down
5 changes: 4 additions & 1 deletion src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmBuildAssets.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public class ComputeWasmBuildAssets : Task
[Required]
public ITaskItem[] ProjectSatelliteAssemblies { get; set; }

[Required]
public string DotNetJsVersion { get; set; }

[Required]
public string OutputPath { get; set; }

Expand Down Expand Up @@ -114,7 +117,7 @@ public override bool Execute()
if (candidateFileName != "dotnet" || FingerprintDotNetJs)
{
var itemHash = FileHasher.GetFileHash(candidate.ItemSpec);
newDotnetJSFileName = $"{candidateFileName}.{candidate.GetMetadata("NuGetPackageVersion")}.{itemHash}.js";
newDotnetJSFileName = $"{candidateFileName}.{DotNetJsVersion}.{itemHash}.js";

var originalFileFullPath = Path.GetFullPath(candidate.ItemSpec);
var originalFileDirectory = Path.GetDirectoryName(originalFileFullPath);
Expand Down