Support loading ICU data from managed Interop

src/libraries/Common/src/Interop/Interop.ICU.cs

@@ -12,6 +12,9 @@ internal static partial class Globalization
         [DllImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_LoadICU")]
         internal static extern int LoadICU();
 
+        [DllImport(Libraries.GlobalizationNative, EntryPoint = "GlobalizationNative_LoadICUData")]
+        internal static extern int LoadICUData(string? path);
+
         internal static void InitICUFunctions(IntPtr icuuc, IntPtr icuin, ReadOnlySpan<char> version, ReadOnlySpan<char> suffix)
         {
             Debug.Assert(icuuc != IntPtr.Zero);

src/libraries/Native/Unix/System.Globalization.Native/entrypoints.c

@@ -49,6 +49,9 @@ static const Entry s_globalizationNative[] =
     DllImportEntry(GlobalizationNative_IsPredefinedLocale)
     DllImportEntry(GlobalizationNative_LastIndexOf)
     DllImportEntry(GlobalizationNative_LoadICU)
+#if defined(STATIC_ICU)
+    DllImportEntry(GlobalizationNative_LoadICUData)
+#endif
     DllImportEntry(GlobalizationNative_NormalizeString)
     DllImportEntry(GlobalizationNative_StartsWith)
     DllImportEntry(GlobalizationNative_ToAscii)

src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.h

@@ -11,7 +11,7 @@ PALEXPORT int32_t GlobalizationNative_GetICUVersion(void);
 
 #if defined(STATIC_ICU)
 
-PALEXPORT int32_t GlobalizationNative_LoadICUData(char* path);
+PALEXPORT int32_t GlobalizationNative_LoadICUData(const char* path);
 
 PALEXPORT const char* GlobalizationNative_GetICUDTName(const char* culture);
 

src/libraries/Native/Unix/System.Globalization.Native/pal_icushim_static.c

@@ -89,7 +89,7 @@ static int32_t load_icu_data(void* pData)
     }
 }
 
-int32_t GlobalizationNative_LoadICUData(char* path)
+int32_t GlobalizationNative_LoadICUData(const char* path)
 {
     int32_t ret = -1;
     char* icu_data;
@@ -127,7 +127,12 @@ int32_t GlobalizationNative_LoadICUData(char* path)
 
     fclose (fp);
 
-    return load_icu_data (icu_data);
+    if (load_icu_data (icu_data) == 0) {
+        fprintf (stderr, "ICU BAD EXIT %d.", ret);
+        return ret;
+    }
+
+    return GlobalizationNative_LoadICU ();
 }
 
 const char* GlobalizationNative_GetICUDTName(const char* culture)

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

@@ -1838,6 +1838,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Unix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureInfo.Unix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\GlobalizationMode.Unix.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\GlobalizationMode.LoadICU.Unix.cs" Condition="'$(TargetsMacCatalyst)' != 'true' and '$(TargetsiOS)' != 'true' and '$(TargetstvOS)' != 'true'" />
+    <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\GlobalizationMode.LoadICU.iOS.cs" Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.Unix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Guid.Unix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStreamHelpers.Unix.cs" />

src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.LoadICU.Unix.cs

@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Globalization
+{
+    internal static partial class GlobalizationMode
+    {
+        private static int LoadICUCore()
+        {
+            return Interop.Globalization.LoadICU();
+        }
+    }
+}

src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.LoadICU.iOS.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace System.Globalization
+{
+    internal static partial class GlobalizationMode
+    {
+        private static int LoadICUCore()
+        {
+            object? datPath = AppContext.GetData("ICU_DAT_FILE_PATH");
+            return (datPath != null) ? Interop.Globalization.LoadICUData(datPath.ToString()) : Interop.Globalization.LoadICU();
+        }
+    }
+}

src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.Unix.cs

