diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index dadb5cc8cb..cc2bc6c891 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -b8ba159bbd60b12015a3c0ea74f7436213e62335 \ No newline at end of file +9b54510adbc10cd3c139b47b67c7d0a77cd42610 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index f5a8683e49..b34f534fb9 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -612e6f088c12dc8b2912628d2cfa6e5dcbe28a40 \ No newline at end of file +299ab8496b5da270c09d90a38a83e0034dea9e3c \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index faeddf33e2..3ce3ffbad6 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.8.0.73"; + public const string MonoVersion = "6.8.0.75"; 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/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index 62534ee432..094c21275c 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -10c199f6273088a52230ffe5240dab06dc79ef6a \ No newline at end of file +97a3d3487edcadf8b5ff47ee178a6ab893c66a1d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index 89473e8e0a..4d4f6a2fdb 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d7c75a5161e4dc77ff72514f81e5bcfee1f66f18 \ No newline at end of file +95b0ba6bf7ff0be6954e344f34b611932d8c104f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index d783e90e06..60b0c696a8 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -97a131da135cdb88e3070994bfcb405182f0cc23 \ No newline at end of file +0fb9bddccd107e8ec891f3a598d9d54fda158b02 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 9eb794c682..9e0571fcc3 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -5090147e0bd6549ca5cbf10241cacd11d023d17c \ No newline at end of file +78c81b46ce7339bb204c3edb19a4d0b5e305c93f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index 7ad0ca9687..4a100f2478 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -3529d3fc8f191980ad92d1191106ad14ea1e6f0b \ No newline at end of file +c79749a886e1ca02a3c968799f79d3bb09b3a632 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index 4ade6a3678..abbc4e3899 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5bf7ee680fde34b85692b0dfd2698af889ab8767 \ No newline at end of file +96f4e9ffbec768480c8c7b28a45aff39c36ded32 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 0bd014855b..7832e8bacc 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4f01f6898ed1815cc48192ace724a80bcce666f8 \ No newline at end of file +e38b96525f14599a9eb8fbb92253ea126df9e5a4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index 96aaab6f39..82368f8321 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ea565b946160f2dab6d14029d989862bb8ad1293 \ No newline at end of file +63a9364df5ba94e5b64da5a4a8c59459e2941415 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index 62534ee432..094c21275c 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -10c199f6273088a52230ffe5240dab06dc79ef6a \ No newline at end of file +97a3d3487edcadf8b5ff47ee178a6ab893c66a1d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index 89473e8e0a..4d4f6a2fdb 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d7c75a5161e4dc77ff72514f81e5bcfee1f66f18 \ No newline at end of file +95b0ba6bf7ff0be6954e344f34b611932d8c104f \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index d783e90e06..60b0c696a8 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -97a131da135cdb88e3070994bfcb405182f0cc23 \ No newline at end of file +0fb9bddccd107e8ec891f3a598d9d54fda158b02 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 9eb794c682..9e0571fcc3 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -5090147e0bd6549ca5cbf10241cacd11d023d17c \ No newline at end of file +78c81b46ce7339bb204c3edb19a4d0b5e305c93f \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index 7ad0ca9687..4a100f2478 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -3529d3fc8f191980ad92d1191106ad14ea1e6f0b \ No newline at end of file +c79749a886e1ca02a3c968799f79d3bb09b3a632 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index 4ade6a3678..abbc4e3899 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5bf7ee680fde34b85692b0dfd2698af889ab8767 \ No newline at end of file +96f4e9ffbec768480c8c7b28a45aff39c36ded32 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 0bd014855b..7832e8bacc 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4f01f6898ed1815cc48192ace724a80bcce666f8 \ No newline at end of file +e38b96525f14599a9eb8fbb92253ea126df9e5a4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index 96aaab6f39..82368f8321 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ea565b946160f2dab6d14029d989862bb8ad1293 \ No newline at end of file +63a9364df5ba94e5b64da5a4a8c59459e2941415 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index 62534ee432..094c21275c 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -10c199f6273088a52230ffe5240dab06dc79ef6a \ No newline at end of file +97a3d3487edcadf8b5ff47ee178a6ab893c66a1d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index 89473e8e0a..4d4f6a2fdb 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d7c75a5161e4dc77ff72514f81e5bcfee1f66f18 \ No newline at end of file +95b0ba6bf7ff0be6954e344f34b611932d8c104f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index d783e90e06..60b0c696a8 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -97a131da135cdb88e3070994bfcb405182f0cc23 \ No newline at end of file +0fb9bddccd107e8ec891f3a598d9d54fda158b02 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 9eb794c682..9e0571fcc3 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -5090147e0bd6549ca5cbf10241cacd11d023d17c \ No newline at end of file +78c81b46ce7339bb204c3edb19a4d0b5e305c93f \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index 7ad0ca9687..4a100f2478 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -3529d3fc8f191980ad92d1191106ad14ea1e6f0b \ No newline at end of file +c79749a886e1ca02a3c968799f79d3bb09b3a632 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index 4ade6a3678..abbc4e3899 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5bf7ee680fde34b85692b0dfd2698af889ab8767 \ No newline at end of file +96f4e9ffbec768480c8c7b28a45aff39c36ded32 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 0bd014855b..7832e8bacc 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4f01f6898ed1815cc48192ace724a80bcce666f8 \ No newline at end of file +e38b96525f14599a9eb8fbb92253ea126df9e5a4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index 96aaab6f39..82368f8321 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ea565b946160f2dab6d14029d989862bb8ad1293 \ No newline at end of file +63a9364df5ba94e5b64da5a4a8c59459e2941415 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index 62534ee432..094c21275c 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -10c199f6273088a52230ffe5240dab06dc79ef6a \ No newline at end of file +97a3d3487edcadf8b5ff47ee178a6ab893c66a1d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index 89473e8e0a..4d4f6a2fdb 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -d7c75a5161e4dc77ff72514f81e5bcfee1f66f18 \ No newline at end of file +95b0ba6bf7ff0be6954e344f34b611932d8c104f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index cf53c6297f..2e2925bc1b 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -3632d2cb0f353da9f0afa80bf2c3eae827386ab5 \ No newline at end of file +56dc21ee5aba75387c5b86092e8d84debf937f4d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 9eb794c682..9e0571fcc3 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -5090147e0bd6549ca5cbf10241cacd11d023d17c \ No newline at end of file +78c81b46ce7339bb204c3edb19a4d0b5e305c93f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index 7ad0ca9687..4a100f2478 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -3529d3fc8f191980ad92d1191106ad14ea1e6f0b \ No newline at end of file +c79749a886e1ca02a3c968799f79d3bb09b3a632 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index 4ade6a3678..abbc4e3899 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -5bf7ee680fde34b85692b0dfd2698af889ab8767 \ No newline at end of file +96f4e9ffbec768480c8c7b28a45aff39c36ded32 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 0bd014855b..7832e8bacc 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -4f01f6898ed1815cc48192ace724a80bcce666f8 \ No newline at end of file +e38b96525f14599a9eb8fbb92253ea126df9e5a4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index 0225f6afb0..430104ccbd 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -07c246ad5b11f8c795f696149f3059cc86a761cd \ No newline at end of file +eeca871e9dc131477af6013e39053408a4df77bf \ No newline at end of file diff --git a/mono/mini/debugger-agent.c.REMOVED.git-id b/mono/mini/debugger-agent.c.REMOVED.git-id index 9b4b1daadf..be67c69227 100644 --- a/mono/mini/debugger-agent.c.REMOVED.git-id +++ b/mono/mini/debugger-agent.c.REMOVED.git-id @@ -1 +1 @@ -d167406e0407e102e668e6c1728f05dd093f6b4b \ No newline at end of file +d2beb23792045191c3aa4b72ac1d4e95c89cc3fa \ No newline at end of file diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c index b4f7321464..0b17c84063 100644 --- a/mono/mini/mini-trampolines.c +++ b/mono/mini/mini-trampolines.c @@ -1142,7 +1142,15 @@ mono_delegate_trampoline (host_mgreg_t *regs, guint8 *code, gpointer *arg, guint } } - if (delegate->target && + if (tramp_info->method == NULL && delegate->target != NULL && method->flags & METHOD_ATTRIBUTE_VIRTUAL) { + /* tramp_info->method == NULL happens when someone asks us to JIT some delegate's + * Invoke method (see compile_special). In that case if method is virtual, the target + * could be some derived class, so we need to find the correct override. + */ + /* FIXME: does it make sense that we get called with tramp_info for the Invoke? */ + method = mono_object_get_virtual_method_internal (delegate->target, method); + enable_caching = FALSE; + } else if (delegate->target && method->flags & METHOD_ATTRIBUTE_VIRTUAL && method->flags & METHOD_ATTRIBUTE_ABSTRACT && mono_class_is_abstract (method->klass)) { diff --git a/mono/mini/version.h b/mono/mini/version.h index 6862b58b61..b99208e669 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/77147e7" +#define FULL_VERSION "explicit/e6cd9a1" diff --git a/mono/tests/Makefile.am.REMOVED.git-id b/mono/tests/Makefile.am.REMOVED.git-id index 657acd1f71..87b5ff3b38 100644 --- a/mono/tests/Makefile.am.REMOVED.git-id +++ b/mono/tests/Makefile.am.REMOVED.git-id @@ -1 +1 @@ -bd41a1d045604694100460b314536e7b6b2e1796 \ No newline at end of file +046ae211c02e7a9214df5eb62e04eba4173718fd \ 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 9f2bbe91ae..fa0632a198 100644 --- a/mono/tests/Makefile.in.REMOVED.git-id +++ b/mono/tests/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -118f2591fc1db3ee021791b8b400f8c300bf21f2 \ No newline at end of file +14e93764cea5ce7d67c6d59144319a6657b0abd9 \ No newline at end of file diff --git a/mono/tests/delegate17.cs b/mono/tests/delegate17.cs new file mode 100644 index 0000000000..09818514ec --- /dev/null +++ b/mono/tests/delegate17.cs @@ -0,0 +1,42 @@ +using System; +using System.Reflection; + +internal class Program +{ + public static int Main (string[] args) + { + // newobj Derived + Derived d = new Derived (); + // ldvirtftn Base::Foo + // newobj Del1::.ctor + Del1 b = new Del1 (d.Foo); + // ldftn Del1::Invoke + // newobj Del2::.ctor + Del2 f = new Del2 (b.Invoke); + // should call Derived.Foo not Base.Foo + var r = f ("abcd"); + return r; + } +} + + +public delegate int Del1 (string s); +public delegate int Del2 (string s); + +public class Base +{ + public virtual int Foo (string s) + { + Console.WriteLine ("Base.Foo called. Bad"); + return 1; + } +} + +public class Derived : Base +{ + public override int Foo (string s) + { + Console.WriteLine ("Derived.Foo called. Good"); + return 0; + } +} diff --git a/mono/tests/delegate18.cs b/mono/tests/delegate18.cs new file mode 100644 index 0000000000..74dd755658 --- /dev/null +++ b/mono/tests/delegate18.cs @@ -0,0 +1,42 @@ +using System; +using System.Reflection; + +internal class Program +{ + public static int Main (string[] args) + { + // newobj Derived + Derived d = new Derived (); + // ldvirtftn Base::Foo + // newobj Del1::.ctor + Del1 b = new Del1 (d.Foo); + var mi = typeof (Del1).GetMethod ("Invoke"); + if (mi is null) + return 2; + // should call Derived.Foo not Base.Foo + var r = (int) mi.Invoke (b, new object[] {"abcd"}); + return r; + } +} + + +public delegate int Del1 (string s); +public delegate int Del2 (string s); + +public class Base +{ + public virtual int Foo (string s) + { + Console.WriteLine ("Base.Foo called. Bad"); + return 1; + } +} + +public class Derived : Base +{ + public override int Foo (string s) + { + Console.WriteLine ("Derived.Foo called. Good"); + return 0; + } +} diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 9543e2b1a4..988f00b017 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 9eb4b5409c..2b7b2c62e0 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -b6bf9b9f8ab8fec37e17bb5278ebf4809f4c2b99 \ No newline at end of file +1ce28d11bcff26de456d5d2a8e71bb2174c80d87 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 5e5e007cf3..a31b46c8f7 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 94d5f49f75..52655186ca 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -419f0f9511c43de6ff6d12e499ce6b1b03c20b13 \ No newline at end of file +a0baa51d2e2caa7b0ac70e4e2d44a2e9f734279e \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index ce9cd186a5..2de2e898d4 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 281fe8736a..f1ca9b5d93 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -06544232f0b5e645c3353a96f2a40ba9591a7891 \ No newline at end of file +59d2aec9715c662debaaac0b813854f71bc5e88e \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index f27b5a2a50..749b07b898 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.8.0.73\n" +"Project-Id-Version: mono 6.8.0.75\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-12-10 17:21+0000\n" +"POT-Creation-Date: 2019-12-11 08:08+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 3917ce2da8..ff18e71b67 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index ccd71c1c1f..8188b55047 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -5acf09868278169e994b9b43ce5a1ea8c35a17f7 \ No newline at end of file +20da82e2e10736f341079ba9ea798756e411a3c8 \ No newline at end of file diff --git a/support/Makefile.in b/support/Makefile.in index 883365daa4..a38abf9503 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -962,8 +962,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_ONLY_FALSE@clean-local: @ENABLE_MSVC_ONLY_TRUE@test-bundle-local: +@ENABLE_MSVC_ONLY_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool clean-local \