diff --git a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets index 07b15260aee8..32e23928d610 100644 --- a/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets +++ b/src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets @@ -115,6 +115,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_BlazorJsFile> _framework/%(Filename)%(Extension) + <_BlazorJSFingerprintPattern Include="Js" Pattern="*.js" Expression="#[.{fingerprint}]!" /> @@ -158,9 +159,13 @@ Copyright (c) .NET Foundation. All rights reserved. + + <_BlazorJSFileNames>;@(_BlazorJSFile->'%(FileName)'); + - <_BlazorJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(FileName)' == '%(_BlazorJSFile.FileName)'" /> - <_BlazorJSPublishCandidate Include="%(_BlazorJSStaticWebAsset.RelativeDir)%(_BlazorJSStaticWebAsset.FileName).%(_BlazorJSStaticWebAsset.Fingerprint)%(_BlazorJSStaticWebAsset.Extension)" /> + <_BlazorJSJSStaticWebAsset Include="@(StaticWebAsset)" Condition="$(_BlazorJSFileNames.Contains(';%(FileName);')) and '%(Extension)' == '.js'" /> + <_BlazorJSPublishCandidate Include="%(_BlazorJSJSStaticWebAsset.RelativeDir)%(_BlazorJSJSStaticWebAsset.FileName).%(_BlazorJSJSStaticWebAsset.Fingerprint)%(_BlazorJSJSStaticWebAsset.Extension)" /> + <_BlazorJSPublishCandidate Remove="@(_BlazorJSPublishCandidate)" Condition="'%(Extension)' == '.map'" /> <_BlazorJSPublishCandidate> _framework/$([System.IO.Path]::GetFileNameWithoutExtension('%(Filename)'))%(Extension) @@ -179,36 +184,36 @@ Copyright (c) .NET Foundation. All rights reserved. AssetTraitValue="boot" CopyToOutputDirectory="Never" CopyToPublishDirectory="PreserveNewest" - ContentRoot="%(_BlazorJSStaticWebAsset.ContentRoot)" - BasePath="%(_BlazorJSStaticWebAsset.BasePath)" + ContentRoot="%(_BlazorJSJSStaticWebAsset.ContentRoot)" + BasePath="%(_BlazorJSJSStaticWebAsset.BasePath)" > - + - + - <_BlazorJSStaticWebAssetFullPath>@(_BlazorJSStaticWebAsset->'%(FullPath)') + <_BlazorJSJSStaticWebAssetFullPath>@(_BlazorJSJSStaticWebAsset->'%(FullPath)') - <_BlazorJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' == 'Content-Encoding' and '%(RelatedAsset)' == '$(_BlazorJSStaticWebAssetFullPath)'" /> + <_BlazorJSJSStaticWebAsset Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' == 'Content-Encoding' and '%(RelatedAsset)' == '$(_BlazorJSJSStaticWebAssetFullPath)'" /> - - - + + - +