@@ -22,7 +22,7 @@ private static bool GetGlobalizationInvariantMode()
                 }
                 else
                 {
-                    int loaded = Interop.Globalization.LoadICU();
+                    int loaded = LoadICUCore();
                     if (loaded == 0 && !OperatingSystem.IsBrowser())
                     {
                         // This can't go into resources, because a resource lookup requires globalization, which requires ICU

src/mono/mono/mini/CMakeLists.txt

@@ -50,6 +50,7 @@ if(HAVE_SYS_ICU)
   if(STATIC_ICU)
     set(pal_icushim_sources_base
         pal_icushim_static.c)
+    add_definitions(-DSTATIC_ICU=1)
   else()
     set(pal_icushim_sources_base
         pal_icushim.c)

src/tasks/AppleAppBuilder/AppleAppBuilder.cs

@@ -182,7 +182,7 @@ public override bool Execute()
 
         if (GenerateXcodeProject)
         {
-            Xcode generator = new Xcode(TargetOS);
+            Xcode generator = new Xcode(TargetOS, Arch);
             generator.EnableRuntimeLogging = EnableRuntimeLogging;
 
             XcodeProjectPath = generator.GenerateXCode(ProjectName, MainLibraryFileName, assemblerFiles,

src/tasks/AppleAppBuilder/Templates/runtime.m

@@ -24,6 +24,8 @@
 #define MONO_ENTER_GC_UNSAFE
 #define MONO_EXIT_GC_UNSAFE
 
+#define APPLE_RUNTIME_IDENTIFIER "//%APPLE_RUNTIME_IDENTIFIER%"
+
 const char *
 get_bundle_path (void)
 {
@@ -237,16 +239,6 @@ static int32_t load_icu_data ()
     setenv ("MONO_LOG_MASK", "all", TRUE);
 #endif
 
-#if !INVARIANT_GLOBALIZATION
-    int32_t ret = load_icu_data ();
-
-    if (ret == 0) {
-        os_log_info (OS_LOG_DEFAULT, "ICU BAD EXIT %d.", ret);
-        exit (ret);
-        return;
-    }
-#endif
-
     id args_array = [[NSProcessInfo processInfo] arguments];
     assert ([args_array count] <= 128);
     const char *managed_argv [128];
@@ -261,8 +253,29 @@ static int32_t load_icu_data ()
     const char* bundle = get_bundle_path ();
     chdir (bundle);
 
+    char icu_dat_path[1024];
+    int res;
+
+    res = snprintf (icu_dat_path, sizeof (icu_dat_path) - 1, "%s/%s", bundle, "icudt.dat");
+    assert (res > 0);
+
     // TODO: set TRUSTED_PLATFORM_ASSEMBLIES, APP_PATHS and NATIVE_DLL_SEARCH_DIRECTORIES
-    monovm_initialize(0, NULL, NULL);
+    const char *appctx_keys[] = {
+        "RUNTIME_IDENTIFIER", 
+    #ifndef INVARIANT_GLOBALIZATION
+        "ICU_DAT_FILE_PATH",
+    #endif
+        "APP_CONTEXT_BASE_DIRECTORY"
+    };
+    const char *appctx_values [] = {
+        APPLE_RUNTIME_IDENTIFIER,
+    #ifndef INVARIANT_GLOBALIZATION
+        icu_dat_path,
+    #endif
+        bundle
+    };
+
+    monovm_initialize(sizeof (appctx_keys) / sizeof (appctx_keys [0]), appctx_keys, appctx_values);
 
 #if FORCE_INTERPRETER
     os_log_info (OS_LOG_DEFAULT, "INTERP Enabled");
@@ -300,7 +313,7 @@ static int32_t load_icu_data ()
     assert (assembly);
     os_log_info (OS_LOG_DEFAULT, "Executable: %{public}s", executable);
 
-    int res = mono_jit_exec (mono_domain_get (), assembly, argi, managed_argv);
+    res = mono_jit_exec (mono_domain_get (), assembly, argi, managed_argv);
     // Print this so apps parsing logs can detect when we exited
     os_log_info (OS_LOG_DEFAULT, "Exit code: %d.", res);
 

src/tasks/AppleAppBuilder/Xcode.cs

@@ -9,10 +9,11 @@
 
 internal class Xcode
 {
+    private string RuntimeIdentifier { get; set; }
     private string SysRoot { get; set; }
     private string Target { get; set; }
 
-    public Xcode(string target)
+    public Xcode(string target, string arch)
     {
         Target = target;
         switch (Target)
@@ -27,6 +28,8 @@ public Xcode(string target)
                 SysRoot = Utils.RunProcess("xcrun", "--sdk macosx --show-sdk-path");
                 break;
         }
+
+        RuntimeIdentifier = $"{Target}-{arch}";
     }
 
     public bool EnableRuntimeLogging { get; set; }
@@ -175,6 +178,7 @@ public string GenerateXCode(
         File.WriteAllText(Path.Combine(binDir, "runtime.m"),
             Utils.GetEmbeddedResource("runtime.m")
                 .Replace("//%DllMap%", dllMap.ToString())
+                .Replace("//%APPLE_RUNTIME_IDENTIFIER%", RuntimeIdentifier)
                 .Replace("%EntryPointLibName%", Path.GetFileName(entryPointLib)));
 
         Utils.RunProcess("cmake", cmakeArgs.ToString(), workingDir: binDir);