dotnet · javiercn · May 11, 2024 · May 20, 2024 · May 20, 2024 · May 20, 2024
diff --git a/...PackageAndP2PReference/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj b/...PackageAndP2PReference/AppWithPackageAndP2PReference/AppWithPackageAndP2PReference.csproj
@@ -2,27 +2,42 @@
 
   <PropertyGroup>
     <TargetFramework>$(AspNetTestTfm)</TargetFramework>
-    <RestoreAdditionalProjectSources>$(RestoreAdditionalProjectSources);./TestPackages</RestoreAdditionalProjectSources>
   </PropertyGroup>
 
   <PropertyGroup>
     <!-- We don't want to run build server when not running as tests. -->
     <UseRazorBuildServer>false</UseRazorBuildServer>
   </PropertyGroup>
 
-  <Target Name="BuildLocalNuget" BeforeTargets="Restore">
-    <MSBuild
-      Projects="..\PackageLibraryDirectDependency\PackageLibraryDirectDependency.csproj"
-      Targets="Restore;Pack"
-    />
-    <MSBuild
-      Projects="..\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj"
-      Targets="Restore;Pack"
-    />
+  <Target Name="EnsurePackagesExist" BeforeTargets="Restore">
+    <ItemGroup>
+      <LocalPackages Include="$(AspNetTestPackageSource)\RazorPackageLibraryDirectDependency.1.0.0.nupkg" />
+      <LocalPackages Include="$(AspNetTestPackageSource)\RazorPackageLibraryTransitiveDependency.1.0.0.nupkg" />
+    </ItemGroup>
+
+    <Error Condition="!Exists('%(LocalPackages.Identity)')" 
+      Text="Package %(LocalPackages.Identity) does not exist. Ensure the test calls CreatePackCommand(ProjectDirectory, &quot;PackageLibraryDirectDependency&quot;)" />
+
+    <Error Condition="'$(RestorePackagesPath)' != '$(AspNetNugetIsolationPath)'"
+      Text="Packages are not being restored into the expected directory. Ensure that NUGET_PACKAGES and AspNetNugetIsolationPath are set as environment variables. The test should extend IsolatedNuGetPackageFolderAspNetSdkBaselineTest. RestorePackagesPath = '$(RestorePackagesPath)', AspNetNugetIsolationPath = '$(AspNetNugetIsolationPath)'" />
+  </Target>
+
+  <Target Name="EnsureLocalPackageStaticWebAssets" BeforeTargets="UpdateExistingPackageStaticWebAssets">
+    <PropertyGroup>
+      <_LocalStaticAssetPath>$(AspNetNugetIsolationPath)\razorpackagelibrarydirectdependency\1.0.0\build\..\staticwebassets\</_LocalStaticAssetPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <_RazorPackageLibraryDirectDependencyAssets Include="@(StaticWebAsset)" Condition="'%(SourceId)' == 'RazorPackageLibraryDirectDependency'" />
+      <_LocalStaticWebAsset Include="@(_RazorPackageLibraryDirectDependencyAssets)" Condition="'%(ContentRoot)' == '$(_LocalStaticAssetPath)'" />
+    </ItemGroup>
+
+    <Error Condition="'@(_LocalStaticWebAsset)' == ''" Text="Static web assets for RazorPackageLibraryDirectDependency not found in '$(_LocalStaticAssetPath)'. Assets: '@(_RazorPackageLibraryDirectDependencyAssets->'%(Identity) %(ContentRoot)', ' ')'" />
+
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="PackageLibraryDirectDependency" Version="1.0.0" />
+    <PackageReference Include="RazorPackageLibraryDirectDependency" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...P2PReference/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj b/...P2PReference/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj
diff --git a/...raryDirectDependency/Components/App.razor → ...raryDirectDependency/Components/App.razor b/...raryDirectDependency/Components/App.razor → ...raryDirectDependency/Components/App.razor
diff --git a/...DirectDependency/Components/App.razor.css → ...DirectDependency/Components/App.razor.css b/...DirectDependency/Components/App.razor.css → ...DirectDependency/Components/App.razor.css
diff --git a/...ncy/PackageLibraryDirectDependency.csproj → ...azorPackageLibraryDirectDependency.csproj b/...ncy/PackageLibraryDirectDependency.csproj → ...azorPackageLibraryDirectDependency.csproj
@@ -11,7 +11,11 @@
     <Company>Microsoft</Company>
     <Description>PackageLibraryDirectDependency Description</Description>
     <DeterministicSourcePaths>false</DeterministicSourcePaths>
