Revert CharUnicodeInfo to reference-sources (Big Endian issue) (#9711)

Temporarily switch back to ref-source impl for `CharUnicodeInfo` which contains a few special BE patches while I am trying to upstream them.

Fixes #9684

4 files changed, 10 insertions, 5 deletions

diff --git a/configure.ac b/configure.ac
index c9ab5d10e26..0edb61193e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ MONO_VERSION_BUILD=`echo $VERSION | cut -d . -f 3`
 # This can be reset to 0 when Mono's version number is bumped
 # since it's part of the corlib version (the prefix '1' in the full
 # version number is to ensure the number isn't treated as octal in C)
-MONO_CORLIB_COUNTER=25
+MONO_CORLIB_COUNTER=26
 MONO_CORLIB_VERSION=`printf "1%02d%02d%02d%03d" $MONO_VERSION_MAJOR $MONO_VERSION_MINOR 0 $MONO_CORLIB_COUNTER`
 
 AC_DEFINE_UNQUOTED(MONO_CORLIB_VERSION,$MONO_CORLIB_VERSION,[Version of the corlib-runtime interface])
diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index 5237f062793..c86e804b488 100644
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -294,7 +294,6 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\FormatException.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\FormattableString.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Gen2GcCallback.cs" />

-    <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\CharUnicodeInfo.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\CompareInfo.Invariant.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\CompareInfo.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\Globalization\GlobalizationExtensions.cs" />

@@ -671,7 +670,6 @@
     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Array.cs" />

     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\ByReference.cs" />

     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Collections\Generic\ArraySortHelper.cs" />

-    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Globalization\CharUnicodeInfoData.cs" />

     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Globalization\GlobalizationMode.cs" />

     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\InsufficientMemoryException.cs" />

     <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\MissingFieldException.cs" />

@@ -791,6 +789,7 @@
     <Compile Include="..\referencesource\mscorlib\system\globalization\calendaralgorithmtype.cs" />

     <Compile Include="..\referencesource\mscorlib\system\globalization\calendardata.cs" />

     <Compile Include="..\referencesource\mscorlib\system\globalization\calendarweekrule.cs" />

+    <Compile Include="..\referencesource\mscorlib\system\globalization\charunicodeinfo.cs" />

     <Compile Include="..\referencesource\mscorlib\system\globalization\chineselunisolarcalendar.cs" />

     <Compile Include="..\referencesource\mscorlib\system\globalization\culturenotfoundexception.cs" />

     <Compile Include="..\referencesource\mscorlib\system\globalization\culturetypes.cs" />

diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index 2f8fc9e6bc2..a095549eaa0 100644
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -1076,8 +1076,10 @@ ReferenceSources/AppContextDefaultValues.cs
 ../referencesource/mscorlib/system/globalization/CalendricalCalculationsHelper.cs
 ../referencesource/mscorlib/system/globalization/calendardata.cs
 ../referencesource/mscorlib/system/globalization/calendarweekrule.cs
-../../../external/corefx/src/Common/src/CoreLib/System/Globalization/CharUnicodeInfo.cs
-../../../external/corert/src/System.Private.CoreLib/src/System/Globalization/CharUnicodeInfoData.cs
+../referencesource/mscorlib/system/globalization/charunicodeinfo.cs
+# TODO: make CoreFX's CharUnicodeInfo BE compatible
+#../../../external/corefx/src/Common/src/CoreLib/System/Globalization/CharUnicodeInfo.cs
+#../../../external/corert/src/System.Private.CoreLib/src/System/Globalization/CharUnicodeInfoData.cs
 ../referencesource/mscorlib/system/globalization/chineselunisolarcalendar.cs
 #../referencesource/mscorlib/system/globalization/compareinfo.cs
 ../referencesource/mscorlib/system/globalization/culturenotfoundexception.cs
diff --git a/mcs/class/referencesource/mscorlib/system/globalization/charunicodeinfo.cs b/mcs/class/referencesource/mscorlib/system/globalization/charunicodeinfo.cs
index 77d17717ffd..59fb10a1523 100644
--- a/mcs/class/referencesource/mscorlib/system/globalization/charunicodeinfo.cs
+++ b/mcs/class/referencesource/mscorlib/system/globalization/charunicodeinfo.cs
@@ -483,6 +483,10 @@ namespace System.Globalization {
             return (InternalGetUnicodeCategory(ch)) ;
         }
 
+#if MONO
+        public static UnicodeCategory GetUnicodeCategory(int codePoint) => GetUnicodeCategory((char)codePoint);
+#endif
+
         public static UnicodeCategory GetUnicodeCategory(String s, int index)
         {
             if (s==null)