Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move asset compression to the StaticWebAssets SDK #31559

Merged
merged 17 commits into from
Apr 14, 2023
Merged

Move asset compression to the StaticWebAssets SDK #31559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5de031b
Initial prototype
MackinnonBuck Mar 30, 2023
e6cdee5
Update Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets
MackinnonBuck Mar 31, 2023
09e1476
Merge branch 'main' into mbuck/static-web-assets-compression
MackinnonBuck Mar 31, 2023
3d8884e
Fix issues caused by merge
MackinnonBuck Mar 31, 2023
aa7fffe
PR feedback
MackinnonBuck Mar 31, 2023
609887d
Fix some CI failures
MackinnonBuck Apr 3, 2023
fdd1b44
Update source-build.slnf
MackinnonBuck Apr 3, 2023
89bd08d
PR feedback
MackinnonBuck Apr 3, 2023
83116f9
Small updates
MackinnonBuck Apr 3, 2023
57ca089
Fix build failures + add logging
MackinnonBuck Apr 3, 2023
b79678d
Fix test failures
MackinnonBuck Apr 5, 2023
0f7c277
Cleanup + add unit tests
MackinnonBuck Apr 5, 2023
29f980a
Some PR feedback
MackinnonBuck Apr 12, 2023
76d4039
More PR feedback
MackinnonBuck Apr 12, 2023
cb8e9e6
PR feedback, improvements, updated baselines
MackinnonBuck Apr 14, 2023
7310c51
Merge branch 'main' into mbuck/static-web-assets-compression
MackinnonBuck Apr 14, 2023
4f9977d
Merge branch 'main' into mbuck/static-web-assets-compression
MackinnonBuck Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions sdk.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,13 +421,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{CA976F33-7BF
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{C5C73211-A713-40BF-8FC8-A690CCBE66F5}"
ProjectSection(SolutionItems) = preProject
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.5_0.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.5_0.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.props = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.props
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.5_0.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.5_0.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.targets
src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.targets
src\StaticWebAssetsSdk\Targets\Sdk.StaticWebAssets.CurrentVersion.props = src\StaticWebAssetsSdk\Targets\Sdk.StaticWebAssets.CurrentVersion.props
src\StaticWebAssetsSdk\Targets\Sdk.StaticWebAssets.CurrentVersion.targets = src\StaticWebAssetsSdk\Targets\Sdk.StaticWebAssets.CurrentVersion.targets
Expand All @@ -437,6 +437,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{6C8E1E65
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.StaticWebAssets.Tasks", "src\StaticWebAssetsSdk\Tasks\Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj", "{3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tool", "Tool", "{51A31407-7C6A-42E9-93B8-F21DEC518A34}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.StaticWebAssets.Tool", "src\StaticWebAssetsSdk\Tool\Microsoft.NET.Sdk.StaticWebAssets.Tool.csproj", "{B8550E71-0CBE-4F88-AC79-2003EFED1DE1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -827,6 +831,10 @@ Global
{3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}.Release|Any CPU.Build.0 = Release|Any CPU
{B8550E71-0CBE-4F88-AC79-2003EFED1DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8550E71-0CBE-4F88-AC79-2003EFED1DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8550E71-0CBE-4F88-AC79-2003EFED1DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8550E71-0CBE-4F88-AC79-2003EFED1DE1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -977,6 +985,8 @@ Global
{C5C73211-A713-40BF-8FC8-A690CCBE66F5} = {9E9F3BB2-6FED-47BC-869C-BFAF6E7C85FC}
{6C8E1E65-EA73-434D-818F-E564BFFE9F86} = {9E9F3BB2-6FED-47BC-869C-BFAF6E7C85FC}
{3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07} = {6C8E1E65-EA73-434D-818F-E564BFFE9F86}
{51A31407-7C6A-42E9-93B8-F21DEC518A34} = {9E9F3BB2-6FED-47BC-869C-BFAF6E7C85FC}
{B8550E71-0CBE-4F88-AC79-2003EFED1DE1} = {51A31407-7C6A-42E9-93B8-F21DEC518A34}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}
Expand Down
177 changes: 68 additions & 109 deletions src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.GenerateBlazorWebAssemblyBootJson" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BlazorWriteSatelliteAssemblyFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BlazorReadSatelliteAssemblyFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.BrotliCompress" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.GzipCompress" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.CreateBlazorTrimmerRootDescriptorFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.ComputeBlazorFilesToCompress" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.ComputeBlazorBuildAssets" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.ComputeBlazorPublishAssets" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />

Expand Down Expand Up @@ -107,8 +104,55 @@ Copyright (c) .NET Foundation. All rights reserved.
GeneratePublishBlazorBootJson;
</GenerateStaticWebAssetsPublishManifestDependsOn>

<ResolveCompressedFilesDependsOn>
$(ResolveCompressedFilesDependsOn);
_ResolveBlazorWasmOutputs;
_AddBlazorWasmStaticWebAssets;
</ResolveCompressedFilesDependsOn>

<ResolveCompressedFilesForPublishDependsOn>
$(ResolveCompressedFilesForPublishDependsOn);
ProcessPublishFilesForBlazor;
ComputeBlazorExtensions;
_AddPublishBlazorBootJsonToStaticWebAssets;
_CollectAssetsToCompress;
</ResolveCompressedFilesForPublishDependsOn>

</PropertyGroup>

<PropertyGroup>
<_BlazorBuildGZipCompressDirectory>$(IntermediateOutputPath)build-gz\</_BlazorBuildGZipCompressDirectory>
<_BlazorPublishCompressDirectory>$(IntermediateOutputPath)compress\</_BlazorPublishCompressDirectory>
</PropertyGroup>

<ItemGroup>

<!--
Compress referenced binaries using GZip during build. This skips files such as the project's assemblies
that change from build to build. Runtime assets contribute to the bulk of the download size. Compressing it
has the most benefit while avoiding any ongoing costs to the dev inner loop.
-->
<CompressionConfiguration Include="BlazorBuildGzip">
<Stage>Build</Stage>
<Format>gzip</Format>
<IncludePattern>_framework\**</IncludePattern>
<ExcludePattern>_framework\blazor.boot.json</ExcludePattern>
<TargetDirectory>$(_BlazorBuildGZipCompressDirectory)</TargetDirectory>
</CompressionConfiguration>

<CompressionConfiguration Include="BlazorPublishGzip">
<Stage>Publish</Stage>
<Format>gzip</Format>
<TargetDirectory>$(_BlazorPublishCompressDirectory)</TargetDirectory>
</CompressionConfiguration>
<CompressionConfiguration Include="BlazorPublishBrotli">
<Stage>Publish</Stage>
<Format>brotli</Format>
<TargetDirectory>$(_BlazorPublishCompressDirectory)</TargetDirectory>
</CompressionConfiguration>

</ItemGroup>

<Import Project="Microsoft.NET.Sdk.BlazorWebAssembly.ServiceWorkerAssetsManifest.targets" Condition="'$(ServiceWorkerAssetsManifest)' != ''" />

<Target Name="_BlazorWasmNativeForBuild" DependsOnTargets="_GatherWasmFilesToBuild;WasmBuildApp" Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'" />
Expand Down Expand Up @@ -221,36 +265,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<ReferenceCopyLocalPaths Remove="@(_BlazorBuildFilesToRemove)" />
</ItemGroup>

<PropertyGroup>
<_BlazorBuildGZipCompressDirectory>$(IntermediateOutputPath)build-gz\</_BlazorBuildGZipCompressDirectory>
</PropertyGroup>

<!--
Compress referenced binaries using GZip during build. This skips files such as the project's assemblies
that change from build to build. Runtime assets contribute to the bulk of the download size. Compressing it
has the most benefit while avoiding any ongoing costs to the dev inner loop.
-->

<ComputeBlazorFilesToCompress Assets="@(_BlazorStaticWebAsset)">
<Output TaskParameter="AssetsToCompress" ItemName="_GzipFileToCompressForBuild" />
</ComputeBlazorFilesToCompress>

<GZipCompress
FilesToCompress="@(_GzipFileToCompressForBuild)"
OutputDirectory="$(_BlazorBuildGZipCompressDirectory)">

<Output TaskParameter="CompressedFiles" ItemName="_BlazorBuildGZipCompressedFile" />
<Output TaskParameter="CompressedFiles" ItemName="FileWrites" />
</GZipCompress>

<ItemGroup>
<_BlazorBuildGZipCompressedFile>
<OriginalItemSpec>%(RelatedAsset)</OriginalItemSpec>
</_BlazorBuildGZipCompressedFile>

<_BlazorGzipStaticWebAsset Include="@(_BlazorBuildGZipCompressedFile->'%(FullPath)')" />
</ItemGroup>

<PropertyGroup>
<_BlazorBuildBootJsonPath>$(IntermediateOutputPath)blazor.boot.json</_BlazorBuildBootJsonPath>
</PropertyGroup>
Expand Down Expand Up @@ -282,7 +296,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<Target Name="_AddBlazorWasmStaticWebAssets" DependsOnTargets="_ResolveBlazorWasmOutputs">
<ItemGroup>
<StaticWebAsset Include="@(_BlazorStaticWebAsset)" />
<StaticWebAsset Include="@(_BlazorGzipStaticWebAsset)" />
<StaticWebAsset Include="@(_BuildBlazorBootJsonStaticWebAsset)" />
</ItemGroup>
</Target>
Expand Down Expand Up @@ -315,7 +328,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<Output TaskParameter="Items" ItemName="_BlazorOutputWithHash" />
</GetFileHash>


<GenerateBlazorWebAssemblyBootJson
AssemblyPath="@(IntermediateAssembly)"
Resources="@(_BlazorOutputWithHash)"
Expand Down Expand Up @@ -426,15 +438,16 @@ Copyright (c) .NET Foundation. All rights reserved.
<ItemGroup>
<ResolvedFileToPublish Remove="@(_PublishResolvedFilesToRemove)" />
<StaticWebAsset Include="@(_NewBlazorPublishStaticWebAssets)" />
<PublishBlazorBootStaticWebAsset
<PublishBlazorBootStaticWebAsset
Include="@(StaticWebAsset)"
Condition="'%(AssetKind)' != 'Build' and
Condition="'%(AssetKind)' != 'Build' and
(('%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' and '%(StaticWebAsset.AssetTraitValue)' != 'manifest' and '%(StaticWebAsset.AssetTraitValue)' != 'boot') or
'%(StaticWebAsset.AssetTraitName)' == 'Culture')" />

</ItemGroup>
</Target>

<Target
<Target
Name="ComputeBlazorExtensions"
AfterTargets="ProcessPublishFilesForBlazor"
DependsOnTargets="$(ComputeBlazorExtensionsDependsOn)" >
Expand Down Expand Up @@ -463,6 +476,22 @@ Copyright (c) .NET Foundation. All rights reserved.

</Target>

<Target Name="_CollectAssetsToCompress" DependsOnTargets="ProcessPublishFilesForBlazor;ComputeBlazorExtensions">
<ItemGroup>
<AssetToCompress
Include="@(StaticWebAsset)"
Condition="'%(AssetKind)' != 'Build' and ('%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' or '%(StaticWebAsset.AssetTraitName)' == 'Culture')">
<ConfigurationName>BlazorPublishGzip</ConfigurationName>
</AssetToCompress>

<AssetToCompress
Include="@(StaticWebAsset)"
Condition="'%(AssetKind)' != 'Build' and ('%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' or '%(StaticWebAsset.AssetTraitName)' == 'Culture')">
<ConfigurationName>BlazorPublishBrotli</ConfigurationName>
</AssetToCompress>
</ItemGroup>
</Target>

<Target Name="_AddBlazorWebConfigFile" AfterTargets="ILLink">
<ItemGroup Condition="'@(ResolvedFileToPublish->AnyHaveMetadataValue('RelativePath', 'web.config'))' != 'true'">
<ResolvedFileToPublish
Expand All @@ -473,6 +502,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</ItemGroup>
</Target>

<!-- <Target Name="_AddPublishBlazorBootJsonToStaticWebAssets" BeforeTargets="ProcessPublishFilesForBlazor"> -->
<Target Name="_AddPublishBlazorBootJsonToStaticWebAssets">
<ItemGroup>
<_PublishBlazorBootJson
Expand Down Expand Up @@ -566,75 +596,4 @@ Copyright (c) .NET Foundation. All rights reserved.
</ItemGroup>
</Target>

<Target Name="_BlazorCompressPublishFiles" AfterTargets="GeneratePublishBlazorBootJson" Condition="'$(BlazorEnableCompression)' != 'false'">
<PropertyGroup>
<_CompressedFileOutputPath>$(IntermediateOutputPath)compress\</_CompressedFileOutputPath>
<_BlazorWebAssemblyBrotliIncremental>true</_BlazorWebAssemblyBrotliIncremental>
</PropertyGroup>

<PropertyGroup Condition="'$(DOTNET_HOST_PATH)' == ''">
<_DotNetHostDirectory>$(NetCoreRoot)</_DotNetHostDirectory>
<_DotNetHostFileName>dotnet</_DotNetHostFileName>
<_DotNetHostFileName Condition="'$(OS)' == 'Windows_NT'">dotnet.exe</_DotNetHostFileName>
</PropertyGroup>

<Message Text="Compressing Blazor WebAssembly publish artifacts. This may take a while..." Importance="High" />

<MakeDir Directories="$(_CompressedFileOutputPath)" Condition="!Exists('$(_CompressedFileOutputPath)')" />

<ItemGroup>
<_GzipFileToCompressForPublish Include="@(StaticWebAsset)"
Condition="'%(AssetKind)' != 'Build' and ('%(StaticWebAsset.AssetTraitName)' == 'BlazorWebAssemblyResource' or '%(StaticWebAsset.AssetTraitName)' == 'Culture')" >
<RelatedAsset>%(Identity)</RelatedAsset>
<AssetRole>Alternative</AssetRole>
<AssetTraitName>Content-Encoding</AssetTraitName>
<AssetTraitValue>gzip</AssetTraitValue>
</_GzipFileToCompressForPublish>

<_BrotliFileToCompressForPublish Include="@(_GzipFileToCompressForPublish)" Condition="'%(AssetKind)' != 'Build'">
<AssetTraitValue>br</AssetTraitValue>
</_BrotliFileToCompressForPublish>

<!-- We compressed a bunch of assets that were not modified since the build process. We can reuse those and avoid the extra compression we just
need to check that they are still relevant (we have updated existing assets to account for linking) -->
<_AlreadyGzipCompressedAssets
Include="@(StaticWebAsset)"
Condition="'%(AssetKind)' != 'Build' and ('%(StaticWebAsset.AssetTraitName)' == 'Content-Encoding' and '%(StaticWebAsset.AssetTraitValue)' == 'gzip')" />
<_GzipFileToCompressForPublish Remove="@(_AlreadyGzipCompressedAssets->'%(RelatedAsset)')" />
</ItemGroup>

<GZipCompress
FilesToCompress="@(_GzipFileToCompressForPublish)"
OutputDirectory="$(_CompressedFileOutputPath)">

<Output TaskParameter="CompressedFiles" ItemName="_BlazorPublishGZipCompressedFile" />
<Output TaskParameter="CompressedFiles" ItemName="FileWrites" />
</GZipCompress>

<BrotliCompress
OutputDirectory="$(_CompressedFileOutputPath)"
FilesToCompress="@(_BrotliFileToCompressForPublish)"
CompressionLevel="$(_BlazorBrotliCompressionLevel)"
SkipIfOutputIsNewer="$(_BlazorWebAssemblyBrotliIncremental)"
ToolAssembly="$(_BlazorWebAssemblySdkToolAssembly)"
ToolExe="$(_DotNetHostFileName)"
ToolPath="$(_DotNetHostDirectory)">

<Output TaskParameter="CompressedFiles" ItemName="_BlazorPublishBrotliCompressedFile" />
<Output TaskParameter="CompressedFiles" ItemName="FileWrites" />
</BrotliCompress>

<ItemGroup>
<_BlazorPublishGZipCompressedFile>
<OriginalItemSpec>%(RelatedAsset)</OriginalItemSpec>
</_BlazorPublishGZipCompressedFile>
<_BlazorPublishBrotliCompressedFile>
<OriginalItemSpec>%(RelatedAsset)</OriginalItemSpec>
</_BlazorPublishBrotliCompressedFile>

<StaticWebAsset Include="@(_BlazorPublishGZipCompressedFile->'%(FullPath)')" />
<StaticWebAsset Include="@(_BlazorPublishBrotliCompressedFile->'%(FullPath)')" />
</ItemGroup>
</Target>

</Project>
3 changes: 3 additions & 0 deletions src/BlazorWasmSdk/Tasks/ComputeBlazorFilesToCompress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ namespace Microsoft.NET.Sdk.BlazorWebAssembly
// We can't just use the ItemSpec because for some assets that points to the output folder and causes issues with incrementalism.
public class ComputeBlazorFilesToCompress : Task
{
// TODO: Remove this class because the logic moved to the static web assets SDK.
// Then update the tests accordingly.

[Required] public ITaskItem[] Assets { get; set; }

[Output] public ITaskItem[] AssetsToCompress { get; set; }
Expand Down
24 changes: 24 additions & 0 deletions src/Layout/redist/targets/GenerateLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,29 @@
SkipUnchangedFiles="true" />
</Target>

<Target Name="PublishStaticWebAssetsTools"
BeforeTargets="PublishNetSdks">
<MSBuild
Targets="Publish"
Projects="$(RepoRoot)/src/StaticWebAssetsSdk/Tool/Microsoft.NET.Sdk.StaticWebAssets.Tool.csproj"
Properties="Configuration=$(Configuration)" />
</Target>

<Target Name="MoveStaticWebAssetsTools" AfterTargets="PublishStaticWebAssetsTools">
<ItemGroup>
<_StaticWebAssetsToolsOutput Include="$(ArtifactsBinDir)Microsoft.NET.Sdk.StaticWebAssets.Tool\$(Configuration)\$(SdkTargetFramework)\publish\*.*" />
</ItemGroup>

<Error
Text="StaticWebAssets SDK tools outputs were not found in $(ArtifactsBinDir)Microsoft.NET.Sdk.StaticWebAssets.Tool\$(Configuration)\$(SdkTargetFramework)\publish"
Condition="'@(_StaticWebAssetsToolsOutput->Count())' == '0'" />

<Copy
SourceFiles="@(_StaticWebAssetsToolsOutput)"
DestinationFolder="$(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk.StaticWebAssets\tools\$(SdkTargetFramework)\"
SkipUnchangedFiles="true" />
</Target>

<Target Name="PublishRazorSdkTools"
BeforeTargets="PublishNetSdks">
<MSBuild
Expand Down Expand Up @@ -420,6 +443,7 @@
PublishMSBuildExtensions;
PublishFSharp;
PublishBlazorWasmTools;
PublishStaticWebAssetsTools;
GenerateCliRuntimeConfigurationFiles;
MakeFscRunnableAndMoveToPublishDir;
RemoveFscFilesAfterPublish;
Expand Down
Loading