-    <PackageOutputPath>$(MSBuildThisFileDirectory)..\AppWithPackageAndP2PReference\TestPackages</PackageOutputPath>
+    <!-- See Directory.Packages.props for details on $(AspNetTestPackageSource).
+         It essentially creates an additional feed for the tests packages at the root
+         of the test project
+     -->
+    <PackageOutputPath>$(AspNetTestPackageSource)</PackageOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -27,8 +31,12 @@
     <!-- <Content Include="build\**" Pack="true" PackagePath="build" /> -->
     <!-- We will remove the line below when we do the item to support packing -->
     <!-- <Content Update="wwwroot\**" Pack="true" PackagePath="razorContent" /> -->
-    <ProjectReference Include="..\PackageLibraryTransitiveDependency\PackageLibraryTransitiveDependency.csproj" />
+    <ProjectReference Include="..\RazorPackageLibraryTransitiveDependency\RazorPackageLibraryTransitiveDependency.csproj" />
   </ItemGroup>
 
+  <Target Name="EnsureFingerprinting" BeforeTargets="Pack" DependsOnTargets="ResolveStaticWebAssetsConfiguration" >
+    <!-- Error if StaticWebAssetFingerprintingEnabled is not true -->
+    <Error Condition="'$(StaticWebAssetFingerprintingEnabled)' != 'true'" Text="$(StaticWebAssetFingerprintingEnabled) must be true for the test to pass." />
+  </Target>
 
 </Project>
diff --git a/...raryDirectDependency/wwwroot/css/site.css → ...raryDirectDependency/wwwroot/css/site.css b/...raryDirectDependency/wwwroot/css/site.css → ...raryDirectDependency/wwwroot/css/site.css
diff --git a/...ctDependency/wwwroot/js/pkg-direct-dep.js → ...ctDependency/wwwroot/js/pkg-direct-dep.js b/...ctDependency/wwwroot/js/pkg-direct-dep.js → ...ctDependency/wwwroot/js/pkg-direct-dep.js
diff --git a/...ce/RazorPackageLibraryTransitiveDependency/RazorPackageLibraryTransitiveDependency.csproj b/...ce/RazorPackageLibraryTransitiveDependency/RazorPackageLibraryTransitiveDependency.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <PropertyGroup>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>$(AspNetTestTfm)</TargetFramework>
+    <Copyright>© Microsoft</Copyright>
+    <Product>Razor Test</Product>
+    <Company>Microsoft</Company>
+    <Description>RazorPackageLibraryTransitiveDependency Description</Description>
+    <DeterministicSourcePaths>false</DeterministicSourcePaths>
+        <!-- See Directory.Packages.props for details on $(AspNetTestPackageSource).
+         It essentially creates an additional feed for the tests packages at the root
+         of the test project
+     -->
+    <PackageOutputPath>$(AspNetTestPackageSource)</PackageOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <Target Name="EnsureFingerprinting" BeforeTargets="Pack" DependsOnTargets="ResolveStaticWebAssetsConfiguration" >
+    <!-- Error if StaticWebAssetFingerprintingEnabled is not true -->
+    <Error Condition="'$(StaticWebAssetFingerprintingEnabled)' != 'true'" Text="$(StaticWebAssetFingerprintingEnabled) must be true for the test to pass." />
+  </Target>
+
+</Project>
diff --git a/...pendency/wwwroot/js/pkg-transitive-dep.js → ...pendency/wwwroot/js/pkg-transitive-dep.js b/...pendency/wwwroot/js/pkg-transitive-dep.js → ...pendency/wwwroot/js/pkg-transitive-dep.js
diff --git a/src/Assets/WasmOverride/Directory.Build.targets b/src/Assets/WasmOverride/Directory.Build.targets
@@ -1,4 +1,9 @@
 <Project>
   <!-- Overriding only when workload is installed, and targeting net8.0 -->
   <Import Project="WasmOverridePacks.targets" Condition="'$(WasmNativeWorkload)' == 'true' and '$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionEquals('$(TargetFrameworkVersion)', '8.0'))" />
+  <Target Name="EnsureAdditionalFolder" BeforeTargets="Restore">
+    <MakeDir Directories="$(MSBuildThisFileDirectory)TestPackages\" />
+  </Target>
+
 </Project>
