mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 6.4.0.137

Browse Source 
Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/corlib/Mono.Globalization.Unicode/MSCompatUnicodeTable.cs
View File

@ -595,7 +595,7 @@ namespace Mono.Globalization.Unicode
{
int size;
Module module;
return Assembly.GetExecutingAssembly ().GetManifestResourceInternal (name, out size, out module);
return ((RuntimeAssembly)Assembly.GetExecutingAssembly ()).GetManifestResourceInternal (name, out size, out module);
}
#elif USE_C_HEADER
const int CollationTableIdxIgnorables = 0;

9
mcs/class/corlib/Mono.Globalization.Unicode/SimpleCollator.cs
View File

@ -75,7 +75,7 @@ using COpt = System.Globalization.CompareOptions;
namespace Mono.Globalization.Unicode
{
internal class SimpleCollator
internal class SimpleCollator : ISimpleCollator
{
/*
// this environment variable is for debugging quick check.
@ -756,6 +756,13 @@ Console.WriteLine (" -> '{0}'", c.Replacement);
len1 == min ? - 1 : 1;
}
*/
int ISimpleCollator.Compare (string s1, int idx1, int len1,
string s2, int idx2, int len2, CompareOptions options)
{
return Compare (s1, idx1, len1, s2, idx2, len2, options);
}
internal unsafe int Compare (string s1, int idx1, int len1,
string s2, int idx2, int len2, CompareOptions options)
{