Skip to content

[Static Web Assets] Reworks the protocol for getting referenced assets and brings back backwards compatibility #19482

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
javiercn merged 21 commits into from
Aug 7, 2021
Merged

[Static Web Assets] Reworks the protocol for getting referenced assets and brings back backwards compatibility #19482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
54ccb4b
Updated baselines
javiercn Aug 4, 2021
0497c94
Test fixes
javiercn Aug 4, 2021
b47f9a9
Rework referenced projects protocol
javiercn Aug 4, 2021
7744210
Add back compat changes
javiercn Aug 4, 2021
3260200
Add back-compat tests
javiercn Aug 4, 2021
3030ae4
Fix solution
javiercn Aug 4, 2021
32099dd
Fix templatizer to account for old blazor desktop compat
javiercn Aug 4, 2021
6596e39
Feedback
javiercn Aug 6, 2021
01a33e7
Fully qualify AssetTraitName and AssetTraitValue
javiercn Aug 6, 2021
7d551c5
Templatize baselines further
javiercn Aug 6, 2021
29bb77f
Create manifest base path if it doesn't exist
javiercn Aug 7, 2021
7b7169d
Cleanup old manifest formats and only issue the developer manifest if…
javiercn Aug 7, 2021
de73467
Remove old manifest format
javiercn Aug 7, 2021
735740c
Update tests
javiercn Aug 7, 2021
d6f5c18
Fix incrementalism
javiercn Aug 7, 2021
8a3a5f6
Fix tests
javiercn Aug 7, 2021
ddc752c
Fix test
javiercn Aug 7, 2021
5b6852f
Fix baseline
javiercn Aug 7, 2021
fbbc593
Minimize json dev manifest
javiercn Aug 7, 2021
3c54b7e
Fix tests casing
javiercn Aug 7, 2021
1dd270d
Fix casing
javiercn Aug 7, 2021
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
Prev Previous commit
Next Next commit
Rework referenced projects protocol
  • Loading branch information
@javiercn
javiercn committed Aug 7, 2021
commit b47f9a9babcd487fefb91672370a01011de49bb1
2 changes: 1 addition & 1 deletion src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Static web assets defaults -->
<StaticWebAssetBasePath Condition="'$(StaticWebAssetBasePath)' == ''">/</StaticWebAssetBasePath>
<StaticWebAssetProjectMode Condition="'$(StaticWebAssetProjectMode)' == ''">Root</StaticWebAssetProjectMode>
<StaticWebAssetsPublishTarget>ComputeFilesToPublish</StaticWebAssetsPublishTarget>
<StaticWebAssetsGetPublishAssetsTargets>ComputeFilesToPublish;GetCurrentProjectPublishStaticWebAssetItems</StaticWebAssetsGetPublishAssetsTargets>
<StaticWebAssetsAdditionalPublishProperties>$(StaticWebAssetsAdditionalPublishProperties);BuildProjectReferences=false;ResolveAssemblyReferencesFindRelatedSatellites=true;_PublishingBlazorWasmProject=true</StaticWebAssetsAdditionalPublishProperties>
<StaticWebAssetsAdditionalPublishPropertiesToRemove>$(StaticWebAssetsAdditionalPublishPropertiesToRemove);NoBuild;RuntimeIdentifier</StaticWebAssetsAdditionalPublishPropertiesToRemove>

Expand Down
38 changes: 28 additions & 10 deletions ...orWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.ServiceWorkerAssetsManifest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ Copyright (c) .NET Foundation. All rights reserved.