+
diff --git a/src/Assets/WasmOverride/Directory.Packages.props b/src/Assets/WasmOverride/Directory.Packages.props
@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
-    <RestoreAdditionalProjectSources Condition="Exists('$(MSBuildProjectDirectory)/TestPackages/')">$(RestoreAdditionalProjectSources);$(MSBuildProjectDirectory)/TestPackages/</RestoreAdditionalProjectSources>
+    <AspNetTestPackageSource>$(MSBuildThisFileDirectory)TestPackages\</AspNetTestPackageSource>
+    <RestoreAdditionalProjectSources Condition="Exists('$(AspNetTestPackageSource)')">$(RestoreAdditionalProjectSources);$(AspNetTestPackageSource)</RestoreAdditionalProjectSources>
   </PropertyGroup>
 </Project>
@@ -65,6 +65,10 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
     <Compile LinkBase="StaticWebAssets" Include="..\..\StaticWebAssetsSdk\Tasks\Data\**\StaticwebAsset.cs" />
+    <Compile LinkBase="StaticWebAssets" Include="..\..\StaticWebAssetsSdk\Tasks\Data\**\StaticwebAssetPathPattern.cs" />
+    <Compile LinkBase="StaticWebAssets" Include="..\..\StaticWebAssetsSdk\Tasks\Data\**\StaticwebAssetPathSegment.cs" />
+    <Compile LinkBase="StaticWebAssets" Include="..\..\StaticWebAssetsSdk\Tasks\Data\**\StaticwebAssetSegmentPart.cs" />
+    <Compile LinkBase="StaticWebAssets" Include="..\..\StaticWebAssetsSdk\Tasks\Data\**\StaticwebAssetTokenResolver.cs" />
     <Compile LinkBase="StaticWebAssets" Include="..\..\StaticWebAssetsSdk\Tasks\Utils\FileHasher.cs" />    
   </ItemGroup>
 

diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.5_0.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.5_0.targets
@@ -43,7 +43,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
 
   <UsingTask
-    TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.GenerateStaticWebAssetsPropsFile"
+    TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.GenerateStaticWebAssetsPropsFile50"
     AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
     Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
 
@@ -513,7 +513,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- Generates a props file that goes in build\Microsoft.AspNetCore.StaticWebAssets.props
          and that describes the static web assets for the package.
      -->
-    <GenerateStaticWebAssetsPropsFile
+    <GenerateStaticWebAssetsPropsFile50
       Condition="'$(_CurrentProjectHasStaticWebAssets)' == 'true'"
       StaticWebAssets="@(_CurrentProjectStaticWebAsset)"
       AllowEmptySourceType="true"

diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets
@@ -48,7 +48,7 @@ Integration with static web assets:
 <UsingTask TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ApplyCssScopes" AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" />
 <UsingTask TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ComputeCssScope" AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" />
 <UsingTask TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.RewriteCss" AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" />
-<UsingTask TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ConcatenateCssFiles" AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" />
+<UsingTask TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ConcatenateCssFiles50" AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" />
 
 <PropertyGroup>
 
@@ -337,7 +337,7 @@ Integration with static web assets:
   <!-- This is the bundle for the app, we will always generate it when there are scoped css files for the current project or
        we detected existing bundles available. If some other project/package didn't bundle their assets, we will not be including
        them in this bundle. -->
-  <ConcatenateCssFiles
+  <ConcatenateCssFiles50
     Condition="'@(_ScopedCssProjectBundles)' != '' or '@(_ScopedCss)' != ''"
     ScopedCssFiles="@(_CurrentProjectDiscoveredScopedCssFiles)"
     ProjectBundles="@(_ScopedCssProjectBundles)"
@@ -346,7 +346,7 @@ Integration with static web assets:
   <!-- This is the project bundle, we will only generate it when there are scoped files defined in the project. This bundle will be used
        when the project is referenced from another project or packed as a package (Razor Class Library). If some other project/package
        didn't bundle their assets, we will not be including them in this bundle. -->
-  <ConcatenateCssFiles
+  <ConcatenateCssFiles50
     Condition="'@(_ScopedCss)' != ''"
     ScopedCssFiles="@(_CurrentProjectDiscoveredScopedCssFiles)"
     ProjectBundles="@()"

diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets
@@ -224,11 +224,19 @@ Integration with static web assets:
 
   <ItemGroup>
     <_ScopedCssAppBundleStaticWebAssetCandidate Include="$(_ScopedCssOutputPath)">
