From 22441cc9fb7846c09deacca8ed7319e6b081394d Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 30 Aug 2019 19:41:02 +0000 Subject: [PATCH] Imported Upstream version 6.4.0.187 Former-commit-id: 5d639ac69dc1ce3fc1d4431cd659bacef06fb55a --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/ikvm/reflect/CustomAttributeData.cs | 2 +- external/ikvm/reflect/Metadata/Tables.cs | 2 ++ .../ikvm/reflect/Reader/MetadataReader.cs | 2 ++ mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/dis/dump.c | 3 +++ mono/metadata/row-indexes.h | 1 + mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 ++-- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 ++-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 50 files changed, 52 insertions(+), 44 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index c7ab1d25dd..48c5220e40 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -91ebc48069c47a6e5fbee11f910ee6ce6bedf4fe \ No newline at end of file +697def686b221f80e49bd7286802b3a76adac046 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index bb58e512af..22b8b90552 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -f6cc60f550b124af1f6e690d99260b1b0610771c \ No newline at end of file +3f61beb1f86b86a2da5ac63d27ef6bf2ce7e9d75 \ No newline at end of file diff --git a/external/ikvm/reflect/CustomAttributeData.cs b/external/ikvm/reflect/CustomAttributeData.cs index b9574d5633..9da38ce6cf 100644 --- a/external/ikvm/reflect/CustomAttributeData.cs +++ b/external/ikvm/reflect/CustomAttributeData.cs @@ -412,7 +412,7 @@ namespace IKVM.Reflection } else { - throw new InvalidOperationException(); + throw new InvalidOperationException(type.ToString()); } } diff --git a/external/ikvm/reflect/Metadata/Tables.cs b/external/ikvm/reflect/Metadata/Tables.cs index 75ceef7c4c..491c1ba1e4 100644 --- a/external/ikvm/reflect/Metadata/Tables.cs +++ b/external/ikvm/reflect/Metadata/Tables.cs @@ -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(); } diff --git a/external/ikvm/reflect/Reader/MetadataReader.cs b/external/ikvm/reflect/Reader/MetadataReader.cs index 28a4720d9b..7d7cf66926 100644 --- a/external/ikvm/reflect/Reader/MetadataReader.cs +++ b/external/ikvm/reflect/Reader/MetadataReader.cs @@ -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(); } diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 0e7d14ef95..dd55898c0a 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -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"; diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index a8f48cc7da..0f08f5f2c6 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2a0838370259ebf96142331b10ac563b1103adc2 \ No newline at end of file +e925fe0f1361b9e6bf78893830c63667f5e41fb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index d42438717f..5dce138590 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1f4cc2768f13d9875b13350c001dcbee20740ddc \ No newline at end of file +1398f4d7f255841ea15d7ba1d0c00b608b2083c3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 55cf419f03..3b9ef4b7ea 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a \ No newline at end of file +3c2e330763ca854a2259da0baf98936541785934 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index 391a425a99..76943ec915 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -587bd1f18657bd271b42e055e7ff0018a45c4274 \ No newline at end of file +f0a8f37dc4e0a5992a38660b3ffe3cf70d200455 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index e6733c7faa..815cf79fac 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d011a963a7c2363851175bdd399a1c1bc970b982 \ No newline at end of file +e4e76f037929f101e9690211286da031013a0833 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index 950283ced1..ca2682be05 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d53b8d57ef7eb035aa068ffa64d681042acd284a \ No newline at end of file +93b139c713973ccf7c2ef61bab9feab364715fda \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 352255835b..a34e5f8995 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -efd82eaedda668b7dad0c82fd6097d695a7349bd \ No newline at end of file +310ca82df358b8d54b3ebffa12954e9f1718ea28 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index a8f48cc7da..0f08f5f2c6 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2a0838370259ebf96142331b10ac563b1103adc2 \ No newline at end of file +e925fe0f1361b9e6bf78893830c63667f5e41fb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index d42438717f..5dce138590 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1f4cc2768f13d9875b13350c001dcbee20740ddc \ No newline at end of file +1398f4d7f255841ea15d7ba1d0c00b608b2083c3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 55cf419f03..3b9ef4b7ea 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a \ No newline at end of file +3c2e330763ca854a2259da0baf98936541785934 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index 391a425a99..76943ec915 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -587bd1f18657bd271b42e055e7ff0018a45c4274 \ No newline at end of file +f0a8f37dc4e0a5992a38660b3ffe3cf70d200455 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index e6733c7faa..815cf79fac 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d011a963a7c2363851175bdd399a1c1bc970b982 \ No newline at end of file +e4e76f037929f101e9690211286da031013a0833 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index 950283ced1..ca2682be05 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d53b8d57ef7eb035aa068ffa64d681042acd284a \ No newline at end of file +93b139c713973ccf7c2ef61bab9feab364715fda \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index 197f624ce7..3c7803dfbc 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -9fb87367c7c8e951f6ad881ec516ad4b49564834 \ No newline at end of file +a3edf311a2041e2c64c3b214e8ae124aa50e4809 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 352255835b..a34e5f8995 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -efd82eaedda668b7dad0c82fd6097d695a7349bd \ No newline at end of file +310ca82df358b8d54b3ebffa12954e9f1718ea28 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index a8f48cc7da..0f08f5f2c6 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2a0838370259ebf96142331b10ac563b1103adc2 \ No newline at end of file +e925fe0f1361b9e6bf78893830c63667f5e41fb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index d42438717f..5dce138590 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1f4cc2768f13d9875b13350c001dcbee20740ddc \ No newline at end of file +1398f4d7f255841ea15d7ba1d0c00b608b2083c3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 55cf419f03..3b9ef4b7ea 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a \ No newline at end of file +3c2e330763ca854a2259da0baf98936541785934 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index 391a425a99..76943ec915 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -587bd1f18657bd271b42e055e7ff0018a45c4274 \ No newline at end of file +f0a8f37dc4e0a5992a38660b3ffe3cf70d200455 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index e6733c7faa..815cf79fac 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d011a963a7c2363851175bdd399a1c1bc970b982 \ No newline at end of file +e4e76f037929f101e9690211286da031013a0833 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index 950283ced1..ca2682be05 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d53b8d57ef7eb035aa068ffa64d681042acd284a \ No newline at end of file +93b139c713973ccf7c2ef61bab9feab364715fda \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index 197f624ce7..3c7803dfbc 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -9fb87367c7c8e951f6ad881ec516ad4b49564834 \ No newline at end of file +a3edf311a2041e2c64c3b214e8ae124aa50e4809 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 352255835b..a34e5f8995 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -efd82eaedda668b7dad0c82fd6097d695a7349bd \ No newline at end of file +310ca82df358b8d54b3ebffa12954e9f1718ea28 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index a8f48cc7da..0f08f5f2c6 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2a0838370259ebf96142331b10ac563b1103adc2 \ No newline at end of file +e925fe0f1361b9e6bf78893830c63667f5e41fb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index d42438717f..5dce138590 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1f4cc2768f13d9875b13350c001dcbee20740ddc \ No newline at end of file +1398f4d7f255841ea15d7ba1d0c00b608b2083c3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 09aead8f3f..bf8b5878c9 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -ae618deceecb9ed6e2d386e8837bc70c13afe28c \ No newline at end of file +86be9deec79ef9fb4f41ab99820c5c3352e86660 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index 391a425a99..76943ec915 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -587bd1f18657bd271b42e055e7ff0018a45c4274 \ No newline at end of file +f0a8f37dc4e0a5992a38660b3ffe3cf70d200455 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index e6733c7faa..815cf79fac 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -d011a963a7c2363851175bdd399a1c1bc970b982 \ No newline at end of file +e4e76f037929f101e9690211286da031013a0833 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index 950283ced1..ca2682be05 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -d53b8d57ef7eb035aa068ffa64d681042acd284a \ No newline at end of file +93b139c713973ccf7c2ef61bab9feab364715fda \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index 197f624ce7..3c7803dfbc 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -9fb87367c7c8e951f6ad881ec516ad4b49564834 \ No newline at end of file +a3edf311a2041e2c64c3b214e8ae124aa50e4809 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 5b8786af28..9e41c92626 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -d5d6c792c0807c09182e600b7def5369e6df846a \ No newline at end of file +02da03284d8e08a084e3401656a8df759ce4f810 \ No newline at end of file diff --git a/mono/dis/dump.c b/mono/dis/dump.c index 5bfc80614c..b3336346df 100755 --- a/mono/dis/dump.c +++ b/mono/dis/dump.c @@ -794,6 +794,9 @@ has_cattr_get_table (MonoImage *m, guint32 val) case MONO_CUSTOM_ATTR_GENERICPAR: table = "GenericParam"; break; + case MONO_CUSTOM_ATTR_GENERICPARAMCONSTRAINT: + table = "GenericParamConstraint"; + break; default: table = "Unknown"; break; diff --git a/mono/metadata/row-indexes.h b/mono/metadata/row-indexes.h index 992dbdeea9..d7837d01ba 100644 --- a/mono/metadata/row-indexes.h +++ b/mono/metadata/row-indexes.h @@ -392,6 +392,7 @@ enum { MONO_CUSTOM_ATTR_EXP_TYPE, MONO_CUSTOM_ATTR_MANIFEST, MONO_CUSTOM_ATTR_GENERICPAR, + MONO_CUSTOM_ATTR_GENERICPARAMCONSTRAINT, MONO_CUSTOM_ATTR_BITS = 5, MONO_CUSTOM_ATTR_MASK = 0x1F }; diff --git a/mono/mini/version.h b/mono/mini/version.h index 7123c5f7f0..ff35c58ef2 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/7ef99c0" +#define FULL_VERSION "explicit/3216a3c" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index a0d210942d..3dd91b5c86 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1491,10 +1491,10 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@CROSS_COMPILE_TRUE@clean-local: -@HOST_WIN32_TRUE@clean-local: @CROSS_COMPILE_TRUE@test-local: @HOST_WIN32_TRUE@test-local: +@CROSS_COMPILE_TRUE@clean-local: +@HOST_WIN32_TRUE@clean-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 1b7cd0d32156822c76c5a45a6ee8b6c28af5e392..8dae9cdb1bcfb6fc96d85b7eb9b2e044d056e875 100644 GIT binary patch delta 18 ZcmbQIHBW29b1qgxODhAD&2PAjxBx&_1|$Fg delta 18 ZcmbQIHBW29b1qf`3o8Tj&2PAjxBx&^1|du}asWoQ23i0B delta 18 ZcmX?Ef3kjqfg-Dcg_VK%W>du}asWoP23r6C diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 019d65624e..af21f38900 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -8131f9b1508b4cb4d71c4c3d2420cee3b03a9f23 \ No newline at end of file +90338ca43f6a7f342c131145dd5b29617a7de47d \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index abb89763955005fb2246c13e5b9b2fc80ac1c2c6..8eb2031aca8e587f4b45ada2136202d6a5d1fc99 100644 GIT binary patch delta 20 bcmeyri1Gg-#tmHRtcI3W1}2;N)eE!$RNw}- delta 20 bcmeyri1Gg-#tmHRtOgcV2Iiaj)eE!$RNn@- diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 841833e1f5..2c177fa456 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -9a71555571ad7964c6a0547935ac552f9b55a9f9 \ No newline at end of file +0b09e40cbdb0494273ab266ba96c0794f386ca09 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 275f4c850d..b5153d1b10 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.4.0.186\n" +"Project-Id-Version: mono 6.4.0.187\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-08-30 08:07+0000\n" +"POT-Creation-Date: 2019-08-30 19:04+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 4cb11d48294ded8d9de73c323526d9224fcf939b..74811b8899a70ac6bdf22540de4cfc36834bd2ec 100644 GIT binary patch delta 20 ccmaF1gXP%{mJJD0Sq&|%3`{nsPGxKd0ANoDEC2ui delta 20 ccmaF1gXP%{mJJD0Sq&_#49qvDPGxKd0ANlCEdT%j diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 8de817fabb..58a4bc7d4c 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -5de2d18bf9edad21019faee5dcd5aec84b4a0219 \ No newline at end of file +5c95d15fd24c36df8e25d521a7ad221505f7c289 \ No newline at end of file