[browser] Use StaticWebAssets fingerprinting in Wasm SDK

src/mono/browser/runtime/loader/assets.ts

@@ -318,6 +318,11 @@ export function prepareAssets () {
         }
 
         const addAsset = (asset: AssetEntryInternal, isCore: boolean) => {
+            if (resources.fingerprinting && asset.behavior == "assembly") {
+                const indexOfExtension = asset.name.lastIndexOf(".");
+                const indexOfFingerprint = asset.name.lastIndexOf(".", indexOfExtension - 1);
+                asset.virtualPath = asset.name.substring(0, indexOfFingerprint) + asset.name.substring(indexOfExtension);
+            }
             if (isCore) {
                 asset.isCore = true;
                 coreAssetsToLoad.push(asset);

src/mono/browser/runtime/types/index.ts

@@ -203,6 +203,7 @@ export type ResourceExtensions = { [extensionName: string]: ResourceList };
 
 export interface ResourceGroups {
     hash?: string;
+    fingerprinting?: boolean,
     coreAssembly?: ResourceList; // nullable only temporarily
     assembly?: ResourceList; // nullable only temporarily
     lazyAssembly?: ResourceList; // nullable only temporarily

src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.props

@@ -35,6 +35,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <StaticWebAssetsGetPublishAssetsTargets>ComputeFilesToPublish;GetCurrentProjectPublishStaticWebAssetItems</StaticWebAssetsGetPublishAssetsTargets>
     <StaticWebAssetsAdditionalPublishProperties>$(StaticWebAssetsAdditionalPublishProperties);BuildProjectReferences=false;ResolveAssemblyReferencesFindRelatedSatellites=true</StaticWebAssetsAdditionalPublishProperties>
     <StaticWebAssetsAdditionalPublishPropertiesToRemove>$(StaticWebAssetsAdditionalPublishPropertiesToRemove);NoBuild;RuntimeIdentifier</StaticWebAssetsAdditionalPublishPropertiesToRemove>
+    <StaticWebAssetStandaloneHosting Condition="'$(StaticWebAssetStandaloneHosting)' == '' and '$(StaticWebAssetProjectMode)' == 'Root'">true</StaticWebAssetStandaloneHosting>
   </PropertyGroup>
 
   <ItemGroup>

src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets

@@ -65,7 +65,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Runtime feature defaults to trim unnecessary code -->
     <InvariantTimezone Condition="'$(BlazorEnableTimeZoneSupport)' == 'false'">true</InvariantTimezone>
     <BlazorCacheBootResources Condition="'$(BlazorCacheBootResources)' == ''">true</BlazorCacheBootResources>
-    <WasmFingerprintDotnetJs Condition="'$(WasmFingerprintDotnetJs)' == ''">false</WasmFingerprintDotnetJs>
 
     <!-- Turn off parts of the build that do not apply to WASM projects -->
     <GenerateDependencyFile>false</GenerateDependencyFile>
@@ -194,6 +193,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       <_BlazorWebAssemblyStartupMemoryCache>$(BlazorWebAssemblyStartupMemoryCache)</_BlazorWebAssemblyStartupMemoryCache>
       <_BlazorWebAssemblyJiterpreter>$(BlazorWebAssemblyJiterpreter)</_BlazorWebAssemblyJiterpreter>
       <_BlazorWebAssemblyRuntimeOptions>$(BlazorWebAssemblyRuntimeOptions)</_BlazorWebAssemblyRuntimeOptions>
+      <_WasmFingerprintAssets>$(WasmFingerprintAssets)</_WasmFingerprintAssets>
+      <_WasmFingerprintAssets Condition="'$(_WasmFingerprintAssets)' == ''">true</_WasmFingerprintAssets>
 
       <!-- Workaround for https://github.com/dotnet/sdk/issues/12114-->
       <PublishDir Condition="'$(AppendRuntimeIdentifierToOutputPath)' != 'true' AND '$(PublishDir)' == '$(OutputPath)$(RuntimeIdentifier)\$(PublishDirName)\'">$(OutputPath)$(PublishDirName)\</PublishDir>
@@ -238,10 +239,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       InvariantGlobalization="$(_WasmInvariantGlobalization)"
       HybridGlobalization="$(_IsHybridGlobalization)"
       LoadFullICUData="$(_BlazorWebAssemblyLoadAllGlobalizationData)"
-      DotNetJsVersion="$(_WasmRuntimePackVersion)"
       CopySymbols="$(_WasmCopyOutputSymbolsToOutputDirectory)"
       OutputPath="$(OutputPath)"
-      FingerprintDotNetJs="$(WasmFingerprintDotnetJs)"
       EnableThreads="$(_WasmEnableThreads)"
       EmitSourceMap="$(_WasmEmitSourceMapBuild)"
     >
@@ -259,6 +258,12 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="FileWrites" ItemName="FileWrites" />
     </ConvertDllsToWebCil>
 
+    <ItemGroup>
+      <_WasmFingerprintPatterns Include="WasmFiles" Pattern="*.wasm" Expression="#[.{fingerprint}]!" />
+      <_WasmFingerprintPatterns Include="DatFiles" Pattern="*.dat" Expression="#[.{fingerprint}]!" />
+      <_WasmFingerprintPatterns Include="Pdb" Pattern="*.pdb" Expression="#[.{fingerprint}]!" />
+    </ItemGroup>
+
     <DefineStaticWebAssets
       CandidateAssets="@(_WebCilAssetsCandidates)"
       SourceId="$(PackageId)"
@@ -268,6 +273,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       CopyToOutputDirectory="PreserveNewest"
       CopyToPublishDirectory="Never"
       ContentRoot="$(OutputPath)wwwroot"
+      FingerprintCandidates="$(_WasmFingerprintAssets)"
+      FingerprintPatterns="@(FingerprintPatterns);@(_WasmFingerprintPatterns)"
       BasePath="$(StaticWebAssetBasePath)"
     >
       <Output TaskParameter="Assets" ItemName="WasmStaticWebAsset" />
@@ -321,10 +328,6 @@ Copyright (c) .NET Foundation. All rights reserved.
         Condition="'%(StaticWebAsset.AssetTraitName)' == 'JSModule' and '%(StaticWebAsset.AssetTraitValue)' == 'JSLibraryModule' and '%(AssetKind)' != 'Publish'" />
     </ItemGroup>
 
-    <GetFileHash Files="@(WasmStaticWebAsset->'%(OriginalItemSpec)')" Algorithm="SHA256" HashEncoding="base64">
-      <Output TaskParameter="Items" ItemName="_WasmOutputWithHash" />
-    </GetFileHash>
-
     <ComputeStaticWebAssetsTargetPaths
       Assets="@(_WasmJsModuleCandidatesForBuild)"
       PathPrefix=""
@@ -333,13 +336,26 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="AssetsWithTargetPath" ItemName="_WasmJsModuleCandidatesForBuildWithTargetPath" />
     </ComputeStaticWebAssetsTargetPaths>
 
-    <GetFileHash Files="@(_WasmJsModuleCandidatesForBuildWithTargetPath)" Algorithm="SHA256" HashEncoding="base64">
-      <Output TaskParameter="Items" ItemName="_WasmOutputWithHash" />
-    </GetFileHash>
+    <DefineStaticWebAssetEndpoints
+      CandidateAssets="@(WasmStaticWebAsset)"
+      ExistingEndpoints="@(StaticWebAssetEndpoint)"
+      ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
+    >
+      <Output TaskParameter="Endpoints" ItemName="WasmStaticWebAssetEndpoint" />
+    </DefineStaticWebAssetEndpoints>
+
+    <ResolveFingerprintedStaticWebAssetEndpointsForAssets
+      CandidateEndpoints="@(WasmStaticWebAssetEndpoint)"
+      CandidateAssets="@(WasmStaticWebAsset)"
+      IsStandalone="$(StaticWebAssetStandaloneHosting)"
+    >
+      <Output TaskParameter="ResolvedEndpoints" ItemName="_WasmResolvedEndpoints" />
+    </ResolveFingerprintedStaticWebAssetEndpointsForAssets>
 
     <GenerateWasmBootJson
       AssemblyPath="@(IntermediateAssembly)"
-      Resources="@(_WasmOutputWithHash)"
+      Resources="@(WasmStaticWebAsset);@(_WasmJsModuleCandidatesForBuildWithTargetPath)"
+      Endpoints="@(_WasmResolvedEndpoints)"
       DebugBuild="true"
       DebugLevel="$(WasmDebugLevel)"
       LinkerEnabled="false"
@@ -360,7 +376,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       ModuleAfterRuntimeReady="@(WasmModuleAfterRuntimeReady)"
       IsPublish="false"
       IsAot="$(RunAOTCompilation)"
-      IsMultiThreaded="$(WasmEnableThreads)" />
+      IsMultiThreaded="$(WasmEnableThreads)"
+      IsFingerprintingEnabled="$(_WasmFingerprintAssets)" />
 
     <ItemGroup>
       <FileWrites Include="$(_WasmBuildBootJsonPath)" />
@@ -400,14 +417,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="Endpoints" ItemName="_BuildWasmBootJsonStaticWebAssetEndpoint" />
     </DefineStaticWebAssetEndpoints>
 
-    <DefineStaticWebAssetEndpoints
-      CandidateAssets="@(WasmStaticWebAsset)"
-      ExistingEndpoints="@(StaticWebAssetEndpoint)"
-      ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
-    >
-      <Output TaskParameter="Endpoints" ItemName="WasmStaticWebAssetEndpoint" />
-    </DefineStaticWebAssetEndpoints>
-
   </Target>
 
   <Target Name="ProvideDefaultUserRuntimeConfig" BeforeTargets="_GenerateRuntimeConfigurationFilesInputCache" Condition="'$(GenerateRuntimeConfigurationFiles)' == 'true'">
@@ -465,13 +474,13 @@ Copyright (c) .NET Foundation. All rights reserved.
       LoadFullICUData="$(_BlazorWebAssemblyLoadAllGlobalizationData)"
       CopySymbols="$(CopyOutputSymbolsToPublishDirectory)"
       ExistingAssets="@(_WasmPublishPrefilteredAssets)"
-      DotNetJsVersion="$(_WasmRuntimePackVersion)"
-      FingerprintDotNetJs="$(WasmFingerprintDotnetJs)"
       EnableThreads="$(_WasmEnableThreads)"
       EmitSourceMap="$(_WasmEmitSourceMapPublish)"
       IsWebCilEnabled="$(_WasmEnableWebcil)"
+      IsFingerprintingEnabled="$(_WasmFingerprintAssets)"
     >
       <Output TaskParameter="NewCandidates" ItemName="_NewWasmPublishStaticWebAssets" />
+      <Output TaskParameter="PromotedAssets" ItemName="_PromotedWasmPublishStaticWebAssets" />
       <Output TaskParameter="FilesToRemove" ItemName="_PublishResolvedFilesToRemove" />
     </ComputeWasmPublishAssets>
 
@@ -494,7 +503,7 @@ Copyright (c) .NET Foundation. All rights reserved.
         RemoveMetadata="Integrity;Fingerprint" />
     </ItemGroup>
 
-    <DefineStaticWebAssets CandidateAssets="@(_NewWebCilPublishStaticWebAssetsCandidatesNoMetadata)">
+    <DefineStaticWebAssets CandidateAssets="@(_NewWebCilPublishStaticWebAssetsCandidates);@(_PromotedWasmPublishStaticWebAssets)">
       <Output TaskParameter="Assets" ItemName="_NewWebCilPublishStaticWebAssets" />
     </DefineStaticWebAssets>
 
@@ -627,13 +636,18 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="AssetsWithTargetPath" ItemName="_WasmCandidatesForPublishWithTargetPath" />
     </ComputeStaticWebAssetsTargetPaths>
 
-    <GetFileHash Files="@(_WasmPublishAsset);@(_WasmCandidatesForPublishWithTargetPath)" Algorithm="SHA256" HashEncoding="base64">
-      <Output TaskParameter="Items" ItemName="_WasmPublishBootResourceWithHash" />
-    </GetFileHash>
+    <ResolveFingerprintedStaticWebAssetEndpointsForAssets
+      CandidateEndpoints="@(StaticWebAssetEndpoint)"
+      CandidateAssets="@(_WasmPublishAsset);@(_WasmCandidatesForPublishWithTargetPath)"
+      IsStandalone="$(StaticWebAssetStandaloneHosting)"
+    >
+      <Output TaskParameter="ResolvedEndpoints" ItemName="_WasmResolvedEndpointsForPublish" />
+    </ResolveFingerprintedStaticWebAssetEndpointsForAssets>
 
     <GenerateWasmBootJson
       AssemblyPath="@(IntermediateAssembly)"
-      Resources="@(_WasmPublishBootResourceWithHash)"
+      Resources="@(_WasmPublishAsset);@(_WasmCandidatesForPublishWithTargetPath)"
+      Endpoints="@(_WasmResolvedEndpointsForPublish)"
       DebugBuild="false"
       DebugLevel="$(WasmDebugLevel)"
       LinkerEnabled="$(PublishTrimmed)"
@@ -654,7 +668,8 @@ Copyright (c) .NET Foundation. All rights reserved.
       ModuleAfterRuntimeReady="@(WasmModuleAfterRuntimeReady)"
       IsPublish="true"
       IsAot="$(RunAOTCompilation)"
-      IsMultiThreaded="$(WasmEnableThreads)" />
+      IsMultiThreaded="$(WasmEnableThreads)"
+      IsFingerprintingEnabled="$(_WasmFingerprintAssets)" />
 
     <ItemGroup>
       <FileWrites Include="$(IntermediateOutputPath)blazor.publish.boot.json" />

src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/AssetsComputingHelper.cs

@@ -94,12 +94,29 @@ private static bool IsFromMonoPackage(ITaskItem candidate)
 
     public static string GetCandidateRelativePath(ITaskItem candidate)
     {
+        const string optionalFingerprint = "#[.{fingerprint}]?";
+        const string requiredFingerprint = "#[.{fingerprint}]!";
+
+        string fileName = candidate.GetMetadata("FileName");
+        string extension = candidate.GetMetadata("Extension");
+        string subPath = string.Empty;
+
         var destinationSubPath = candidate.GetMetadata("DestinationSubPath");
         if (!string.IsNullOrEmpty(destinationSubPath))
-            return $"_framework/{destinationSubPath}";
+        {
+            fileName = Path.GetFileNameWithoutExtension(destinationSubPath);
+            extension = Path.GetExtension(destinationSubPath);
+            subPath = destinationSubPath.Substring(fileName.Length + extension.Length);
+        }
 
-        var relativePath = candidate.GetMetadata("FileName") + candidate.GetMetadata("Extension");
-        return $"_framework/{relativePath}";
+        string relativePath = (fileName, extension) switch {
+            ("dotnet", ".js") => string.Concat(fileName, optionalFingerprint, extension),
+            ("dotnet.runtime", ".js") => string.Concat(fileName, requiredFingerprint, extension),
+            ("dotnet.native", ".js") => string.Concat(fileName, requiredFingerprint, extension),
+            ("dotnet.worker", ".js") => string.Concat(fileName, requiredFingerprint, extension),
+            _ => string.Concat(fileName, extension)
+        };
+        return $"_framework/{subPath}{relativePath}";
     }
 
     public static ITaskItem GetCustomIcuAsset(ITaskItem candidate)

src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/BootJsonData.cs

@@ -125,6 +125,8 @@ public class ResourcesData
     /// </summary>
     public string hash { get; set; }
 
+    public bool fingerprinting { get; set; }
+
     /// <summary>
     /// .NET Wasm runtime resources (dotnet.wasm, dotnet.js) etc.
     /// </summary>

src/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/ComputeWasmBuildAssets.cs

@@ -31,9 +31,6 @@ public class ComputeWasmBuildAssets : Task
     [Required]
     public ITaskItem[] ProjectSatelliteAssemblies { get; set; }
 
-    [Required]
-    public string DotNetJsVersion { get; set; }
-
     [Required]
     public string OutputPath { get; set; }
 
@@ -52,8 +49,6 @@ public class ComputeWasmBuildAssets : Task
     [Required]
     public bool CopySymbols { get; set; }
 
-    public bool FingerprintDotNetJs { get; set; }
-
     public bool EnableThreads { get; set; }
 
     public bool EmitSourceMap { get; set; }
@@ -117,44 +112,8 @@ public override bool Execute()
                     continue;
                 }
 
-                string candidateFileName = candidate.GetMetadata("FileName");
-                if (candidateFileName.StartsWith("dotnet") && candidate.GetMetadata("Extension") == ".js")
-                {
-                    string newDotnetJSFileName = null;
-                    string newDotNetJSFullPath = null;
-                    if (candidateFileName != "dotnet" || FingerprintDotNetJs)
-                    {
-                        var itemHash = FileHasher.GetFileHash(candidate.ItemSpec);
-                        newDotnetJSFileName = $"{candidateFileName}.{DotNetJsVersion}.{itemHash}.js";
-
-                        var originalFileFullPath = Path.GetFullPath(candidate.ItemSpec);
-                        var originalFileDirectory = Path.GetDirectoryName(originalFileFullPath);
-
-                        newDotNetJSFullPath = Path.Combine(originalFileDirectory, newDotnetJSFileName);
-                    }
-                    else
-                    {
-                        newDotNetJSFullPath = candidate.ItemSpec;
-                        newDotnetJSFileName = Path.GetFileName(newDotNetJSFullPath);
-                    }
-
-                    var newDotNetJs = new TaskItem(newDotNetJSFullPath, candidate.CloneCustomMetadata());
-                    newDotNetJs.SetMetadata("OriginalItemSpec", candidate.ItemSpec);
-
-                    var newRelativePath = $"_framework/{newDotnetJSFileName}";
-                    newDotNetJs.SetMetadata("RelativePath", newRelativePath);
-
-                    newDotNetJs.SetMetadata("AssetTraitName", "WasmResource");
-                    newDotNetJs.SetMetadata("AssetTraitValue", "native");
-
-                    assetCandidates.Add(newDotNetJs);
-                    continue;
-                }
-                else
-                {
-                    string relativePath = AssetsComputingHelper.GetCandidateRelativePath(candidate);
-                    candidate.SetMetadata("RelativePath", relativePath);
-                }
+                string relativePath = AssetsComputingHelper.GetCandidateRelativePath(candidate);
+                candidate.SetMetadata("RelativePath", relativePath);
 
                 // Workaround for https://github.com/dotnet/aspnetcore/issues/37574.
                 // For items added as "Reference" in project references, the OriginalItemSpec is incorrect.
@@ -264,6 +223,7 @@ private static void ApplyUniqueMetadataProperties(ITaskItem candidate)
                 break;
             case ".wasm":
             case ".blat":
+            case ".js" when filename.StartsWith("dotnet"):
             case ".dat" when filename.StartsWith("icudt"):
             case ".json" when filename.StartsWith("segmentation-rules"):
                 candidate.SetMetadata("AssetTraitName", "WasmResource");