-      <RelativePath>$(PackageId).styles.css</RelativePath>
+      <RelativePath Condition="'$(StaticWebAssetFingerprintingEnabled)' == 'true'">$(PackageId)#[.{fingerprint}]?.styles.css</RelativePath>
+      <RelativePath Condition="'$(StaticWebAssetFingerprintingEnabled)' != 'true'">$(PackageId).styles.css</RelativePath>
     </_ScopedCssAppBundleStaticWebAssetCandidate>
     <_ScopedCssProjectBundleStaticWebAssetCandidate Include="$(_ScopedCssProjectOutputPath)">
-      <RelativePath>$(PackageId).bundle.scp.css</RelativePath>
+      <RelativePath Condition="'$(StaticWebAssetFingerprintingEnabled)' == 'true'">$(PackageId)#[.{fingerprint}]!.bundle.scp.css</RelativePath>
+      <RelativePath Condition="'$(StaticWebAssetFingerprintingEnabled)' != 'true'">$(PackageId).bundle.scp.css</RelativePath>
     </_ScopedCssProjectBundleStaticWebAssetCandidate>
+    <!-- Adds a Link: <bundle1>; rel="preload", <bundle2>; rel="preload", <bundle3>; rel="preload" -->
+    <_AddLinkHeaderToAppBundle Include="Append" Condition="'@(_ResolvedScopedCssBundleEndpoints)' != ''">
+      <UpdateTarget>Header</UpdateTarget>
+      <Name>Link</Name>
+      <Value>@(_ResolvedScopedCssBundleEndpoints->'&lt;%(Identity)&gt;; rel="preload"; as="style"', ', ')</Value>
+    </_AddLinkHeaderToAppBundle>
   </ItemGroup>
 
   <DefineStaticWebAssets Condition="@(_AllScopedCss) != ''"
@@ -259,6 +267,20 @@ Integration with static web assets:
     <Output TaskParameter="Endpoints" ItemName="_ScopedCssAppBundleStaticWebAssetEndpoint" />
   </DefineStaticWebAssetEndpoints>
 
+  <UpdateStaticWebAssetEndpoints
+    Condition="'@(_AddLinkHeaderToAppBundle)' != ''"
+    EndpointsToUpdate="@(_ScopedCssAppBundleStaticWebAssetEndpoint)"
+    AllEndpoints="@(_ScopedCssAppBundleStaticWebAssetEndpoint)"
+    Operations="@(_AddLinkHeaderToAppBundle)"
+  >
+    <Output TaskParameter="UpdatedEndpoints" ItemName="_UpdatedScopedCssAppBundleStaticWebAssetEndpoint" />
+  </UpdateStaticWebAssetEndpoints>
+
+  <ItemGroup Condition="'@(_AddLinkHeaderToAppBundle)' != ''">
+    <_ScopedCssAppBundleStaticWebAssetEndpoint Remove="@(_UpdatedScopedCssAppBundleStaticWebAssetEndpoint)" />
+    <_ScopedCssAppBundleStaticWebAssetEndpoint Include="@(_UpdatedScopedCssAppBundleStaticWebAssetEndpoint)" />
+  </ItemGroup>
+
   <DefineStaticWebAssets Condition="@(_ScopedCss) != ''"
     CandidateAssets="@(_ScopedCssProjectBundleStaticWebAssetCandidate)"
     SourceType="Computed"
@@ -351,16 +373,55 @@ Integration with static web assets:
   <!-- Incrementalism is built into the task itself. -->
   <ItemGroup>
     <_CurrentProjectDiscoveredScopedCssFiles Include="@(_DiscoveredScopedCssFiles)" />
+    <!-- If we are in standalone hosting, we want to resolve endpoints that match the file name, that's what standalone does -->
+    <_ScopedCssProjectBundleFilters Include="Standalone" Condition="$(StaticWebAssetStandaloneHosting) == 'true'" />
+    <!-- If we are not in standalone hosting, we want to resolve endpoints with a fingerprint where possible -->
+    <_ScopedCssProjectBundleFilters Include="Property" Condition="$(StaticWebAssetStandaloneHosting) != 'true'">
+      <Name>fingerprint</Name>
+    </_ScopedCssProjectBundleFilters>
+    <_ScopedCssProjectBundleFiltersNoFingerprint Include="Property" Condition="$(StaticWebAssetStandaloneHosting) != 'true'">
+      <Name>fingerprint</Name>
+      <Mode>Exclude</Mode>
+    </_ScopedCssProjectBundleFiltersNoFingerprint>
   </ItemGroup>
 
