Imported Upstream version 6.4.0.137

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

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;