[wasm] Reenable the managed collation code, link it out by default, add a packager option to enable it. (#19570)

* [wasm] Reenable the managed collation code, link it out by default, add a packager option to enable it.

* Disable some xunit tests which fail because the test runner can't handle the [SkipOnTargetFramework(TargetFrameworkMonikers.Mono)] attribute.

* [csproj] Update project files

Co-authored-by: monojenkins <jo.shields+jenkins@xamarin.com>

4 files changed, 22 insertions, 30 deletions

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 367b5362b65..c4ed77359a7 100644
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -74,10 +74,6 @@ RESOURCE_STRINGS_FILES = --mscorlib-debug
 RESOURCE_STRINGS = ../referencesource/mscorlib/mscorlib.txt
 MODULE_DEPS = $(IL_REPLACE) LinkerDescriptor/mscorlib.xml
 
-
-ifdef WASM
-MANAGED_COLLATOR_RESOURCES_FILES =
-else
 MANAGED_COLLATOR_RESOURCES_FILES = \
 	resources/collation.core.bin \
 	resources/collation.tailoring.bin \
@@ -86,7 +82,6 @@ MANAGED_COLLATOR_RESOURCES_FILES = \
 	resources/collation.cjkJA.bin \
 	resources/collation.cjkKO.bin \
 	resources/collation.cjkKOlv2.bin
-endif
 
 ifdef MCS_MODE
 	UNICODECHARINFO = resources/charinfo.nlp
diff --git a/mcs/class/corlib/ReferenceSources/CompareInfo.cs b/mcs/class/corlib/ReferenceSources/CompareInfo.cs
index 58b009dade9..92a1ed62771 100644
--- a/mcs/class/corlib/ReferenceSources/CompareInfo.cs
+++ b/mcs/class/corlib/ReferenceSources/CompareInfo.cs
@@ -72,9 +72,6 @@ namespace System.Globalization
 		static bool managedCollation;
 		static bool managedCollationChecked;
 
-#if WASM
-		const bool UseManagedCollation = false;
-#else
 		static bool UseManagedCollation {
 			get {
 				if (!managedCollationChecked) {
@@ -85,13 +82,9 @@ namespace System.Globalization
 				return managedCollation;
 			}
 		}
-#endif
 
 		ISimpleCollator GetCollator ()
 		{
-#if WASM
-			return null;
-#else
 			if (collator != null)
 				return collator;
 
@@ -107,7 +100,6 @@ namespace System.Globalization
 			}
 
 			return collator;
-#endif
 		}
 
 		SortKey CreateSortKeyCore (string source, CompareOptions options)
diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index ab4310c65b8..833f01db5fc 100644
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -1301,6 +1301,7 @@
     <Compile Include="Mono.Globalization.Unicode\MSCompatUnicodeTableUtil.cs" />
     <Compile Include="Mono.Globalization.Unicode\Normalization.cs" />
     <Compile Include="Mono.Globalization.Unicode\NormalizationTableUtil.cs" />
+    <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
     <Compile Include="Mono.Globalization.Unicode\SortKey.cs" />
     <Compile Include="Mono.Globalization.Unicode\SortKeyBuffer.cs" />
     <Compile Include="Mono.Security.Cryptography\DSAManaged.cs" />
@@ -1986,7 +1987,6 @@
         <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-        <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
         <Compile Include="Mono.Interop\ComInteropProxy.cs" />
         <Compile Include="Mono.Interop\IDispatch.cs" />
         <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -2266,7 +2266,6 @@
         <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-        <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
         <Compile Include="Mono.Interop\ComInteropProxy.cs" />
         <Compile Include="Mono.Interop\IDispatch.cs" />
         <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -2600,7 +2599,6 @@
         <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-        <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
         <Compile Include="Mono.Interop\ComInteropProxy.cs" />
         <Compile Include="Mono.Interop\IDispatch.cs" />
         <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -2855,7 +2853,6 @@
         <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-        <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
         <Compile Include="Mono.Interop\ComInteropProxy.cs" />
         <Compile Include="Mono.Interop\IDispatch.cs" />
         <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -3176,7 +3173,6 @@
             <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />
             <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />
             <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />
-            <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
             <Compile Include="Mono.Interop\ComInteropProxy.cs" />
             <Compile Include="Mono.Interop\IDispatch.cs" />
             <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -3425,7 +3421,6 @@
             <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-            <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
             <Compile Include="Mono.Interop\ComInteropProxy.cs" />
             <Compile Include="Mono.Interop\IDispatch.cs" />
             <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -3681,7 +3676,6 @@
             <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-            <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
             <Compile Include="Mono.Interop\ComInteropProxy.cs" />
             <Compile Include="Mono.Interop\IDispatch.cs" />
             <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -3937,7 +3931,6 @@
             <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-            <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
             <Compile Include="Mono.Interop\ComInteropProxy.cs" />
             <Compile Include="Mono.Interop\IDispatch.cs" />
             <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -4185,7 +4178,6 @@
         <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-        <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
         <Compile Include="Mono.Interop\ComInteropProxy.cs" />
         <Compile Include="Mono.Interop\IDispatch.cs" />
         <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -4436,7 +4428,6 @@
         <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-        <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
         <Compile Include="Mono.Interop\ComInteropProxy.cs" />
         <Compile Include="Mono.Interop\IDispatch.cs" />
         <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -4687,7 +4678,6 @@
         <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
         <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-        <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
         <Compile Include="Mono.Interop\ComInteropProxy.cs" />
         <Compile Include="Mono.Interop\IDispatch.cs" />
         <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -4973,7 +4963,6 @@
             <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-            <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
             <Compile Include="Mono.Interop\ComInteropProxy.cs" />
             <Compile Include="Mono.Interop\IDispatch.cs" />
             <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -5223,7 +5212,6 @@
             <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-            <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
             <Compile Include="Mono.Interop\ComInteropProxy.cs" />
             <Compile Include="Mono.Interop\IDispatch.cs" />
             <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -5478,7 +5466,6 @@
             <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-            <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
             <Compile Include="Mono.Interop\ComInteropProxy.cs" />
             <Compile Include="Mono.Interop\IDispatch.cs" />
             <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -5733,7 +5720,6 @@
             <Compile Include="Microsoft.Win32\UnixRegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32RegistryApi.cs" />
             <Compile Include="Microsoft.Win32\Win32ResultCode.cs" />
-            <Compile Include="Mono.Globalization.Unicode\SimpleCollator.cs" />
             <Compile Include="Mono.Interop\ComInteropProxy.cs" />
             <Compile Include="Mono.Interop\IDispatch.cs" />
             <Compile Include="Mono.Interop\IUnknown.cs" />
@@ -6423,6 +6409,27 @@
     <EmbeddedResource Include="LinkerDescriptor/mscorlib.xml">
       <LogicalName>mscorlib.xml</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="resources/collation.cjkCHS.bin">
+      <LogicalName>collation.cjkCHS.bin</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="resources/collation.cjkCHT.bin">
+      <LogicalName>collation.cjkCHT.bin</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="resources/collation.cjkJA.bin">
+      <LogicalName>collation.cjkJA.bin</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="resources/collation.cjkKO.bin">
+      <LogicalName>collation.cjkKO.bin</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="resources/collation.cjkKOlv2.bin">
+      <LogicalName>collation.cjkKOlv2.bin</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="resources/collation.core.bin">
+      <LogicalName>collation.core.bin</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="resources/collation.tailoring.bin">
+      <LogicalName>collation.tailoring.bin</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <!-- @ALL_RESOURCES@ -->
   <PropertyGroup>
diff --git a/mcs/class/corlib/wasm_corlib.dll.exclude.sources b/mcs/class/corlib/wasm_corlib.dll.exclude.sources
index cfbc4c081ad..9dedaab3739 100644
--- a/mcs/class/corlib/wasm_corlib.dll.exclude.sources
+++ b/mcs/class/corlib/wasm_corlib.dll.exclude.sources
@@ -1,4 +1,2 @@
 #include unix_build_corlib.dll.exclude.sources
 #include testing_aot_common_corlib.dll.exclude.sources
-
-Mono.Globalization.Unicode/SimpleCollator.cs