+  <FilterStaticWebAssetEndpoints Condition="'@(_ScopedCssProjectBundles)' != ''"
+    Endpoints="@(StaticWebAssetEndpoint)"
+    Assets="@(_ScopedCssProjectBundles)"
+    Filters="@(_ScopedCssProjectBundleFilters)"
+  >
+    <Output TaskParameter="FilteredEndpoints" ItemName="_FilteredScopedCssBundleEndpoints" />
+    <Output TaskParameter="AssetsWithoutMatchingEndpoints" ItemName="_ScopedCssBundlesWithoutFingerprint" />
+  </FilterStaticWebAssetEndpoints>
+
+  <FilterStaticWebAssetEndpoints Condition="'$(StaticWebAssetStandaloneHosting)' != 'true' and '@(_ScopedCssBundlesWithoutFingerprint)' != ''"
+    Endpoints="@(StaticWebAssetEndpoint)"
+    Assets="@(_ScopedCssBundlesWithoutFingerprint)"
+    Filters="@(_ScopedCssProjectBundleFiltersNoFingerprint)"
+  >
+    <Output TaskParameter="FilteredEndpoints" ItemName="_FilteredScopedCssBundleEndpoints" />
+    <Output TaskParameter="AssetsWithoutMatchingEndpoints" ItemName="_ScopedCssBundlesWithoutEndpoints" />
+  </FilterStaticWebAssetEndpoints>
+
+  <Error Condition="'@(_ScopedCssProjectBundles)' != '' and '@(_ScopedCssBundlesWithoutEndpoints)' != ''"
+    Text="The following scoped css bundles do not have matching endpoints: @(_ScopedCssBundlesWithoutEndpoints->'%(RelativePath)')" />
+
+  <ResolveStaticWebAssetEndpointRoutes
+    Condition="'@(_ScopedCssProjectBundles)' != ''"
+    Endpoints="@(_FilteredScopedCssBundleEndpoints)"
+    Assets="@(_ScopedCssProjectBundles)"
+  >
+    <Output TaskParameter="ResolvedEndpoints" ItemName="_ResolvedScopedCssBundleEndpoints" />
+  </ResolveStaticWebAssetEndpointRoutes>
+
   <!-- This is the bundle for the app, we will always generate it when there are scoped css files for the current project or
        we detected existing bundles available. If some other project/package didn't bundle their assets, we will not be including
        them in this bundle. -->
 
   <ConcatenateCssFiles
     Condition="'@(_ScopedCssProjectBundles)' != '' or '@(_ScopedCss)' != ''"
     ScopedCssFiles="@(_CurrentProjectDiscoveredScopedCssFiles)"
-    ProjectBundles="@(_ScopedCssProjectBundles)"
+    ProjectBundles="@(_ResolvedScopedCssBundleEndpoints)"
     ScopedCssBundleBasePath="$(_ScopedCssBundleBasePath)"
     OutputFile="$(_ScopedCssOutputPath)" />
 

diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets
@@ -97,6 +97,21 @@ Copyright (c) .NET Foundation. All rights reserved.
     AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
     Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
 
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.FilterStaticWebAssetEndpoints"
+    AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
+    Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
+
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.UpdateStaticWebAssetEndpoints"
+    AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
+    Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
+
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ResolveStaticWebAssetEndpointRoutes"
+    AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
+    Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />    
+
   <!-- Static web assets define how web content needs to be served from web applications, class libraries and packages during
        development and what and where web contents need to be served on the published application.
 
@@ -403,6 +418,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <StaticWebAssetBasePath Condition="'$(StaticWebAssetBasePath)' == ''">_content/$(PackageId)</StaticWebAssetBasePath>
       <StaticWebAssetProjectMode Condition="'$(StaticWebAssetProjectMode)' == ''">Default</StaticWebAssetProjectMode>
       <StaticWebAssetEndpointMode Condition="'$(StaticWebAssetEndpointMode)' == ''" >Hosted</StaticWebAssetEndpointMode>
+      <StaticWebAssetFingerprintingEnabled Condition="'$(StaticWebAssetFingerprintingEnabled)' == ''">true</StaticWebAssetFingerprintingEnabled>
       <StaticWebAssetMergeTarget Condition="'$(TargetFrameworks)' != '' and '$(TargetPlatformIdentifier)' == 'browser'">Browser</StaticWebAssetMergeTarget>
       <StaticWebAssetMergeTarget Condition="'$(TargetFrameworks)' != '' and '$(TargetPlatformIdentifier)' == ''">Server</StaticWebAssetMergeTarget>