Skip to content

Commit 2a4195b

Browse files
authored
[wasm] Update list of properties to trigger need for workload (#50239)
2 parents 0003287 + 1b2d6ff commit 2a4195b

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

src/Workloads/Manifests/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.targets.in

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,21 @@
4646
<Import Project="$(MSBuildThisFileDirectory)WasmFeatures.props" Condition="'$(RuntimeIdentifier)' == 'browser-wasm' or '$(RuntimeIdentifier)' == 'wasi-wasm'" />
4747

4848
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
49-
<!-- Keep in sync with WasmApp.Native.targets -->
50-
<_WasmPropertiesDifferFromRuntimePackThusNativeBuildNeeded Condition="
49+
<!-- Keep in sync with $(PropertiesThatTriggerRelinking) -->
50+
<_WasmNativeWorkloadNeeded Condition="
5151
'$(WasmEnableSIMD)' == 'false' or
5252
'$(WasmEnableExceptionHandling)' == 'false' or
5353
'$(InvariantTimezone)' == 'true' or
54-
('$(_UsingBlazorOrWasmSdk)' != 'true' and '$(InvariantGlobalization)' == 'true') or
55-
'$(WasmNativeStrip)' == 'false'">true</_WasmPropertiesDifferFromRuntimePackThusNativeBuildNeeded>
56-
57-
<!-- $(WasmBuildNative)==true is needed to enable workloads, when using native references, without AOT -->
58-
<!-- FIXME: is the blazor condition here correct? -->
59-
<_WasmNativeWorkloadNeeded Condition="
60-
'$(_WasmPropertiesDifferFromRuntimePackThusNativeBuildNeeded)' == 'true' or
54+
'$(WasmNativeStrip)' == 'false' or
55+
'$(WasmNativeDebugSymbols)' == 'true' or
56+
'$(WasmSingleFileBundle)' == 'false' or
57+
'$(EnableDiagnostics)' == 'true' or
58+
'$(WasmProfilers)' != '' or
6159
'$(RunAOTCompilation)' == 'true' or
6260
'$(WasmBuildNative)' == 'true' or
6361
'$(WasmGenerateAppBundle)' == 'true' or
6462
'$(_UsingBlazorOrWasmSdk)' != 'true' or
63+
'$(EmccInitialHeapSize)' != '' or
6564
'$(EmccMaximumHeapSize)' != '' " >true</_WasmNativeWorkloadNeeded>
6665

6766
<UsingBrowserRuntimeWorkload Condition="'$(_BrowserWorkloadNotSupportedForTFM)' == 'true'">false</UsingBrowserRuntimeWorkload>

0 commit comments

Comments
 (0)