Skip to content

[browser] Integrate compression from StaticWebAssets #84924

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

Merged
maraf merged 1 commit into from
Apr 17, 2023
Merged

[browser] Integrate compression from StaticWebAssets #84924

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 28 additions & 3 deletions ...et/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<_WebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net8.0</_WebAssemblySdkTasksTFM>
<_WebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472</_WebAssemblySdkTasksTFM>
<_WebAssemblySdkTasksAssembly>$(WebAssemblySdkDirectoryRoot)tools\$(_WebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.dll</_WebAssemblySdkTasksAssembly>

<!-- Compression -->
<CompressionIncludePatterns>$(CompressionIncludePatterns);_framework\**</CompressionIncludePatterns>
<DisableBuildCompression Condition="'$(WasmBuildingForNestedPublish)' == 'true'">true</DisableBuildCompression>
</PropertyGroup>

<UsingTask TaskName="Microsoft.NET.Sdk.WebAssembly.GenerateWasmBootJson" AssemblyFile="$(_WebAssemblySdkTasksAssembly)" />
Expand Down Expand Up @@ -77,28 +81,48 @@ Copyright (c) .NET Foundation. All rights reserved.

<!-- Wire-up static web assets -->
<PropertyGroup>
<!-- Static Web Assets -->
<ResolveStaticWebAssetsInputsDependsOn>
$(ResolveStaticWebAssetsInputsDependsOn);
_AddWasmStaticWebAssets;
</ResolveStaticWebAssetsInputsDependsOn>

<StaticWebAssetsPrepareForRunDependsOn>
_GenerateBuildWasmBootJson;
$(StaticWebAssetsPrepareForRunDependsOn)
</StaticWebAssetsPrepareForRunDependsOn>

<ResolvePublishStaticWebAssetsDependsOn Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
$(ResolvePublishStaticWebAssetsDependsOn);
ProcessPublishFilesForWasm;
ComputeWasmExtensions;
_AddPublishWasmBootJsonToStaticWebAssets;
</ResolvePublishStaticWebAssetsDependsOn>

<GenerateStaticWebAssetsPublishManifestDependsOn Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
$(GenerateStaticWebAssetsPublishManifestDependsOn);
GeneratePublishWasmBootJson;
</GenerateStaticWebAssetsPublishManifestDependsOn>

<!-- Compression -->
<ResolveCompressedFilesDependsOn>
$(ResolveCompressedFilesDependsOn);
ResolveWasmOutputs;
_AddWasmStaticWebAssets;
</ResolveCompressedFilesDependsOn>
<ResolveCompressedFilesForPublishDependsOn>
$(ResolveCompressedFilesForPublishDependsOn);
ProcessPublishFilesForWasm;
ComputeWasmExtensions;
_AddPublishWasmBootJsonToStaticWebAssets;
</ResolveCompressedFilesForPublishDependsOn>
<CompressFilesDependsOn>
$(CompressFilesDependsOn)
_GenerateBuildWasmBootJson;
</CompressFilesDependsOn>
<CompressFilesForPublishDependsOn>
$(CompressFilesForPublishDependsOn);
GeneratePublishWasmBootJson;
</CompressFilesForPublishDependsOn>

<!-- Wasm -->
<AddWasmStaticWebAssetsDependsOn>
$(AddWasmStaticWebAssetsDependsOn);
ResolveWasmOutputs;
Expand Down Expand Up @@ -381,6 +405,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<DefineStaticWebAssets CandidateAssets="@(_BlazorExtensionsCandidate)">
<Output TaskParameter="Assets" ItemName="StaticWebAsset" />
<Output TaskParameter="Assets" ItemName="_BlazorExtensionsCandidatesForPublish" />
<Output TaskParameter="Assets" ItemName="AssetToCompress" />
</DefineStaticWebAssets>
</Target>

Expand Down