[StaticWebAssets] Optimize compression (#47734)

* Fix issue where publish compression was disabled when build compression was disabled
* Support passing a custom compression level with BrotliCompressionLevel
* Compress only current project assets for Razor Class Libraries and compress assets missing compression on Web and Blazor scenarios.
* Support disabling compression for discovered assets (stuff in the wwwroot folder)
* Create endpoints for package assets without endpoints

Author: javiercn

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

@@ -161,11 +161,13 @@ Copyright (c) .NET Foundation. All rights reserved.
   </PropertyGroup>
 
   <PropertyGroup>
-    <BuildCompressionFormats>$(BuildCompressionFormats);gzip</BuildCompressionFormats>
-    <PublishCompressionFormats>$(PublishCompressionFormats);gzip;brotli</PublishCompressionFormats>
+    <EnableDefaultCompressionFormats Condition="'$(EnableDefaultCompressionFormats)' == ''">true</EnableDefaultCompressionFormats>
+    <BuildCompressionFormats Condition="'$(EnableDefaultCompressionFormats)' == 'true'">$(BuildCompressionFormats);gzip</BuildCompressionFormats>
+    <PublishCompressionFormats Condition="'$(EnableDefaultCompressionFormats)' == 'true'">$(PublishCompressionFormats);gzip;brotli</PublishCompressionFormats>
     <DisableBuildCompression Condition="'$(DisableBuildCompression)' == ''">false</DisableBuildCompression>
-    <CompressionIncludePatterns>$(CompressionIncludePatterns)</CompressionIncludePatterns>
-    <CompressionExcludePatterns>$(CompressionExcludePatterns)</CompressionExcludePatterns>
+    <CompressDiscoveredAssetsDuringBuild Condition="$(CompressDiscoveredAssetsDuringBuild) == ''">true</CompressDiscoveredAssetsDuringBuild>
+    <!-- Support passing in a custom compression level to brotli and respect the old internal flag for blazor -->
+    <BrotliCompressionLevel Condition="'$(_BlazorBrotliCompressionLevel)' != ''">$(_BlazorBrotliCompressionLevel)</BrotliCompressionLevel>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -195,7 +197,7 @@ Copyright (c) .NET Foundation. All rights reserved.
           GeneratePublishCompressedStaticWebAssets
             ResolvePublishCompressedStaticWebAssetsConfiguration
      -->
-    <ResolvePublishRelatedStaticWebAssetsDependsOn Condition="'$(DisableBuildCompression)' != 'true'">
+    <ResolvePublishRelatedStaticWebAssetsDependsOn>
       ResolvePublishCompressedStaticWebAssets;
       $(ResolvePublishRelatedStaticWebAssetsDependsOn)
     </ResolvePublishRelatedStaticWebAssetsDependsOn>
@@ -270,7 +272,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
     <BrotliCompress Condition="'@(_BrotliCompressedStaticWebAssets)' != ''"
       FilesToCompress="@(_BrotliCompressedStaticWebAssets)"
-      CompressionLevel="$(_BlazorBrotliCompressionLevel)"
+      CompressionLevel="$(BrotliCompressionLevel)"
       ToolAssembly="$(_StaticWebAssetsSdkToolAssembly)"
       ToolExe="$(_DotNetHostFileName)"
       ToolPath="$(_DotNetHostDirectory)" />
@@ -304,8 +306,29 @@ Copyright (c) .NET Foundation. All rights reserved.
       <StaticWebAsset Include="@(_PrecompressedStaticWebAssets)" />
     </ItemGroup>
 
+    <PropertyGroup>
+      <StaticWebAssetBuildCompressAllAssets Condition="'$(StaticWebAssetBuildCompressAllAssets)' == '' and '$(StaticWebAssetProjectMode)' == 'Root'">true</StaticWebAssetBuildCompressAllAssets>
+      <StaticWebAssetBuildCompressAllAssets Condition="'$(StaticWebAssetBuildCompressAllAssets)' == ''">false</StaticWebAssetBuildCompressAllAssets>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(StaticWebAssetBuildCompressAllAssets)' == 'true'">
+      <_CandidateAssetsForBuild Include="@(StaticWebAsset)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(StaticWebAssetBuildCompressAllAssets)' != 'true'">
+      <_CandidateAssetsForBuild
+        Include="@(StaticWebAsset)"
+        Condition="'%(SourceType)' == 'Discovered' or '%(SourceType)' == 'Computed'" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(CompressDiscoveredAssetsDuringBuild)' != 'true'">
+      <_CandidateAssetsForBuild
+        Remove="@(_CandidateAssetsForBuild)"
+        Condition="'%(SourceType)' == 'Discovered'" />
+    </ItemGroup>
+
     <ResolveCompressedAssets
-      CandidateAssets="@(StaticWebAsset)"
+      CandidateAssets="@(_CandidateAssetsForBuild)"
       Formats="$(BuildCompressionFormats)"
       IncludePatterns="$(CompressionIncludePatterns)"
       ExcludePatterns="$(CompressionExcludePatterns)"
@@ -386,12 +409,23 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target Name="ResolvePublishCompressedStaticWebAssetsConfiguration" DependsOnTargets="ResolvePublishStaticWebAssets;$(ResolveCompressedFilesForPublishDependsOn)">
 
-    <ItemGroup>
+    <PropertyGroup>
+      <StaticWebAssetPublishCompressAllAssets Condition="'$(StaticWebAssetPublishCompressAllAssets)' == '' and '$(StaticWebAssetProjectMode)' == 'Root'">true</StaticWebAssetPublishCompressAllAssets>
+      <StaticWebAssetPublishCompressAllAssets Condition="'$(StaticWebAssetPublishCompressAllAssets)' == ''">false</StaticWebAssetPublishCompressAllAssets>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(StaticWebAssetPublishCompressAllAssets)' == 'true'">
       <_CandidateAssetsForPublish
         Include="@(StaticWebAsset)"
         Condition="'%(AssetKind)' != 'Build'" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(StaticWebAssetPublishCompressAllAssets)' != 'true'">
+      <_CandidateAssetsForPublish
+        Include="@(StaticWebAsset)"
+        Condition="'%(AssetKind)' != 'Build' and ('%(SourceType)' == 'Discovered' or '%(SourceType)' == 'Computed')" />
+    </ItemGroup>
+
     <ResolveCompressedAssets
       CandidateAssets="@(_CandidateAssetsForPublish)"
       Formats="$(PublishCompressionFormats)"

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

@@ -717,10 +717,23 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="OriginalAssets" ItemName="_OriginalPackageAssets" />
     </UpdatePackageStaticWebAssets>
 
+    <ItemGroup>
+      <_AssetsWithoutEndpoints Include="@(_UpdatedPackageAssets)" Exclude="@(StaticWebAssetEndpoint->'%(AssetFile)')" />
+    </ItemGroup>
+
+    <DefineStaticWebAssetEndpoints
+      CandidateAssets="@(_AssetsWithoutEndpoints)"
+      ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"
+    >
+      <Output TaskParameter="Endpoints" ItemName="_UpdatedPackageAssetsEndpoint" />
+    </DefineStaticWebAssetEndpoints>
+
     <ItemGroup>
       <StaticWebAsset Remove="@(_OriginalPackageAssets)"/>
       <StaticWebAsset Include="@(_UpdatedPackageAssets)" />
+      <StaticWebAssetEndpoint Include="@(_UpdatedPackageAssetsEndpoint)" />
     </ItemGroup>
+
   </Target>
 
   <Import Project="Microsoft.NET.Sdk.StaticWebAssets.Publish.targets" />

src/WebSdk/Web/Targets/Sdk.Server.props

@@ -21,6 +21,8 @@ Copyright (c) .NET Foundation. All rights reserved.
   <!-- Default properties that shouldn't be replaced by the microsoft.net.sdk.props -->
   <PropertyGroup>
     <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
+    <StaticWebAssetProjectMode>Root</StaticWebAssetProjectMode>
+    <StaticWebAssetBasePath>/</StaticWebAssetBasePath>
   </PropertyGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />