|
9 | 9 | <PropertyGroup> |
10 | 10 | <BlazorFrameworkStaticWebAssetRoot Condition="'$(BlazorFrameworkStaticWebAssetRoot)' == ''">$(MSBuildThisFileDirectory)..\_framework</BlazorFrameworkStaticWebAssetRoot> |
11 | 11 | <BlazorFrameworkStaticWebAssetDebugRoot Condition="'$(BlazorFrameworkStaticWebAssetDebugRoot)' == ''">$(MSBuildThisFileDirectory)..\_framework\debug</BlazorFrameworkStaticWebAssetDebugRoot> |
| 12 | + |
| 13 | + <_UsingBlazorFrameworkStaticWebAssets Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' OR '$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true'">true</_UsingBlazorFrameworkStaticWebAssets> |
12 | 14 | </PropertyGroup> |
13 | 15 |
|
14 | | - <Target Name="_AddBlazorFrameworkStaticWebAssets" Condition="'$(UsingMicrosoftNETSdkWeb)' == 'true' AND '$(OutputType)' == 'Exe'"> |
| 16 | + <Target Name="_AddBlazorFrameworkStaticWebAssets" Condition="'$(_UsingBlazorFrameworkStaticWebAssets)' == 'true' AND '$(OutputType)' == 'Exe'"> |
15 | 17 | <ItemGroup> |
16 | 18 | <_FrameworkStaticWebAssetCandidate Include="$(BlazorFrameworkStaticWebAssetRoot)\*" /> |
17 | 19 | <_FrameworkStaticWebAssetCandidate |
18 | | - Condition="'$(UseDebugBlazorAssets)' == 'true'" |
| 20 | + Condition="'$(UseBlazorFrameworkDebugAssets)' == 'true'" |
19 | 21 | Include="$(BlazorFrameworkStaticWebAssetDebugRoot)\*" /> |
20 | 22 | <_FrameworkStaticWebAssetCandidate> |
21 | 23 | <RelativePath>_framework\%(FileName)%(Extension)</RelativePath> |
|
26 | 28 | <DefineStaticWebAssets |
27 | 29 | Condition="'@(_FrameworkStaticWebAssetCandidate->Count())' != '0'" |
28 | 30 | CandidateAssets="@(_FrameworkStaticWebAssetCandidate)" |
29 | | - SourceId="$(PackageId)" |
| 31 | + SourceId="Microsoft.AspNetCore.App.Internal.Assets" |
30 | 32 | SourceType="Discovered" |
31 | 33 | AssetKind="All" |
32 | 34 | FingerprintCandidates="true" |
|
37 | 39 | <DefineStaticWebAssetEndpoints |
38 | 40 | Condition="'@(_FrameworkStaticWebAsset)' != ''" |
39 | 41 | CandidateAssets="@(_FrameworkStaticWebAsset)" |
40 | | - ExistingEndpoints="@()" |
| 42 | + ExistingEndpoints="" |
41 | 43 | ContentTypeMappings="@(StaticWebAssetContentTypeMapping)"> |
42 | 44 | <Output TaskParameter="Endpoints" ItemName="_FrameworkStaticAssetEndpoint" /> |
43 | 45 | </DefineStaticWebAssetEndpoints> |
|
0 commit comments