Merge branch 'upstream'

Former-commit-id: dfddeb0298166bf47f1d2e4894cc8ad9b6a73dc2
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-08-30 20:12:08 +00:00
commit ebb79e779c
50 changed files with 52 additions and 44 deletions

View File

@ -1 +1 @@
91ebc48069c47a6e5fbee11f910ee6ce6bedf4fe
697def686b221f80e49bd7286802b3a76adac046

View File

@ -1 +1 @@
f6cc60f550b124af1f6e690d99260b1b0610771c
3f61beb1f86b86a2da5ac63d27ef6bf2ce7e9d75

View File

@ -412,7 +412,7 @@ namespace IKVM.Reflection
}
else
{
throw new InvalidOperationException();
throw new InvalidOperationException(type.ToString());
}
}

View File

@ -1244,6 +1244,8 @@ namespace IKVM.Reflection.Metadata
return (token & 0xFFFFFF) << 5 | 18;
case GenericParamTable.Index:
return (token & 0xFFFFFF) << 5 | 19;
case GenericParamConstraintTable.Index:
return (token & 0xFFFFFF) << 5 | 20;
default:
throw new InvalidOperationException();
}

View File

@ -226,6 +226,8 @@ namespace IKVM.Reflection.Reader
return (ManifestResourceTable.Index << 24) + (codedIndex >> 5);
case 19:
return (GenericParamTable.Index << 24) + (codedIndex >> 5);
case 20:
return (GenericParamConstraintTable.Index << 24) + (codedIndex >> 5);
default:
throw new BadImageFormatException();
}

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.4.0.186";
public const string MonoVersion = "6.4.0.187";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
2a0838370259ebf96142331b10ac563b1103adc2
e925fe0f1361b9e6bf78893830c63667f5e41fb3

View File

@ -1 +1 @@
1f4cc2768f13d9875b13350c001dcbee20740ddc
1398f4d7f255841ea15d7ba1d0c00b608b2083c3

View File

@ -1 +1 @@
9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a
3c2e330763ca854a2259da0baf98936541785934

View File

@ -1 +1 @@
587bd1f18657bd271b42e055e7ff0018a45c4274
f0a8f37dc4e0a5992a38660b3ffe3cf70d200455

View File

@ -1 +1 @@
d011a963a7c2363851175bdd399a1c1bc970b982
e4e76f037929f101e9690211286da031013a0833

View File

@ -1 +1 @@
d53b8d57ef7eb035aa068ffa64d681042acd284a
93b139c713973ccf7c2ef61bab9feab364715fda

View File

@ -1 +1 @@
efd82eaedda668b7dad0c82fd6097d695a7349bd
310ca82df358b8d54b3ebffa12954e9f1718ea28

View File

@ -1 +1 @@
2a0838370259ebf96142331b10ac563b1103adc2
e925fe0f1361b9e6bf78893830c63667f5e41fb3

View File

@ -1 +1 @@
1f4cc2768f13d9875b13350c001dcbee20740ddc
1398f4d7f255841ea15d7ba1d0c00b608b2083c3

View File

@ -1 +1 @@
9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a
3c2e330763ca854a2259da0baf98936541785934

View File

@ -1 +1 @@
587bd1f18657bd271b42e055e7ff0018a45c4274
f0a8f37dc4e0a5992a38660b3ffe3cf70d200455

View File

@ -1 +1 @@
d011a963a7c2363851175bdd399a1c1bc970b982
e4e76f037929f101e9690211286da031013a0833

View File

@ -1 +1 @@
d53b8d57ef7eb035aa068ffa64d681042acd284a
93b139c713973ccf7c2ef61bab9feab364715fda

View File

@ -1 +1 @@
9fb87367c7c8e951f6ad881ec516ad4b49564834
a3edf311a2041e2c64c3b214e8ae124aa50e4809

Some files were not shown because too many files have changed in this diff Show More