File tree Expand file tree Collapse file tree 2 files changed +3
-13
lines changed Expand file tree Collapse file tree 2 files changed +3
-13
lines changed Original file line number Diff line number Diff line change 11<Project Sdk =" Microsoft.Build.NoTargets" >
22
33 <PropertyGroup >
4- <_IcuDir Condition =" '$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)' != ''" >$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/$(TargetOS)-$(TargetArchitecture)$(_RuntimeVariant)/native</_IcuDir >
5-
64 <_BuildNativeTargetOS >$(TargetOS)</_BuildNativeTargetOS >
75 <_BuildNativeTargetOS Condition =" '$(TargetsLinuxBionic)' == 'true'" >linux-bionic</_BuildNativeTargetOS >
86 </PropertyGroup >
119 <ProjectReference Include =" runtime-prereqs.proj" GlobalPropertiesToRemove =" $(NativeBuildPartitionPropertiesToRemove)" />
1210 </ItemGroup >
1311
14- <ItemGroup Condition =" '$(TargetsAppleMobile)' == 'true'" >
15- <PackageReference Include =" Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets =" all" Version =" $(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty =" true" />
16- </ItemGroup >
17-
1812 <Import Project =" $(RepositoryEngineeringDir)nativepgo.targets" />
1913
2014 <Target Name =" BuildRuntime"
7973 <_CoreClrBuildArg Condition =" '$(ClrDebugSubset)' == 'true'" Include =" -component debug" />
8074 </ItemGroup >
8175
82- <ItemGroup Condition =" '$(TargetsAppleMobile)' == 'true'" >
83- <_CoreClrBuildArg Include =" -cmakeargs -DCMAKE_ICU_DIR=" $(_IcuDir)" " />
84- </ItemGroup >
85-
8676 <ItemGroup Condition =" ('$(TargetsAndroid)' == 'true' or '$(TargetsLinuxBionic)' == 'true') and '$(ANDROID_NDK_ROOT)' != ''" >
8777 <_CoreClrBuildArg Include =" -DCMAKE_TOOLCHAIN_FILE=$(ANDROID_NDK_ROOT)/build/cmake/android.toolchain.cmake" />
8878 <_CoreClrBuildArg Include =" -DANDROID_NDK=$(ANDROID_NDK_ROOT)" />
Original file line number Diff line number Diff line change 1616 <_UsePThreads />
1717 <_UsePThreads Condition =" '$(WasmEnableThreads)' == 'true'" > usepthreads</_UsePThreads >
1818
19- <_IcuDir Condition =" '$(TargetsAppleMobile)' != 'true' and '$( PkgMicrosoft_NETCore_Runtime_ICU_Transport)' != ''" >$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/$(TargetOS)-$(TargetArchitecture)$(_RuntimeVariant)/native</_IcuDir >
19+ <_IcuDir Condition =" '$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)' != ''" >$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/$(TargetOS)-$(TargetArchitecture)$(_RuntimeVariant)/native</_IcuDir >
2020 <_IcuDirArg Condition =" '$(_IcuDir)' != ''" > icudir "$(_IcuDir)"</_IcuDirArg >
2121
2222 <_BuildNativeArgs >$(_BuildNativeArgs)$(_IcuDirArg)$(_UsePThreads)</_BuildNativeArgs >
3232 <_BuildNativeEnvironmentVariables >$(_BuildNativeEnvironmentVariables);WASI_SDK_PATH=$(WASI_SDK_PATH)</_BuildNativeEnvironmentVariables >
3333 </PropertyGroup >
3434
35- <ItemGroup Condition =" '$(TargetsAppleMobile)' == 'true' or '$( TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi'" >
35+ <ItemGroup Condition =" '$(TargetOS)' == 'browser' or '$(TargetOS)' == 'wasi'" >
3636 <PackageReference Include =" Microsoft.NETCore.Runtime.ICU.Transport" PrivateAssets =" all" Version =" $(MicrosoftNETCoreRuntimeICUTransportVersion)" GeneratePathProperty =" true" />
3737 </ItemGroup >
3838
6161 </PropertyGroup >
6262
6363 <ItemGroup >
64- <_IcuArtifacts Condition =" '$(_IcuDir)' != '' and '$(TargetsAppleMobile)' != 'true' "
64+ <_IcuArtifacts Condition =" '$(_IcuDir)' != ''"
6565 Include =" $(_IcuDir)/lib/libicuuc.a;
6666 $(_IcuDir)/lib/libicui18n.a;
6767 $(_IcuDir)/lib/libicudata.a;
You can’t perform that action at this time.
0 commit comments