|
1 | 1 | <Project> |
2 | 2 | <Import Project="$(RepositoryEngineeringDir)AcquireEmscriptenSdk.targets" /> |
3 | 3 |
|
4 | | - <ItemGroup> |
| 4 | + <!-- These packages provide ICU and timezone data paths for the native build (CMake). |
| 5 | + Skip them during app-level relink (IsBrowserWasmProject) since the runtime pack |
| 6 | + already includes the pre-built native files, and the NuGet contentFiles (timezone |
| 7 | + data, READMEs) would pollute the app's Content items causing VFS/StaticWebAssets |
| 8 | + validation failures. --> |
| 9 | + <ItemGroup Condition="'$(IsBrowserWasmProject)' != 'true'"> |
5 | 10 | <PackageReference Condition="'$(TargetsWasm)' == 'true'" Include="Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets="all" Version="$(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty="true" /> |
6 | 11 | <PackageReference Condition="'$(TargetsWasm)' == 'true'" Include="System.Runtime.TimeZoneData" PrivateAssets="all" Version="$(SystemRuntimeTimeZoneDataVersion)" GeneratePathProperty="true" /> |
7 | 12 | </ItemGroup> |
8 | 13 |
|
9 | 14 | <PropertyGroup> |
10 | 15 | <_RuntimeVariant /> |
11 | 16 | <_RuntimeVariant Condition="'$(WasmEnableThreads)' == 'true'">-threads</_RuntimeVariant> |
| 17 | + <FeatureMultithreading Condition="('$(TargetsBrowser)' != 'true' and '$(TargetsWasi)' != 'true') or '$(WasmEnableThreads)' == 'true'">true</FeatureMultithreading> |
12 | 18 |
|
13 | 19 | <_IcuDir Condition="'$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)' != '' and '$(TargetsWasm)' == 'true'">$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/$(TargetOS)-$(TargetArchitecture)$(_RuntimeVariant)/native</_IcuDir> |
14 | 20 | <_TzdDir Condition="'$(PkgSystem_Runtime_TimeZoneData)' != '' and '$(TargetsWasm)' == 'true'">$([MSBuild]::NormalizePath('$(PkgSystem_Runtime_TimeZoneData)', 'contentFiles', 'any', 'any', 'data'))</_TzdDir> |
|
33 | 39 | <NativeCMakeArg Include="-cmakeargs "-DFEATURE_PERFTRACING_DISABLE_PERFTRACING_LISTEN_PORTS=1"" /> |
34 | 40 | <NativeCMakeArg Include="-cmakeargs "-DFEATURE_PERFTRACING_DISABLE_DEFAULT_LISTEN_PORT=1"" /> |
35 | 41 | </ItemGroup> |
36 | | - <ItemGroup Condition="'$(TargetsBrowser)' == 'true' and '$(RuntimeFlavor)' == 'CoreCLR' and '$(WasmEnableThreads)' != 'true'"> |
| 42 | + <ItemGroup Condition="'$(FeatureMultithreading)' != 'true'"> |
37 | 43 | <NativeCMakeArg Include="-cmakeargs "-DFEATURE_PERFTRACING_DISABLE_THREADS=1"" /> |
38 | | - <NativeCMakeArg Include="-cmakeargs "-DFEATURE_SINGLE_THREADED=1"" /> |
39 | 44 | </ItemGroup> |
40 | | - <!-- TODO-WASM - https://github.com/dotnet/runtime/issues/68162 |
41 | | - <ItemGroup Condition="'$(WasmEnableThreads)' == 'true'"> |
42 | | - -sUSE_PTHREADS=1 |
43 | | - -sPTHREAD_POOL_SIZE=0 |
44 | | - -sPTHREAD_POOL_SIZE_STRICT=0 |
45 | | - -Wno-pthreads-mem-growth |
| 45 | + <ItemGroup Condition="'$(FeatureMultithreading)' == 'true'"> |
| 46 | + <NativeCMakeArg Include="-cmakeargs "-DFEATURE_MULTITHREADING=1"" /> |
| 47 | + <!-- TODO-WASM - https://github.com/dotnet/runtime/issues/68162 |
| 48 | + -sUSE_PTHREADS=1 |
| 49 | + -sPTHREAD_POOL_SIZE=0 |
| 50 | + -sPTHREAD_POOL_SIZE_STRICT=0 |
| 51 | + -Wno-pthreads-mem-growth |
| 52 | + --> |
46 | 53 | </ItemGroup> |
47 | | - --> |
48 | 54 |
|
49 | 55 | <Target Name="GenerateEmccExports" Condition="'$(TargetsBrowser)' == 'true'"> |
50 | 56 | <ItemGroup> |
|
0 commit comments