<PropertyGroup>
<ResolveStaticWebAssetsInputsDependsOn>$(ResolveStaticWebAssetsInputsDependsOn);_AddServiceWorkerAssets</ResolveStaticWebAssetsInputsDependsOn>
<CopyStaticWebAssetsToPublishDirectoryDependsOn>$(CopyStaticWebAssetsToPublishDirectoryDependsOn);_WritePublishServiceWorkerAssetsManifest</CopyStaticWebAssetsToPublishDirectoryDependsOn>
<CopyStaticWebAssetsToOutputFolderDependsOn>$(CopyStaticWebAssetsToOutputFolderDependsOn);_WriteBuildServiceWorkerAssetsManifest</CopyStaticWebAssetsToOutputFolderDependsOn>
<GenerateComputedPublishStaticWebAssetsDependsOn>$(GenerateComputedPublishStaticWebAssetsDependsOn);_WritePublishServiceWorkerAssetsManifest</GenerateComputedPublishStaticWebAssetsDependsOn>
<GenerateComputedBuildStaticWebAssetsDependsOn>$(GenerateComputedBuildStaticWebAssetsDependsOn);_WriteBuildServiceWorkerAssetsManifest</GenerateComputedBuildStaticWebAssetsDependsOn>
</PropertyGroup>

<Target Name="_AddServiceWorkerAssets" DependsOnTargets="_ComputeServiceWorkerAssets">
Expand Down Expand Up @@ -108,13 +108,22 @@ Copyright (c) .NET Foundation. All rights reserved.

</Target>

<Target Name="_WriteBuildServiceWorkerAssetsManifest" DependsOnTargets="_ComputeServiceWorkerAssets">
<Target Name="_WriteBuildServiceWorkerAssetsManifest" DependsOnTargets="ResolveStaticWebAssetsInputs">

<ItemGroup>
<_BuildAssetsForManifest Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' != 'BlazorServiceWorker' and '%(AssetRole)' != 'Alternative' and '%(AssetKind)' != 'Publish' and Exists('%(Identity)')" />
<_BuildAssetsForManifest Include="@(StaticWebAsset->'%(OriginalItemSpec)')" Condition="'%(AssetTraitName)' != 'BlazorServiceWorker' and '%(AssetRole)' != 'Alternative' and '%(AssetKind)' != 'Publish' and !Exists('%(Identity)')" />
<_BuildAssetsForManifestCandidate Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' != 'BlazorServiceWorker' and '%(AssetRole)' != 'Alternative' and Exists('%(Identity)')" />
<_BuildAssetsForManifestCandidate Include="@(StaticWebAsset->'%(OriginalItemSpec)')" Condition="'%(AssetTraitName)' != 'BlazorServiceWorker' and '%(AssetRole)' != 'Alternative' and !Exists('%(Identity)')" />
</ItemGroup>

<ComputeStaticWebAssetsForCurrentProject
Assets="@(_BuildAssetsForManifestCandidate)"
ProjectMode="$(StaticWebAssetProjectMode)"
AssetKind="Build"
Source="$(PackageId)"
>
<Output TaskParameter="StaticWebAssets" ItemName="_BuildAssetsForManifest" />
</ComputeStaticWebAssetsForCurrentProject>

<ComputeStaticWebAssetsTargetPaths Assets="@(_BuildAssetsForManifest)" PathPrefix="$(StaticWebAssetBasePath)" UseAlternatePathDirectorySeparator="true">
<Output TaskParameter="AssetsWithTargetPath" ItemName="_BuildAssetsForManifestWithTargetPath" />
</ComputeStaticWebAssetsTargetPaths>
Expand Down Expand Up @@ -157,19 +166,28 @@ Copyright (c) .NET Foundation. All rights reserved.

</Target>

<Target Name="_WritePublishServiceWorkerAssetsManifest" DependsOnTargets="_ComputeServiceWorkerAssets;LoadStaticWebAssetsPublishManifest" AfterTargets="GenerateStaticWebAssetsPublishManifest">
<Target Name="_WritePublishServiceWorkerAssetsManifest" DependsOnTargets="_ComputeServiceWorkerAssets;LoadStaticWebAssetsPublishManifest">

