Skip to content

Commit b5f3be8

Browse files
authored
[StaticWebAssets] Add the cache files to the list of written files so they get deleted during clean (#48952)
1 parent 5082b92 commit b5f3be8

File tree

5 files changed

+11
-0
lines changed

5 files changed

+11
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ Copyright (c) .NET Foundation. All rights reserved.
244244
<StaticWebAsset Include="@(_CompressionBuildStaticWebAsset)" />
245245
<StaticWebAssetEndpoint Include="@(_CompressionBuildStaticWebAssetEndpoint)" />
246246
<_CompressionCurrentProjectBuildAssets Include="@(StaticWebAsset)" />
247+
<FileWrites Include="@(_ResolveBuildCompressedStaticWebAssetsCachePath)" />
247248
</ItemGroup>
248249

249250
<ApplyCompressionNegotiation

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ Copyright (c) .NET Foundation. All rights reserved.
165165
<StaticWebAsset Include="@(_JSModuleStaticWebAsset)" />
166166
<StaticWebAssetEndpoint Remove="@(_FilteredJSModuleStaticWebAssetEndpointWithProperty)" />
167167
<StaticWebAssetEndpoint Include="@(_FilteredJSModuleStaticWebAssetEndpointWithProperty)" />
168+
<FileWrites Include="$(_ResolveJsInitializerModuleStaticWebAssetsCachePath)" />
168169
</ItemGroup>
169170

170171
</Target>
@@ -496,6 +497,9 @@ Copyright (c) .NET Foundation. All rights reserved.
496497
<!-- Remove the items from their original groups since they've now become a StaticWebAsset -->
497498
<Content Remove="@(_JsFileModuleStaticWebAsset->'%(OriginalItemSpec)')" />
498499
<None Remove="@(_JsFileModuleStaticWebAsset->'%(OriginalItemSpec)')" />
500+
501+
<FileWrites Include="$(_ResolveJSModuleStaticWebAssetsRazorCachePath)" />
502+
<FileWrites Include="$(_ResolveJSModuleStaticWebAssetsCshtmlCachePath)" />
499503
</ItemGroup>
500504

501505
</Target>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,8 @@ Copyright (c) .NET Foundation. All rights reserved.
707707
</StaticWebAssetDiscoveryPattern>
708708

709709
<Content Remove="@(StaticWebAsset)" />
710+
711+
<FileWrites Include="$(_ResolveProjectStaticWebAssetsCachePath)" />
710712
</ItemGroup>
711713

712714
</Target>

src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssets.Cache.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ private void TotalUpdate(byte[] propertiesHash, byte[] fingerprintPatternsHash,
165165
GlobalPropertiesHash = propertiesHash;
166166
FingerprintPatternsHash = fingerprintPatternsHash;
167167
PropertyOverridesHash = propertyOverridesHash;
168+
CachedAssets.Clear();
169+
CachedCopyCandidates.Clear();
168170
InputHashes = [.. inputsByHash.Keys];
169171
_inputByHash = inputsByHash;
170172
}

test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverStaticWebAssetsTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,8 @@ public void DefineStaticWebAssetsCache_Recomputes_All_WhenPropertiesChange(Updat
605605

606606
Assert.False(cache.IsUpToDate());
607607
Assert.Same(inputHashes, cache.OutOfDateInputs());
608+
Assert.Empty(cache.CachedAssets);
609+
Assert.Empty(cache.CachedCopyCandidates);
608610
}
609611

610612
[Fact]

0 commit comments

Comments
 (0)