From 3a44987f03e466fdb2caf52aff3e70f9d636d609 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 31 Oct 2019 09:10:02 +0000 Subject: [PATCH] Imported Upstream version 6.6.0.148 Former-commit-id: e3c553955865291392630663d50d4004cfa00f18 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 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/metadata/class-init.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/tests/Makefile.am.REMOVED.git-id | 2 +- mono/tests/Makefile.in.REMOVED.git-id | 2 +- mono/tests/interface-2.cs | 97 ++++++++++++++++++ mono/unit-tests/Makefile.in | 4 +- msvc/Makefile.in | 2 +- 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, 144 insertions(+), 47 deletions(-) create mode 100644 mono/tests/interface-2.cs diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 34f4868dbb..d888263360 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -cf4e954dc4232571309c8fd12ee62eee8b67c1f8 \ No newline at end of file +8f7913d9589d4661ea36bc57247b1c54f9c884d9 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index a8294707b2..938087d8e6 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -1a92dd06e35acc665ef791eff57d681295932796 \ No newline at end of file +27f21cf351ea959556b90627b6b6848c4b2bd285 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 103017e354..b0b80b6559 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.6.0.147"; + public const string MonoVersion = "6.6.0.148"; 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/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index b40eb073e2..3604f24684 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -5e3242d1227fce6df9b0f64aa8ed2aac5cb6fa51 \ No newline at end of file +d6873a6a44b22203212c3e27b6251f29330b876c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 96a986127e..345d619184 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -3a4a3cd5f6d8d1b0989e49894e705a1fc0b1e968 \ No newline at end of file +9a2509d048a11aa654ef116188660d4105b85cfb \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index 546c8261c3..3b50b10a17 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c49005e83217beaf39f774338ddba472effdadd4 \ No newline at end of file +1977e3c1438869bf78c984b562e3b18d0e22c0d8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index fa045fa53e..4d671c01f4 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -276a93c86b3305bff1bb328f9ef343e7cb4f27d8 \ No newline at end of file +2cc3f9d0e5eca6ca7c3153298e0c31d881db1d9c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index 7138432f10..4d7bfef05e 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -fc2b419f1b343a6864563ebb068313d2dea63307 \ No newline at end of file +cb882209764b14ee7b455c6de33db52b4ce0b86c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index 4f0d8331a5..e55301b506 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -f621bb38f6acb6aa1ea38cad7945f42094b4d360 \ No newline at end of file +87775866d1524d54375f9c8e42483c788116d21e \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 15cc72ae26..3378ec6a8a 100644 --- a/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -e4fa10ef65f4038de7334dec0acae65f7e594f12 \ No newline at end of file +c260001f7211d72828c8a726f8ba8bf2a2920042 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index b40eb073e2..3604f24684 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -5e3242d1227fce6df9b0f64aa8ed2aac5cb6fa51 \ No newline at end of file +d6873a6a44b22203212c3e27b6251f29330b876c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 96a986127e..345d619184 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -3a4a3cd5f6d8d1b0989e49894e705a1fc0b1e968 \ No newline at end of file +9a2509d048a11aa654ef116188660d4105b85cfb \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index 546c8261c3..3b50b10a17 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c49005e83217beaf39f774338ddba472effdadd4 \ No newline at end of file +1977e3c1438869bf78c984b562e3b18d0e22c0d8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index fa045fa53e..4d671c01f4 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -276a93c86b3305bff1bb328f9ef343e7cb4f27d8 \ No newline at end of file +2cc3f9d0e5eca6ca7c3153298e0c31d881db1d9c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index 7138432f10..4d7bfef05e 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -fc2b419f1b343a6864563ebb068313d2dea63307 \ No newline at end of file +cb882209764b14ee7b455c6de33db52b4ce0b86c \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index 4f0d8331a5..e55301b506 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -f621bb38f6acb6aa1ea38cad7945f42094b4d360 \ No newline at end of file +87775866d1524d54375f9c8e42483c788116d21e \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id index 7b3f468aeb..bb51c67a50 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -40975a3188c6967c3a1eb4ae0efd6f5d78f2bd44 \ No newline at end of file +64580f738aafd340069a5cdd3e7e4b8950848c3b \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 15cc72ae26..3378ec6a8a 100644 --- a/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -e4fa10ef65f4038de7334dec0acae65f7e594f12 \ No newline at end of file +c260001f7211d72828c8a726f8ba8bf2a2920042 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index b40eb073e2..3604f24684 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -5e3242d1227fce6df9b0f64aa8ed2aac5cb6fa51 \ No newline at end of file +d6873a6a44b22203212c3e27b6251f29330b876c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 96a986127e..345d619184 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -3a4a3cd5f6d8d1b0989e49894e705a1fc0b1e968 \ No newline at end of file +9a2509d048a11aa654ef116188660d4105b85cfb \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index 546c8261c3..3b50b10a17 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c49005e83217beaf39f774338ddba472effdadd4 \ No newline at end of file +1977e3c1438869bf78c984b562e3b18d0e22c0d8 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index fa045fa53e..4d671c01f4 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -276a93c86b3305bff1bb328f9ef343e7cb4f27d8 \ No newline at end of file +2cc3f9d0e5eca6ca7c3153298e0c31d881db1d9c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index 7138432f10..4d7bfef05e 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -fc2b419f1b343a6864563ebb068313d2dea63307 \ No newline at end of file +cb882209764b14ee7b455c6de33db52b4ce0b86c \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index 4f0d8331a5..e55301b506 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -f621bb38f6acb6aa1ea38cad7945f42094b4d360 \ No newline at end of file +87775866d1524d54375f9c8e42483c788116d21e \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id index 7b3f468aeb..bb51c67a50 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -40975a3188c6967c3a1eb4ae0efd6f5d78f2bd44 \ No newline at end of file +64580f738aafd340069a5cdd3e7e4b8950848c3b \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 15cc72ae26..3378ec6a8a 100644 --- a/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -e4fa10ef65f4038de7334dec0acae65f7e594f12 \ No newline at end of file +c260001f7211d72828c8a726f8ba8bf2a2920042 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id index b40eb073e2..3604f24684 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -5e3242d1227fce6df9b0f64aa8ed2aac5cb6fa51 \ No newline at end of file +d6873a6a44b22203212c3e27b6251f29330b876c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id index 96a986127e..345d619184 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -3a4a3cd5f6d8d1b0989e49894e705a1fc0b1e968 \ No newline at end of file +9a2509d048a11aa654ef116188660d4105b85cfb \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id index 298210af53..aa23bfd1c3 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -268f706e058389521d48696e2f9b032ccab0eb08 \ No newline at end of file +7ec86186854c76dc4c88bd3a1dfc5d10a8ae0227 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id index fa045fa53e..4d671c01f4 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -276a93c86b3305bff1bb328f9ef343e7cb4f27d8 \ No newline at end of file +2cc3f9d0e5eca6ca7c3153298e0c31d881db1d9c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id index 7138432f10..4d7bfef05e 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -fc2b419f1b343a6864563ebb068313d2dea63307 \ No newline at end of file +cb882209764b14ee7b455c6de33db52b4ce0b86c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id index 4f0d8331a5..e55301b506 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -f621bb38f6acb6aa1ea38cad7945f42094b4d360 \ No newline at end of file +87775866d1524d54375f9c8e42483c788116d21e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id index 7b3f468aeb..bb51c67a50 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -40975a3188c6967c3a1eb4ae0efd6f5d78f2bd44 \ No newline at end of file +64580f738aafd340069a5cdd3e7e4b8950848c3b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id index 01229b41be..2011dcc9e5 100644 --- a/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/A144A63D-652C-4CCF-A9EE-8E5A091547F1/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -20f4aba1cec846bd1088f5a9fe018135bb4fed07 \ No newline at end of file +cb73a7c13051b14270295b140b4e984d06a0308e \ No newline at end of file diff --git a/mono/metadata/class-init.c.REMOVED.git-id b/mono/metadata/class-init.c.REMOVED.git-id index faaaf770cf..bdfb2484c8 100644 --- a/mono/metadata/class-init.c.REMOVED.git-id +++ b/mono/metadata/class-init.c.REMOVED.git-id @@ -1 +1 @@ -b5c041f1a34b959fb4ffe4d68a2e0fd7885d4e6a \ No newline at end of file +67b63637354afae46a56b66701bd8da931814203 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index ffc7e7776d..70ba91c8ce 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/a119807" +#define FULL_VERSION "explicit/6ac1ff7" diff --git a/mono/tests/Makefile.am.REMOVED.git-id b/mono/tests/Makefile.am.REMOVED.git-id index 89d41c0411..779210db04 100644 --- a/mono/tests/Makefile.am.REMOVED.git-id +++ b/mono/tests/Makefile.am.REMOVED.git-id @@ -1 +1 @@ -11acc8005387141824eaf220d8133fd777b1dc70 \ No newline at end of file +b90ba3c73268f1d86790235cffbc765467a23a47 \ No newline at end of file diff --git a/mono/tests/Makefile.in.REMOVED.git-id b/mono/tests/Makefile.in.REMOVED.git-id index 4477d4b728..7f079aab37 100644 --- a/mono/tests/Makefile.in.REMOVED.git-id +++ b/mono/tests/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -eca029d000edebec42f6f6cdf494f7fab0f9096e \ No newline at end of file +96fd4e52754d69d5360c414bf5d2c8cd67327585 \ No newline at end of file diff --git a/mono/tests/interface-2.cs b/mono/tests/interface-2.cs new file mode 100644 index 0000000000..185d2a7499 --- /dev/null +++ b/mono/tests/interface-2.cs @@ -0,0 +1,97 @@ +using System; + +public interface I1 +{ + int M1() + { + return 100; + } +} + +public interface I2 : I1 { int I1.M1() { return 200; } } + +public interface I3 : I1 { int I1.M1() { return 300; } } + +public interface I4 : I1 { int I1.M1() { return 400; } } + +class Test10 : I1, I2, I3, I4 { + //void I1.M1() { System.Console.WriteLine("I1.I1.M1"); } + public int M1() { return 0; } +} + +public interface I1t +{ + int M1t() + { + return 100; + } +} + +public interface I2t : I1t { int I1t.M1t() { return 200; } } + +public interface I3t : I1t { int I1t.M1t() { return 300; } } + +public interface I4t : I1t { int I1t.M1t() { return 400; } } + +class Test10t : I1t, I2t, I3t, I4t +{ + int I1t.M1t() { return 0; } + public int M1t() { return 10; } +} + + +public interface IName +{ + string Name { get; } +} +public interface IOther +{ + T other { get; } + string Name { get; } +} +public class Name1 : IName +{ + public string Name { get { return "ClassName"; } } + string IName.Name { get { return "InterfaceName"; } } +} +public class Name2 : IName, IOther +{ + public string Name { get { return "ClassName"; } } + string IName.Name { get { return "InterfaceName"; } } + public int other { get { return 43; } } +} + +public class Test +{ + public static int test_0_override() + { + var name1 = new Name1(); + var name2 = new Name2(); + IName iName1 = name1; + IName iName2 = name2; + if (!iName1.Name.Equals("InterfaceName")) + return 10; + if (!iName2.Name.Equals("InterfaceName")) + return 20; + if (!name1.Name.Equals("ClassName")) + return 30; + if (!name2.Name.Equals("ClassName")) + return 40; + return 0; + } + + public static int test_0_dim_override() + { + I1 var = new Test10(); + if (var.M1() != 0) + return var.M1(); + + I1t var2 = new Test10t(); + return var2.M1t(); + } + + public static int Main (string[] args) { + return TestDriver.RunTests (typeof (Test), args); + } + +} diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index 7b45dbc879..eed954ce12 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1496,10 +1496,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@test-local: -@HOST_WIN32_TRUE@test-local: @CROSS_COMPILE_TRUE@clean-local: @HOST_WIN32_TRUE@clean-local: +@CROSS_COMPILE_TRUE@test-local: +@HOST_WIN32_TRUE@test-local: clean: clean-am clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ diff --git a/msvc/Makefile.in b/msvc/Makefile.in index 23ce0a9ad5..a35c268f47 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -525,8 +525,8 @@ 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." -@ENABLE_MSVC_FALSE@clean-local: @ENABLE_MSVC_FALSE@install-exec-local: +@ENABLE_MSVC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 17ae61b1c27822a45842bd92870e5585e9a3b9bf..a032411cbb3ce874d37b27b9d81cc27844b7cdc3 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKx1p^B!W0TEqxQw^}N^S;r delta 20 bcmbQIHBW29Q!aJ`1p^B!V}s3axQw^}N=gQC diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index b98abd19ed..9b5086ba26 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -c912baef3403c2f7ebef70b499c67979dbd091e2 \ No newline at end of file +41ea0fc0f9d22be67f4859aacf1a786e44cd6c6f \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index ed79e7bfac9cc426f59ace965ee542364956e0d0..32662b6f0d4e83a7d4506a3b92fbb111eab3d791 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)Uf`NsVvB_pr#VK+CQH}2M7QF delta 22 dcmeyri1Gg-#tj_m>;?)37FNavoB7oXv;bhd2Lk{A diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 2a888310c8..3aba72a190 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -087c786aa2da26c8a7c5eb0a1029b9f87eabd569 \ No newline at end of file +d213577b3c27ff7105b92058e6c0116f383c6a3c \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 60169bd49d..9853dbe654 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.6.0.147\n" +"Project-Id-Version: mono 6.6.0.148\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-10-30 08:30+0000\n" +"POT-Creation-Date: 2019-10-31 08:34+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 6c24636d81e293e8d3496873b137d3619552f72e..0a05ccc63f7f9956939dee4c5dd2355237da5bca 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*$ov8EUb)8Hm6QyYzF{s*9d+9 delta 22 ecmaF1gXP%{mJM-J*$os7EUb(THm6QyYzF{svj}+r diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 3d6b6b8cea..e3459d57ed 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -4a9e9e02c1ab4bd7405b8a565c78126fbfbf5f76 \ No newline at end of file +cca62399a21fe8055c1a33d5f0a8db0bc6f82955 \ No newline at end of file