Allow the icu native code to be linked out when invariant globalizati…

…on is enabled. (#48120)

* Disable the dynamic loading of icu functions on WASM.

* Preserve GetICUVersion using a DynamicDependency attribute so its only preserved for the tests which need it.

* Add GetICUVersion to .LibraryBuild.xml so its retained during the class libs build.

* Set InvariantGlobalization based on WasmInvariantGlobalization.

* Fix the framework build.

* Avoid linking in the libicu libraries on wasm in invariant mode.

* Move ICU tests dependency to libraries build descriptor file

* Hook up the shared file in the build

* Fix conditionals.

* Remove WasmInvariantGlobalization msbuild variable.

Co-authored-by: Marek Safar <marek.safar@gmail.com>

src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml

@@ -1,9 +1,5 @@
 <linker>
  <assembly fullname="System.Private.CoreLib">
- <type fullname="Interop/Globalization">
- <!-- Internal API used by tests only. -->
- <method name="GetICUVersion" />
- </type>
  <type fullname="System.Threading.ThreadPoolBoundHandle">
  <!-- Workaround to keep .interfaceimpl even though this type
  is not instantiated on unix:

src/libraries/System.Private.CoreLib/src/ILLink/ILLinkTrim_LibraryBuild.xml

@@ -0,0 +1,8 @@
+<linker>
+ <assembly fullname="System.Private.CoreLib">
+ <type fullname="Interop/Globalization">
+ <!-- Internal API used by tests only. -->
+ <method name="GetICUVersion" />
+ </type>
+ </assembly>
+</linker>

src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

@@ -41,6 +41,9 @@
  <ILLinkSubstitutionsXmls Include="$(ILLinkSharedDirectory)ILLink.Substitutions.NoX86Intrinsics.xml" Condition="'$(SupportsX86Intrinsics)' != 'true'" />
  <ILLinkLinkAttributesXmls Include="$(ILLinkSharedDirectory)ILLink.LinkAttributes.Shared.xml" />
  </ItemGroup>
+ <PropertyGroup>
+ <ILLinkTrimXmlLibraryBuild>$(ILLinkSharedDirectory)ILLinkTrim_LibraryBuild.xml</ILLinkTrimXmlLibraryBuild>
+ </PropertyGroup>
  <ItemGroup>
  <Compile Include="$(MSBuildThisFileDirectory)Internal\AssemblyAttributes.cs" />
  <Compile Include="$(MSBuildThisFileDirectory)Internal\Console.cs" />

src/mono/CMakeLists.txt

@@ -216,6 +216,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
  # FIXME: Rest of the flags from configure.ac
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
  set(HOST_BROWSER 1)
+ add_definitions(-DNO_GLOBALIZATION_SHIM)
  add_definitions(-D_THREAD_SAFE)
  set(DISABLE_EXECUTABLES 1)
  # FIXME: Is there a cmake option for this ?

src/mono/wasm/build/WasmApp.targets

@@ -23,7 +23,7 @@
  - $(WasmProfilers) - Profilers to use
  - $(AOTMode) - Defaults to `LLVMOnly`
  - $(AOTProfilePath) - profile data file to be used for profile-guided optimization
- - $(WasmInvariantGlobalization)
+ - $(InvariantGlobalization) - Whenever to disable ICU. Defaults to false.
 
  - $(WasmResolveAssembliesBeforeBuild) - Resolve the assembly dependencies. Defaults to false
  - $(WasmAssemblySearchPaths) - used for resolving assembly dependencies
@@ -156,7 +156,7 @@
  <Error Condition="'$(WasmMainJSPath)' == ''" Text="%24(WasmMainJSPath) property needs to be set" />
 
  <PropertyGroup>
- <WasmIcuDataFileName Condition="'$(WasmInvariantGlobalization)' != 'true'">icudt.dat</WasmIcuDataFileName>
+ <WasmIcuDataFileName Condition="'$(InvariantGlobalization)' != 'true'">icudt.dat</WasmIcuDataFileName>
 
  <_HasDotnetWasm Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.wasm'">true</_HasDotnetWasm>
  <_HasDotnetJs Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.js'">true</_HasDotnetJs>
@@ -167,15 +167,15 @@
  <WasmNativeAsset Include="$(MicrosoftNetCoreAppRuntimePackRidDir)native\dotnet.wasm" Condition="'$(_HasDotnetWasm)' != 'true'" />
  <WasmNativeAsset Include="$(MicrosoftNetCoreAppRuntimePackRidDir)native\dotnet.js" Condition="'$(_HasDotnetJs)' != 'true'" />
 
- <WasmNativeAsset Include="$(MicrosoftNetCoreAppRuntimePackRidDir)native\$(WasmIcuDataFileName)" Condition="'$(WasmInvariantGlobalization)' != 'true'" />
+ <WasmNativeAsset Include="$(MicrosoftNetCoreAppRuntimePackRidDir)native\$(WasmIcuDataFileName)" Condition="'$(InvariantGlobalization)' != 'true'" />
  <WasmNativeAsset Include="$(MicrosoftNetCoreAppRuntimePackRidDir)native\dotnet.timezones.blat" />
  </ItemGroup>
 
  <WasmAppBuilder
  AppDir="$(WasmAppDir)"
  MainJS="$(WasmMainJSPath)"
  Assemblies="@(_WasmAssemblies)"
- InvariantGlobalization="$(WasmInvariantGlobalization)"
+ InvariantGlobalization="$(InvariantGlobalization)"
  SatelliteAssemblies="@(WasmSatelliteAssemblies)"
  FilesToIncludeInFileSystem="@(WasmFilesToIncludeInFileSystem)"
  IcuDataFileName="$(WasmIcuDataFileName)"
@@ -250,8 +250,8 @@
  <_WasmRuntimePackNativeLibs Include="libSystem.Native.a"/>
  <_WasmRuntimePackNativeLibs Include="libSystem.IO.Compression.Native.a"/>
  <_WasmRuntimePackNativeLibs Include="libmono-profiler-aot.a"/>
- <_WasmRuntimePackNativeLibs Include="libicuuc.a"/>
- <_WasmRuntimePackNativeLibs Include="libicui18n.a"/>
+ <_WasmRuntimePackNativeLibs Include="libicuuc.a" Condition="'$(InvariantGlobalization)' != 'true'" />
+ <_WasmRuntimePackNativeLibs Include="libicui18n.a" Condition="'$(InvariantGlobalization)' != 'true'" />
  <_WasmObjects Include="@(_WasmRuntimePackNativeLibs->'$(MicrosoftNetCoreAppRuntimePackRidDir)\native\%(FileName)%(Extension)')" />
 
  <_WasmObjects Include="$(_WasmIntermediateOutputPath)driver.o"/>