Skip to content

Commit a271758

Browse files
committed
Addressed feedback
1 parent 9cfec3b commit a271758

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

src/Components/WebAssembly/Build/src/targets/ServiceWorkerAssetsManifest.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Target Name="_WriteServiceWorkerAssetsManifest"
2222
Inputs="@(ServiceWorkerAssetsManifestItem)"
2323
Outputs="$(_ServiceWorkerAssetsManifestIntermediateOutputPath)"
24-
BeforeTargets="_StaticWebAssetsCopyGeneratedFilesToOutputDirectory"
24+
BeforeTargets="_BlazorStaticWebAssetsCopyGeneratedFilesToOutputDirectory"
2525
DependsOnTargets="_ComputeServiceWorkerAssetsManifestFileHashes; _ComputeDefaultServiceWorkerAssetsManifestVersion">
2626

2727
<GenerateServiceWorkerAssetsManifest

src/Components/WebAssembly/Build/src/targets/StaticWebAssets.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<PropertyGroup>
33
<ResolveStaticWebAssetsInputsDependsOn>
44
$(ResolveStaticWebAssetsInputsDependsOn);
5-
_ApplyLinkPreferencesToStaticWebAssets;
5+
_BlazorApplyLinkPreferencesToStaticWebAssets;
66
_ResolveBlazorGeneratedAssets;
77
</ResolveStaticWebAssetsInputsDependsOn>
88

99
<GetCurrentProjectStaticWebAssetsDependsOn>
1010
$(GetCurrentProjectStaticWebAssetsDependsOn);
11-
_ApplyLinkPreferencesToStaticWebAssets;
11+
_BlazorApplyLinkPreferencesToStaticWebAssets;
1212
_ResolveBlazorGeneratedAssets;
1313
</GetCurrentProjectStaticWebAssetsDependsOn>
1414
</PropertyGroup>

src/Components/WebAssembly/Build/src/targets/StaticWebAssets.targets

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
</Target>
3636

37-
<Target Name="_StaticWebAssetsCopyGeneratedFilesToOutputDirectory"
37+
<Target Name="_BlazorStaticWebAssetsCopyGeneratedFilesToOutputDirectory"
3838
DependsOnTargets="ResolveStaticWebAssetsInputs;$(_BlazorCopyFilesToOutputDirectoryDependsOn)"
3939
AfterTargets="CopyFilesToOutputDirectory"
4040
Condition="'$(OutputType.ToLowerInvariant())'=='exe'">
@@ -74,10 +74,6 @@
7474
<Target Name="_StaticWebAssetsBlazorStandalonePublish"
7575
AfterTargets="_StaticWebAssetsComputeFilesToPublish">
7676

77-
<PropertyGroup>
78-
<_BlazorStandalonePublishDir>$([MSBuild]::NormalizeDirectory('$(PublishDir)wwwroot\'))</_BlazorStandalonePublishDir>
79-
</PropertyGroup>
80-
8177
<ItemGroup>
8278

8379
<_CurrentProjectStandalonePublishStaticWebAsset Include="%(StaticWebAsset.FullPath)" Condition="'%(StaticWebAsset.SourceType)' == ''">
@@ -103,7 +99,7 @@
10399

104100
</Target>
105101

106-
<Target Name="_ApplyLinkPreferencesToStaticWebAssets">
102+
<Target Name="_BlazorApplyLinkPreferencesToStaticWebAssets">
107103
<ItemGroup>
108104
<_ContentWithWwrootLinkAttribute Include="@(Content)" Condition="'%(Content.Link)' != '' and $([System.String]::Copy('%(Content.Link)').Replace('\','/').StartsWith('wwwroot/'))" />
109105

src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
<Content Remove="wwwroot\service-worker.js" />
2727
<Content Update="wwwroot\service-worker.published.js" Link="wwwroot\service-worker.js" />
2828
</ItemGroup>
29+
2930
<!--#endif -->
3031
</Project>

0 commit comments

Comments
 (0)