Skip to content

Commit 7b6fc53

Browse files
committed
Fix Blazor WebAssembly standalone
1 parent fa5f52d commit 7b6fc53

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/Assets/build/Microsoft.AspNetCore.App.Internal.Assets.targets

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
<PropertyGroup>
1010
<BlazorFrameworkStaticWebAssetRoot Condition="'$(BlazorFrameworkStaticWebAssetRoot)' == ''">$(MSBuildThisFileDirectory)..\_framework</BlazorFrameworkStaticWebAssetRoot>
1111
<BlazorFrameworkStaticWebAssetDebugRoot Condition="'$(BlazorFrameworkStaticWebAssetDebugRoot)' == ''">$(MSBuildThisFileDirectory)..\_framework\debug</BlazorFrameworkStaticWebAssetDebugRoot>
12+
13+
<_UsingBlazorFrameworkStaticWebAssets Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' OR '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">true</_UsingBlazorFrameworkStaticWebAssets>
1214
</PropertyGroup>
1315

14-
<Target Name="_AddBlazorFrameworkStaticWebAssets" Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(OutputType)' == 'Exe'">
16+
<Target Name="_AddBlazorFrameworkStaticWebAssets" Condition="'$(_UsingBlazorFrameworkStaticWebAssets)' == 'true' AND '$(OutputType)' == 'Exe'">
1517
<ItemGroup>
1618
<_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\*" />
1719
<_FrameworkStaticWebAssetCandidate
18-
Condition="'$(UseDebugBlazorAssets)' == 'true'"
20+
Condition="'$(UseBlazorFrameworkDebugAssets)' == 'true'"
1921
Include="$(BlazorFrameworkStaticWebAssetDebugRoot)\*" />
2022
<_FrameworkStaticWebAssetCandidate>
2123
<RelativePath>_framework\%(FileName)%(Extension)</RelativePath>
@@ -26,7 +28,7 @@
2628
<DefineStaticWebAssets
2729
Condition="'@(_FrameworkStaticWebAssetCandidate->Count())' != '0'"
2830
CandidateAssets="@(_FrameworkStaticWebAssetCandidate)"
29-
SourceId="$(PackageId)"
31+
SourceId="Microsoft.AspNetCore.App.Internal.Assets"
3032
SourceType="Discovered"
3133
AssetKind="All"
3234
FingerprintCandidates="true"
@@ -37,7 +39,7 @@
3739
<DefineStaticWebAssetEndpoints
3840
Condition="'@(_FrameworkStaticWebAsset)' != ''"
3941
CandidateAssets="@(_FrameworkStaticWebAsset)"
40-
ExistingEndpoints="@()"
42+
ExistingEndpoints=""
4143
ContentTypeMappings="@(StaticWebAssetContentTypeMapping)">
4244
<Output TaskParameter="Endpoints" ItemName="_FrameworkStaticAssetEndpoint" />
4345
</DefineStaticWebAssetEndpoints>

0 commit comments

Comments
 (0)