<ItemGroup>
<_PublishAssetsForManifest Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' != 'BlazorServiceWorker' and '%(AssetRole)' != 'Alternative'" />
<_PublishAssetsForManifestCandidate Include="@(StaticWebAsset)" Condition="'%(AssetTraitName)' != 'BlazorServiceWorker' and '%(AssetRole)' != 'Alternative'" />
</ItemGroup>

<ComputeStaticWebAssetsForCurrentProject
Assets="@(_PublishAssetsForManifestCandidate)"
ProjectMode="$(StaticWebAssetProjectMode)"
AssetKind="Publish"
Source="$(PackageId)"
>
<Output TaskParameter="StaticWebAssets" ItemName="_PublishAssetsForManifest" />
</ComputeStaticWebAssetsForCurrentProject>

<ComputeStaticWebAssetsTargetPaths Assets="@(_PublishAssetsForManifest)" PathPrefix="$(StaticWebAssetBasePath)" UseAlternatePathDirectorySeparator="true">
<Output TaskParameter="AssetsWithTargetPath" ItemName="_AssetsForManifestWithTargetPath" />
<Output TaskParameter="AssetsWithTargetPath" ItemName="_PublishAssetsForManifestWithTargetPath" />
</ComputeStaticWebAssetsTargetPaths>

<ItemGroup>
<_ServiceWorkItem Include="@(_AssetsForManifestWithTargetPath)">
<AssetUrl>%(_AssetsForManifestWithTargetPath.TargetPath)</AssetUrl>
<_ServiceWorkItem Include="@(_PublishAssetsForManifestWithTargetPath)">
<AssetUrl>%(_PublishAssetsForManifestWithTargetPath.TargetPath)</AssetUrl>
</_ServiceWorkItem>
<_PublishServiceWorkerFile Include="@(StaticWebAsset)" Condition="'%(AssetKind)' == 'Publish' And '%(AssetTraitName)' == 'BlazorServiceWorker' And '%(AssetTraitValue)' == 'ServiceWorkerJs'" />
</ItemGroup>
Expand Down
14 changes: 6 additions & 8 deletions src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.ScopedCss.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ Integration with static web assets:
_AddScopedCssBundles;
</ResolveStaticWebAssetsInputsDependsOn>

<CopyStaticWebAssetsToOutputFolderDependsOn>
$(CopyStaticWebAssetsToOutputFolderDependsOn);
<GenerateComputedBuildStaticWebAssetsDependsOn>
$(GenerateComputedBuildStaticWebAssetsDependsOn);
_ResolveBundlingConfiguration;
_GenerateScopedCssFiles;
BundleScopedCssFiles;
</CopyStaticWebAssetsToOutputFolderDependsOn>
</GenerateComputedBuildStaticWebAssetsDependsOn>

</PropertyGroup>

Expand All @@ -75,10 +75,10 @@ Integration with static web assets:
_AddGeneratedScopedCssFiles;
</ResolveStaticWebAssetsInputsDependsOn>

<CopyStaticWebAssetsToOutputFolderDependsOn>
<GenerateComputedBuildStaticWebAssetsDependsOn>
_GenerateScopedCssFiles;
$(CopyStaticWebAssetsToOutputFolderDependsOn);
</CopyStaticWebAssetsToOutputFolderDependsOn>
$(GenerateComputedBuildStaticWebAssetsDependsOn);
</GenerateComputedBuildStaticWebAssetsDependsOn>

</PropertyGroup>

Expand All @@ -90,8 +90,6 @@ Integration with static web assets:
<_ScopedCssExtension>.rz.scp.css</_ScopedCssExtension>
</PropertyGroup>

<Target Name="_PrepareForScopedCss" DependsOnTargets="$(_PrepareForScopedCssDependsOn)" />

<Target Name="ResolveScopedCssInputs">
<!--
Gathers input source files for Razor component generation. This is a separate target so that we can avoid
Expand Down
Loading