Skip to content

Commit 826457f

Browse files
authored
Merge pull request #940 from Unity-Technologies/unity-master-fix-charunicodeinfo
Replace CharUnicodeInfo With CoreRT's
2 parents 8e72268 + 9a853e9 commit 826457f

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

mcs/class/corlib/System/Debug.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
//Stubs for Assert used by CharUnicodeInfo pulled in from corert
2+
namespace System.Globalization
3+
{
4+
public static partial class CharUnicodeInfo
5+
{
6+
internal static class Debug
7+
{
8+
internal static void Assert(bool condition, string message)
9+
{
10+
}
11+
}
12+
}
13+
}

mcs/class/corlib/corlib.dll.sources

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,9 @@ ReferenceSources/AppContextDefaultValues.cs
11111111
../referencesource/mscorlib/system/globalization/CalendricalCalculationsHelper.cs
11121112
../referencesource/mscorlib/system/globalization/calendardata.cs
11131113
../referencesource/mscorlib/system/globalization/calendarweekrule.cs
1114-
../referencesource/mscorlib/system/globalization/charunicodeinfo.cs
1114+
System/Debug.cs
1115+
../../../external/corert/src/System.Private.CoreLib/src/System/Globalization/CharUnicodeInfo.cs
1116+
../../../external/corert/src/System.Private.CoreLib/src/System/Globalization/CharUnicodeInfoData.cs
11151117
../referencesource/mscorlib/system/globalization/chineselunisolarcalendar.cs
11161118
../referencesource/mscorlib/system/globalization/compareinfo.cs
11171119
../referencesource/mscorlib/system/globalization/culturenotfoundexception.cs

0 commit comments

Comments
 (0)