Skip to content

Commit 487b11f

Browse files
committed
Support disabling the task result caching, do not write the cache file if up to date or no assets
1 parent 99bc185 commit 487b11f

7 files changed

+1442
-6
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ Copyright (c) .NET Foundation. All rights reserved.
221221
<Target Name="ResolveBuildCompressedStaticWebAssets" DependsOnTargets="$(ResolveBuildCompressedStaticWebAssetsDependsOn)">
222222

223223
<PropertyGroup>
224-
<_ResolveBuildCompressedStaticWebAssetsCachePath>$(_StaticWebAssetsManifestBase)rbcswa.dswa.cache.json</_ResolveBuildCompressedStaticWebAssetsCachePath>
224+
<_ResolveBuildCompressedStaticWebAssetsCachePath Condition="'$(StaticWebAssetsCacheDefineStaticWebAssetsEnabled)' == 'true'">$(_StaticWebAssetsManifestBase)rbcswa.dswa.cache.json</_ResolveBuildCompressedStaticWebAssetsCachePath>
225225
</PropertyGroup>
226226

227227
<DefineStaticWebAssets

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Copyright (c) .NET Foundation. All rights reserved.
100100
-->
101101

102102
<PropertyGroup>
103-
<_ResolveJsInitializerModuleStaticWebAssetsCachePath>$(_StaticWebAssetsManifestBase)rjimswa.dswa.cache.json</_ResolveJsInitializerModuleStaticWebAssetsCachePath>
103+
<_ResolveJsInitializerModuleStaticWebAssetsCachePath Condition="'$(StaticWebAssetsCacheDefineStaticWebAssetsEnabled)' == 'true'">$(_StaticWebAssetsManifestBase)rjimswa.dswa.cache.json</_ResolveJsInitializerModuleStaticWebAssetsCachePath>
104104
</PropertyGroup>
105105

106106
<DefineStaticWebAssets Condition="@(_JSModuleCandidates) != ''"
@@ -412,10 +412,10 @@ Copyright (c) .NET Foundation. All rights reserved.
412412
</ItemGroup>
413413

414414
<PropertyGroup>
415-
<_ResolveJSModuleStaticWebAssetsRazorCachePath>$(_StaticWebAssetsManifestBase)rjsmrazor.dswa.cache.json</_ResolveJSModuleStaticWebAssetsRazorCachePath>
415+
<_ResolveJSModuleStaticWebAssetsRazorCachePath Condition="'$(StaticWebAssetsCacheDefineStaticWebAssetsEnabled)' == 'true'">$(_StaticWebAssetsManifestBase)rjsmrazor.dswa.cache.json</_ResolveJSModuleStaticWebAssetsRazorCachePath>
416416
</PropertyGroup>
417417
<PropertyGroup>
418-
<_ResolveJSModuleStaticWebAssetsCshtmlCachePath>$(_StaticWebAssetsManifestBase)rjsmcshtml.dswa.cache.json</_ResolveJSModuleStaticWebAssetsCshtmlCachePath>
418+
<_ResolveJSModuleStaticWebAssetsCshtmlCachePath Condition="'$(StaticWebAssetsCacheDefineStaticWebAssetsEnabled)' == 'true'">$(_StaticWebAssetsManifestBase)rjsmcshtml.dswa.cache.json</_ResolveJSModuleStaticWebAssetsCshtmlCachePath>
419419
</PropertyGroup>
420420

421421
<!-- Find JS module files -->

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ Copyright (c) .NET Foundation. All rights reserved.
433433
<StaticWebAssetFingerprintingEnabled Condition="'$(StaticWebAssetFingerprintingEnabled)' == ''">true</StaticWebAssetFingerprintingEnabled>
434434
<StaticWebAssetMergeTarget Condition="'$(TargetFrameworks)' != '' and '$(TargetPlatformIdentifier)' == 'browser'">Browser</StaticWebAssetMergeTarget>
435435
<StaticWebAssetMergeTarget Condition="'$(TargetFrameworks)' != '' and '$(TargetPlatformIdentifier)' == ''">Server</StaticWebAssetMergeTarget>
436+
<StaticWebAssetsCacheDefineStaticWebAssetsEnabled Condition="'$(StaticWebAssetsCacheDefineStaticWebAssetsEnabled)' == ''">true</StaticWebAssetsCacheDefineStaticWebAssetsEnabled>
436437

437438
<!-- Manifest paths -->
438439
<_StaticWebAssetsManifestBase Condition="'$(_StaticWebAssetsManifestBase)' == ''">$(IntermediateOutputPath)</_StaticWebAssetsManifestBase>
@@ -672,7 +673,7 @@ Copyright (c) .NET Foundation. All rights reserved.
672673
DependsOnTargets="ResolveStaticWebAssetsConfiguration;UpdateExistingPackageStaticWebAssets">
673674

674675
<PropertyGroup>
675-
<_ResolveProjectStaticWebAssetsCachePath>$(_StaticWebAssetsManifestBase)rpswa.dswa.cache.json</_ResolveProjectStaticWebAssetsCachePath>
676+
<_ResolveProjectStaticWebAssetsCachePath Condition="'$(StaticWebAssetsCacheDefineStaticWebAssetsEnabled)' == 'true'">$(_StaticWebAssetsManifestBase)rpswa.dswa.cache.json</_ResolveProjectStaticWebAssetsCachePath>
676677
</PropertyGroup>
677678

678679
<DefineStaticWebAssets

src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssets.Cache.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ internal static DefineStaticWebAssetsCache ReadOrCreateCache(TaskLoggingHelper l
113113

114114
internal void WriteCacheManifest()
115115
{
116-
if (_manifestPath != null)
116+
if (_manifestPath != null && !_cacheUpToDate && InputHashes.Count > 0)
117117
{
118118
using var manifestFile = File.OpenWrite(_manifestPath);
119119
manifestFile.SetLength(0);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[
2+
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\ComponentApp#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz",
3+
"${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\ComponentApp#[.{fingerprint=__fingerprint__}]?.styles.css.gz",
4+
"${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\ComponentApp.styles.css",
5+
"${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\ComponentApp.bundle.scp.css"
6+
]

0 commit comments

Comments
 (0)