Skip to content

Commit ea36184

Browse files
committed
update the targets for the new condition
1 parent 4b6eb58 commit ea36184

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<Project>
2-
<PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='true' AND '$(RunAOTCompilation)' == 'true'">
2+
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
3+
<UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='false'" >true</UsingBrowserRuntimeWorkload>
4+
<UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload)</UsingBrowserRuntimeWorkload>
5+
</PropertyGroup>
6+
<PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='true' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
7+
<WasmGenerateAppBundle>false</WasmGenerateAppBundle>
38
<UsingBlazorAOTWorkloadManifest>true</UsingBlazorAOTWorkloadManifest>
49
</PropertyGroup>
510

6-
<ImportGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='true' AND '$(RunAOTCompilation)' == 'true'">
7-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task" />
11+
<ImportGroup Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'">
12+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Condition="'$(RunAOTCompilation)' == 'true'" />
813
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk" />
914
<Import Project="Sdk.props" Sdk="Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm" />
10-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
15+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" Condition="!$([MSBuild]::IsOSPlatform('linux'))" />
1116
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node" />
1217
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk" />
1318
</ImportGroup>

0 commit comments

Comments
 (0)