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

@ -202,9 +202,9 @@ namespace System.Diagnostics {
static string GetAotId ()
{
if (!isAotidSet) {
aotid = Assembly.GetAotId ();
if (aotid != null)
aotid = new Guid (aotid).ToString ("N");
var arr = RuntimeAssembly.GetAotId ();
if (arr != null)
aotid = new Guid (arr).ToString ("N");
isAotidSet = true;
}