From 4b878ebc4fb106af51dead95dbf580f5dab18b36 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Thu, 7 Mar 2019 08:18:56 +0000 Subject: [PATCH] Imported Upstream version 5.20.0.240 Former-commit-id: 365890657f426c6c7acc700e3b568dbb83da13bf --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- .../monodroid/System.cs.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- mcs/class/System/Assembly/AssemblyInfo.cs | 5 +++ .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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 | Bin 99328 -> 99328 bytes .../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/object-internals.h | 3 ++ mono/metadata/object.c.REMOVED.git-id | 2 +- mono/mini/driver.c | 14 ++++++++ mono/mini/version.h | 2 +- mono/tests/Makefile.am.REMOVED.git-id | 2 +- mono/tests/Makefile.in.REMOVED.git-id | 2 +- mono/tests/module-cctor-entrypoint.il | 30 ++++++++++++++++++ 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 +- 53 files changed, 94 insertions(+), 42 deletions(-) create mode 100644 mono/tests/module-cctor-entrypoint.il diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 1841319848..02895128d6 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -45307b705bed97a4a8b7045f329caf82bfd2cc90 \ No newline at end of file +5228a1da8efc7aaed09a4a3036471e7c69fffa5f \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 20fc752f14..389cc2ece3 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -1ee650edadac9ee5cea8593caad67248813737fa \ No newline at end of file +d2ad58b28924b4dc876e8f97809bacb33f4dfaa6 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id index 909eeb86fe..71ecc529da 100644 --- a/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/System.cs.REMOVED.git-id @@ -1 +1 @@ -36d622527efb75a14820450ce9af1c8b3b1e1990 \ No newline at end of file +c1cb9231961fa0bcfa4c0891668481eb975ad27d \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 4c135ca59e..e4823d2f7b 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.20.0.237"; + public const string MonoVersion = "5.20.0.240"; 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/System/Assembly/AssemblyInfo.cs b/mcs/class/System/Assembly/AssemblyInfo.cs index 8a5b95edf4..7d50c8117b 100644 --- a/mcs/class/System/Assembly/AssemblyInfo.cs +++ b/mcs/class/System/Assembly/AssemblyInfo.cs @@ -82,3 +82,8 @@ using System.Runtime.InteropServices; #if XAMMAC || XAMMAC_4_5 [assembly: InternalsVisibleTo ("Xamarin.Mac, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] #endif + +#if MONODROID +[assembly: InternalsVisibleTo ("Mono.Android, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] +#endif + diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index c73d6a7751..a7087adcdd 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -01bfe8b94a6b2ae85868a40840ab2e392abd9431 \ No newline at end of file +73949fb6408ba10f6a062dc356186fdefdd161d6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index a6dee02a14..9600df7340 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a391b9bf31dae30d2daea73afc84acbb687ee94b \ No newline at end of file +fe29d992cf41104328b74fbf8e73c87b4b3b83af \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 91099c327d..2f500f2f27 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -b334007a9154c5f0805bbb1890648819c403b7c3 \ No newline at end of file +293242222f0e48a0c0ab519e6d67f5fe9dcc1c42 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index 1e5b88a1589ee5b445e014163dc86be2ef9eaa49..b078f226513e69a590391077956cd73aad8d6de3 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZjj)=rfsD0`0W=H{e5d1gfUW6ElWxoV?|uS=x6lj$Xa)r| S05AY5m!N$CDz|470hw?p3K*vV delta 60 zcmZqZU~A}Lo6x~hC?C_?*t4~V(S%2!XZ5GBaM6z*UH*%_0-Bec*?xhCF@ufOn8BPu QYx;s(My>7X!i+Nu0L01`G5`Po diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id index 10f68cb962..58ab898fa1 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -65ab94eb926cadebc8a7ce784dd477925f03a885 \ No newline at end of file +dffdf72f972fa58a13c7358f2e264e9ca7eac517 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id index f01320b12b..f5cfc5dbe0 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bafb2bd51111af716021b82d749d544a443563f9 \ No newline at end of file +54bd86729415191b5aebb9366b0643ff156ded7d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id index 3cadf4f98e..101e50bde6 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -13a254c83a070f9983eb993795cff76be03815b3 \ No newline at end of file +df342b8d72746493f49cd3d6480c64314b459394 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id index 5a8796a4f1..7c12e2d45a 100644 --- a/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a61da11c608b924f927fcfae2de98cceaf6e4af5 \ No newline at end of file +73bccf40a2839e368acecb0ba3fdc4d8293f1494 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index c73d6a7751..a7087adcdd 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -01bfe8b94a6b2ae85868a40840ab2e392abd9431 \ No newline at end of file +73949fb6408ba10f6a062dc356186fdefdd161d6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index a6dee02a14..9600df7340 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a391b9bf31dae30d2daea73afc84acbb687ee94b \ No newline at end of file +fe29d992cf41104328b74fbf8e73c87b4b3b83af \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 91099c327d..2f500f2f27 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -b334007a9154c5f0805bbb1890648819c403b7c3 \ No newline at end of file +293242222f0e48a0c0ab519e6d67f5fe9dcc1c42 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index 1e5b88a1589ee5b445e014163dc86be2ef9eaa49..b078f226513e69a590391077956cd73aad8d6de3 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZjj)=rfsD0`0W=H{e5d1gfUW6ElWxoV?|uS=x6lj$Xa)r| S05AY5m!N$CDz|470hw?p3K*vV delta 60 zcmZqZU~A}Lo6x~hC?C_?*t4~V(S%2!XZ5GBaM6z*UH*%_0-Bec*?xhCF@ufOn8BPu QYx;s(My>7X!i+Nu0L01`G5`Po diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id index 10f68cb962..58ab898fa1 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -65ab94eb926cadebc8a7ce784dd477925f03a885 \ No newline at end of file +dffdf72f972fa58a13c7358f2e264e9ca7eac517 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id index f01320b12b..f5cfc5dbe0 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bafb2bd51111af716021b82d749d544a443563f9 \ No newline at end of file +54bd86729415191b5aebb9366b0643ff156ded7d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id index 3cadf4f98e..101e50bde6 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -13a254c83a070f9983eb993795cff76be03815b3 \ No newline at end of file +df342b8d72746493f49cd3d6480c64314b459394 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id index 5a8796a4f1..7c12e2d45a 100644 --- a/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a61da11c608b924f927fcfae2de98cceaf6e4af5 \ No newline at end of file +73bccf40a2839e368acecb0ba3fdc4d8293f1494 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index c73d6a7751..a7087adcdd 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -01bfe8b94a6b2ae85868a40840ab2e392abd9431 \ No newline at end of file +73949fb6408ba10f6a062dc356186fdefdd161d6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index a6dee02a14..9600df7340 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a391b9bf31dae30d2daea73afc84acbb687ee94b \ No newline at end of file +fe29d992cf41104328b74fbf8e73c87b4b3b83af \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 91099c327d..2f500f2f27 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -b334007a9154c5f0805bbb1890648819c403b7c3 \ No newline at end of file +293242222f0e48a0c0ab519e6d67f5fe9dcc1c42 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index 1e5b88a1589ee5b445e014163dc86be2ef9eaa49..b078f226513e69a590391077956cd73aad8d6de3 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZjj)=rfsD0`0W=H{e5d1gfUW6ElWxoV?|uS=x6lj$Xa)r| S05AY5m!N$CDz|470hw?p3K*vV delta 60 zcmZqZU~A}Lo6x~hC?C_?*t4~V(S%2!XZ5GBaM6z*UH*%_0-Bec*?xhCF@ufOn8BPu QYx;s(My>7X!i+Nu0L01`G5`Po diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id index 10f68cb962..58ab898fa1 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -65ab94eb926cadebc8a7ce784dd477925f03a885 \ No newline at end of file +dffdf72f972fa58a13c7358f2e264e9ca7eac517 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id index f01320b12b..f5cfc5dbe0 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bafb2bd51111af716021b82d749d544a443563f9 \ No newline at end of file +54bd86729415191b5aebb9366b0643ff156ded7d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id index 3cadf4f98e..101e50bde6 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -13a254c83a070f9983eb993795cff76be03815b3 \ No newline at end of file +df342b8d72746493f49cd3d6480c64314b459394 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id index 5a8796a4f1..7c12e2d45a 100644 --- a/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a61da11c608b924f927fcfae2de98cceaf6e4af5 \ No newline at end of file +73bccf40a2839e368acecb0ba3fdc4d8293f1494 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id index c73d6a7751..a7087adcdd 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -01bfe8b94a6b2ae85868a40840ab2e392abd9431 \ No newline at end of file +73949fb6408ba10f6a062dc356186fdefdd161d6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id index a6dee02a14..9600df7340 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -a391b9bf31dae30d2daea73afc84acbb687ee94b \ No newline at end of file +fe29d992cf41104328b74fbf8e73c87b4b3b83af \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id index 91099c327d..2f500f2f27 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -b334007a9154c5f0805bbb1890648819c403b7c3 \ No newline at end of file +293242222f0e48a0c0ab519e6d67f5fe9dcc1c42 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.IO.Compression.dll index 1e5b88a1589ee5b445e014163dc86be2ef9eaa49..b078f226513e69a590391077956cd73aad8d6de3 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZjj)=rfsD0`0W=H{e5d1gfUW6ElWxoV?|uS=x6lj$Xa)r| S05AY5m!N$CDz|470hw?p3K*vV delta 60 zcmZqZU~A}Lo6x~hC?C_?*t4~V(S%2!XZ5GBaM6z*UH*%_0-Bec*?xhCF@ufOn8BPu QYx;s(My>7X!i+Nu0L01`G5`Po diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id index 10f68cb962..58ab898fa1 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -65ab94eb926cadebc8a7ce784dd477925f03a885 \ No newline at end of file +dffdf72f972fa58a13c7358f2e264e9ca7eac517 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id index f01320b12b..f5cfc5dbe0 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -bafb2bd51111af716021b82d749d544a443563f9 \ No newline at end of file +54bd86729415191b5aebb9366b0643ff156ded7d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id index 3cadf4f98e..101e50bde6 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -13a254c83a070f9983eb993795cff76be03815b3 \ No newline at end of file +df342b8d72746493f49cd3d6480c64314b459394 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id index 5a8796a4f1..7c12e2d45a 100644 --- a/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/B886E13F-6276-4BE5-85F8-C6BF5EDBD200/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a61da11c608b924f927fcfae2de98cceaf6e4af5 \ No newline at end of file +73bccf40a2839e368acecb0ba3fdc4d8293f1494 \ No newline at end of file diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h index 5080eaebf2..0080ff449a 100644 --- a/mono/metadata/object-internals.h +++ b/mono/metadata/object-internals.h @@ -1802,6 +1802,9 @@ mono_unhandled_exception_checked (MonoObjectHandle exc, MonoError *error); MonoVTable * mono_class_try_get_vtable (MonoDomain *domain, MonoClass *klass); +gboolean +mono_runtime_run_module_cctor (MonoImage *image, MonoDomain *domain, MonoError *error); + gboolean mono_runtime_class_init_full (MonoVTable *vtable, MonoError *error); diff --git a/mono/metadata/object.c.REMOVED.git-id b/mono/metadata/object.c.REMOVED.git-id index d2d0c56cc5..9e5c83e1a4 100644 --- a/mono/metadata/object.c.REMOVED.git-id +++ b/mono/metadata/object.c.REMOVED.git-id @@ -1 +1 @@ -02cc9844598f164f41eacd362abd81a74ebfca78 \ No newline at end of file +77017967ec9b359a848a04a5c2dfd9d7602de5af \ No newline at end of file diff --git a/mono/mini/driver.c b/mono/mini/driver.c index a88d8bfd3d..9af125f01a 100644 --- a/mono/mini/driver.c +++ b/mono/mini/driver.c @@ -1279,6 +1279,20 @@ mono_jit_exec_internal (MonoDomain *domain, MonoAssembly *assembly, int argc, ch MONO_REQ_GC_UNSAFE_MODE; ERROR_DECL (error); MonoImage *image = mono_assembly_get_image_internal (assembly); + + // We need to ensure that any module cctor for this image + // is run *before* we invoke the entry point + // For more information, see https://blogs.msdn.microsoft.com/junfeng/2005/11/19/module-initializer-a-k-a-module-constructor/ + // + // This is required in order for tools like Costura + // (https://github.com/Fody/Costura) to work properly, as they inject + // a module initializer which sets up event handlers (e.g. AssemblyResolve) + // that allow the main method to run properly + if (!mono_runtime_run_module_cctor(image, domain, error)) { + g_print ("Failed to run module constructor due to %s\n", mono_error_get_message (error)); + return 1; + } + MonoMethod *method; guint32 entry = mono_image_get_entry_point (image); diff --git a/mono/mini/version.h b/mono/mini/version.h index bc18981314..f74d578c35 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/78e155f" +#define FULL_VERSION "explicit/a76ca3c" diff --git a/mono/tests/Makefile.am.REMOVED.git-id b/mono/tests/Makefile.am.REMOVED.git-id index 347bdad1dd..2ec5f2c099 100644 --- a/mono/tests/Makefile.am.REMOVED.git-id +++ b/mono/tests/Makefile.am.REMOVED.git-id @@ -1 +1 @@ -25ee74b34d800261fdd6ede13203aa15bec10530 \ No newline at end of file +2c3185717f056685b5164baa6403eba8dc71c2c0 \ 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 31a4cb610f..705e525cd7 100644 --- a/mono/tests/Makefile.in.REMOVED.git-id +++ b/mono/tests/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -031bb242deb4238ad3218effcf5fbbeeba3ab399 \ No newline at end of file +c5dd6438a8c22c8b04fe0e9d3f223eac5fec5c7b \ No newline at end of file diff --git a/mono/tests/module-cctor-entrypoint.il b/mono/tests/module-cctor-entrypoint.il new file mode 100644 index 0000000000..71c6d93d1b --- /dev/null +++ b/mono/tests/module-cctor-entrypoint.il @@ -0,0 +1,30 @@ +// See https://blogs.msdn.microsoft.com/junfeng/2005/11/19/module-initializer-a-k-a-module-constructor/ +// for more information about module initializers + +.assembly TestDll { } +.assembly extern mscorlib { } + +.method assembly specialname rtspecialname static + void .cctor() cil managed +{ + // If this method executes, we've succeeded + ldc.i4 0 + call void [mscorlib]System.Environment::Exit(int32) + ret +} + +.namespace NS +{ + .class public TestClass extends [mscorlib]System.Object + { + .method public static void Main() cil managed + { + .entrypoint + // This should never run due to the module constructor + // exiting + ldc.i4 1 + call void [mscorlib]System.Environment::Exit(int32) + ret + } + } +} diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index bcba53ef9d42f76ed660449101e39ec993e7128d..3825473fb434007709e0eb27c71beec034aac6e3 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aLM1p^B!1LMtaxQw^}N}C3F delta 20 bcmbQIHBW29Q!aK>1p^B!1M|&qxQw^}N}C3H diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index becab8ec56..4f8d4c280f 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -6b614d5a360c59edb60a86a90cb6a9a53777a3f5 \ No newline at end of file +a500c9ba74b03cd688149996069eb3fe3fe7a6b8 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index f8acb18860a3c3a905ebc80237787834ff823d14..93353c186a40bcda43b22daa8bdbdf78fb5b7a2c 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)sf`NsVf$?Tj#VK+CQM(4N delta 20 bcmX?Ef3kjqo+7)cf`NsVf%#@r#VK+CQM(4P diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 7ff7e521cb..308c0fca7f 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -841d13511c689e73843458f3c12f7de1803ee1d1 \ No newline at end of file +6f30a22a871f073e7056ec52ddf425ff8bd429b5 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index a2654076ad8a0eb7b5860c3b093445c7bedb2673..33290b4c3d1ec29daf6477e5d5654824df634891 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?B)sv7FGtvoB7oXv;biZ2MPcH delta 22 dcmeyri1Gg-#tj_m?4}9^7FGu4oB7oXv;biZ2MhoJ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index bebf119b73..578352d18b 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -53bc05053515abf582bb864aa45dcb2bcb6759d3 \ No newline at end of file +ac2dfcdaf0bd1cb04526e95c8f24c8d1390123c7 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 14c9710d47..7b3c88bb88 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.20.0.237\n" +"Project-Id-Version: mono 5.20.0.240\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-03-05 08:07+0000\n" +"POT-Creation-Date: 2019-03-07 08:03+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 99100de87ca39b73dec5168c08356d7639d608da..c887252d47929adcb2a3127a1b3c22e513c89e4a 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J+07LUEUXNSH>XZzYzF{t1PFit delta 22 ecmaF1gXP%{mJM-J*-aG;EUXO7H>XZzYzF{t1PFov diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index d948242c86..3bcd96fccf 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -c16fa2a8e0e8d0ef9e740328e6bf493dfd1d3bd0 \ No newline at end of file +05840c7b989008673515a0abde8d9bd90bca7d86 \ No newline at end of file