Skip to content

Commit a348b98

Browse files
authored
[Web SDK] Deduplicate _webToolsArtifacts before including them in None (#48805)
1 parent 27ec185 commit a348b98

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ Copyright (c) .NET Foundation. All rights reserved.
405405
<!-- To avoid situations where the content is defined twice, if the user defines the JS module explicitly as
406406
a content item, we'll prefer that over the potential item in the None item group
407407
-->
408-
<_JSFileModuleCandidates Include="@(Content)" />
409-
<_JSFileModuleNoneCandidates Include="@(None)" Exclude="@(Content)" />
408+
<_JSFileModuleCandidates Include="@(Content->Distinct())" />
409+
<_JSFileModuleNoneCandidates Include="@(None->Distinct())" Exclude="@(Content)" />
410410
<_JSFileModuleCandidates Include="@(_JSFileModuleNoneCandidates)" />
411411
</ItemGroup>
412412

src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ Copyright (c) .NET Foundation. All rights reserved.
676676
</PropertyGroup>
677677

678678
<DefineStaticWebAssets
679-
CandidateAssets="@(Content)"
679+
CandidateAssets="@(Content->Distinct())"
680680
FingerprintCandidates="$(StaticWebAssetsFingerprintContent)"
681681
FingerprintPatterns="@(StaticWebAssetFingerprintPattern)"
682682
RelativePathPattern="wwwroot/**"

src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.DefaultItems.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2626
<!-- Removing the tooling artifacts from all other globs and adding it to the none glob. This ensures that the
2727
up-to-date check is unimpacted by the changes to the tooling artifacts -->
2828
<None Remove="@(_WebToolingArtifacts)" />
29-
<None Include="@(_WebToolingArtifacts)"
29+
<None Include="@(_WebToolingArtifacts->Distinct())"
3030
CopyToOutputDirectory="Never"
3131
CopyToPublishDirectory="Never"
3232
ExcludeFromSingleFile="true" />

0 commit comments

Comments
 (0)