Remove System.Globalization.Native shim from shared framework

eng/pipelines/runtime.yml

@@ -78,6 +78,8 @@ jobs:
     - subset: mono
       include:
       - src/libraries/System.Private.CoreLib/*
+      - src/libraries/Native/Unix/System.Globalization.Native/*
+      - src/libraries/Native/Unix/Common/*
       exclude:
       - eng/Version.Details.xml
       - '*.md'

src/coreclr/src/System.Private.CoreLib/PinvokeAnalyzerExceptionList.analyzerdata

@@ -7,41 +7,4 @@ user32.dll!GetProcessWindowStation
 user32.dll!GetUserObjectInformationW
 
 <!-- GetGeoInfo is supported by the analyzer complain for not using GetGeoInfoW instead and we need to keep the style of not using 'W' in the names -->
-kernel32.dll!GetGeoInfo
-
-<!-- PInvokes to System.Globalization.Native shim -->
-libSystem.Globalization.Native!GlobalizationNative_ChangeCase
-libSystem.Globalization.Native!GlobalizationNative_ChangeCaseInvariant
-libSystem.Globalization.Native!GlobalizationNative_ChangeCaseTurkish
-libSystem.Globalization.Native!GlobalizationNative_CloseSortHandle
-libSystem.Globalization.Native!GlobalizationNative_CompareString
-libSystem.Globalization.Native!GlobalizationNative_CompareStringOrdinalIgnoreCase
-libSystem.Globalization.Native!GlobalizationNative_EndsWith
-libSystem.Globalization.Native!GlobalizationNative_EnumCalendarInfo
-libSystem.Globalization.Native!GlobalizationNative_GetCalendarInfo
-libSystem.Globalization.Native!GlobalizationNative_GetCalendars
-libSystem.Globalization.Native!GlobalizationNative_GetDefaultLocaleName
-libSystem.Globalization.Native!GlobalizationNative_GetICUVersion
-libSystem.Globalization.Native!GlobalizationNative_GetJapaneseEraStartDate
-libSystem.Globalization.Native!GlobalizationNative_GetLatestJapaneseEra
-libSystem.Globalization.Native!GlobalizationNative_GetLocaleInfoGroupingSizes
-libSystem.Globalization.Native!GlobalizationNative_GetLocaleInfoInt
-libSystem.Globalization.Native!GlobalizationNative_GetLocaleInfoString
-libSystem.Globalization.Native!GlobalizationNative_GetLocaleName
-libSystem.Globalization.Native!GlobalizationNative_GetLocales
-libSystem.Globalization.Native!GlobalizationNative_GetLocaleTimeFormat
-libSystem.Globalization.Native!GlobalizationNative_GetSortHandle
-libSystem.Globalization.Native!GlobalizationNative_GetSortKey
-libSystem.Globalization.Native!GlobalizationNative_GetSortVersion
-libSystem.Globalization.Native!GlobalizationNative_GetTimeZoneDisplayName
-libSystem.Globalization.Native!GlobalizationNative_IndexOf
-libSystem.Globalization.Native!GlobalizationNative_IndexOfOrdinalIgnoreCase
-libSystem.Globalization.Native!GlobalizationNative_InitICUFunctions
-libSystem.Globalization.Native!GlobalizationNative_IsNormalized
-libSystem.Globalization.Native!GlobalizationNative_IsPredefinedLocale
-libSystem.Globalization.Native!GlobalizationNative_LastIndexOf
-libSystem.Globalization.Native!GlobalizationNative_LoadICU
-libSystem.Globalization.Native!GlobalizationNative_NormalizeString
-libSystem.Globalization.Native!GlobalizationNative_StartsWith
-libSystem.Globalization.Native!GlobalizationNative_ToAscii
-libSystem.Globalization.Native!GlobalizationNative_ToUnicode
+kernel32.dll!GetGeoInfo

src/coreclr/src/vm/dllimport.cpp

@@ -4797,7 +4797,7 @@ void NDirect::PopulateNDirectMethodDesc(NDirectMethodDesc* pNMD, PInvokeStaticSi
     if (callConv == pmCallConvThiscall)
         ndirectflags |= NDirectMethodDesc::kThisCall;
 
-    if (pNMD->GetLoaderModule()->IsSystem() && (strcmp(szLibName, "QCall") == 0 || strcmp(szLibName, "libSystem.Globalization.Native") == 0))
+    if (pNMD->GetLoaderModule()->IsSystem() && strcmp(szLibName, "QCall") == 0)
     {
         ndirectflags |= NDirectMethodDesc::kIsQCall;
     }

src/installer/pkg/projects/netcoreapp/pkg/Directory.Build.props

@@ -14,7 +14,6 @@
 
   <ItemGroup>
     <!-- UNIX -->
-    <SingleFileHostIncludeFilename Include="libSystem.Globalization.Native.so" />
     <SingleFileHostIncludeFilename Include="libSystem.IO.Compression.Native.so" />
     <SingleFileHostIncludeFilename Include="libSystem.IO.Ports.Native.so" />
     <SingleFileHostIncludeFilename Include="libSystem.Native.so" />
@@ -24,7 +23,6 @@
     <SingleFileHostIncludeFilename Include="libcoreclr.so" />
 
     <!-- OSX -->
-    <SingleFileHostIncludeFilename Include="libSystem.Globalization.Native.dylib" />
     <SingleFileHostIncludeFilename Include="libSystem.IO.Compression.Native.dylib" />
     <SingleFileHostIncludeFilename Include="libSystem.IO.Ports.Native.dylib" />
     <SingleFileHostIncludeFilename Include="libSystem.Native.dylib" />

src/libraries/Common/src/Interop/Interop.Libraries.cs

@@ -9,7 +9,7 @@ internal static partial class Libraries
 #if MONO
         internal const string GlobalizationNative = "__Internal";
 #else
-        internal const string GlobalizationNative = "libSystem.Globalization.Native";
+        internal const string GlobalizationNative = "QCall";
 #endif
     }
 }

src/libraries/Native/Unix/CMakeLists.txt

@@ -203,22 +203,18 @@ if(CLR_CMAKE_TARGET_BROWSER)
     # skip for now
 elseif(CLR_CMAKE_TARGET_IOS)
     add_subdirectory(System.Net.Security.Native)
-    #add_subdirectory(System.Globalization.Native) # TODO: reenable
     # System.Security.Cryptography.Native is intentionally disabled on iOS
     # it is only used for interacting with OpenSSL which isn't useful there
 elseif(CLR_CMAKE_TARGET_TVOS)
     #add_subdirectory(System.Net.Security.Native) # no gssapi on tvOS, see https://developer.apple.com/documentation/gss
-    #add_subdirectory(System.Globalization.Native) # TODO: reenable
     # System.Security.Cryptography.Native is intentionally disabled on tvOS
     # it is only used for interacting with OpenSSL which isn't useful there
 elseif(CLR_CMAKE_TARGET_ANDROID AND NOT CROSS_ROOTFS)
-    add_subdirectory(System.Globalization.Native)
     #add_subdirectory(System.Net.Security.Native) # TODO: reenable
     if (NOT "$ENV{ANDROID_OPENSSL_AAR}" STREQUAL "")
         add_subdirectory(System.Security.Cryptography.Native)
     endif()
 else()
-    add_subdirectory(System.Globalization.Native)
     add_subdirectory(System.Net.Security.Native)
     add_subdirectory(System.Security.Cryptography.Native)
 endif()