Imported Upstream version 5.20.0.240
Former-commit-id: 365890657f426c6c7acc700e3b568dbb83da13bf
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
3711254460
commit
4b878ebc4f
@ -1 +1 @@
|
||||
45307b705bed97a4a8b7045f329caf82bfd2cc90
|
||||
5228a1da8efc7aaed09a4a3036471e7c69fffa5f
|
||||
@ -1 +1 @@
|
||||
1ee650edadac9ee5cea8593caad67248813737fa
|
||||
d2ad58b28924b4dc876e8f97809bacb33f4dfaa6
|
||||
@ -1 +1 @@
|
||||
36d622527efb75a14820450ce9af1c8b3b1e1990
|
||||
c1cb9231961fa0bcfa4c0891668481eb975ad27d
|
||||
@ -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";
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
01bfe8b94a6b2ae85868a40840ab2e392abd9431
|
||||
73949fb6408ba10f6a062dc356186fdefdd161d6
|
||||
@ -1 +1 @@
|
||||
a391b9bf31dae30d2daea73afc84acbb687ee94b
|
||||
fe29d992cf41104328b74fbf8e73c87b4b3b83af
|
||||
@ -1 +1 @@
|
||||
b334007a9154c5f0805bbb1890648819c403b7c3
|
||||
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
65ab94eb926cadebc8a7ce784dd477925f03a885
|
||||
dffdf72f972fa58a13c7358f2e264e9ca7eac517
|
||||
@ -1 +1 @@
|
||||
bafb2bd51111af716021b82d749d544a443563f9
|
||||
54bd86729415191b5aebb9366b0643ff156ded7d
|
||||
@ -1 +1 @@
|
||||
13a254c83a070f9983eb993795cff76be03815b3
|
||||
df342b8d72746493f49cd3d6480c64314b459394
|
||||
@ -1 +1 @@
|
||||
a61da11c608b924f927fcfae2de98cceaf6e4af5
|
||||
73bccf40a2839e368acecb0ba3fdc4d8293f1494
|
||||
@ -1 +1 @@
|
||||
01bfe8b94a6b2ae85868a40840ab2e392abd9431
|
||||
73949fb6408ba10f6a062dc356186fdefdd161d6
|
||||
@ -1 +1 @@
|
||||
a391b9bf31dae30d2daea73afc84acbb687ee94b
|
||||
fe29d992cf41104328b74fbf8e73c87b4b3b83af
|
||||
@ -1 +1 @@
|
||||
b334007a9154c5f0805bbb1890648819c403b7c3
|
||||
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
65ab94eb926cadebc8a7ce784dd477925f03a885
|
||||
dffdf72f972fa58a13c7358f2e264e9ca7eac517
|
||||
@ -1 +1 @@
|
||||
bafb2bd51111af716021b82d749d544a443563f9
|
||||
54bd86729415191b5aebb9366b0643ff156ded7d
|
||||
@ -1 +1 @@
|
||||
13a254c83a070f9983eb993795cff76be03815b3
|
||||
df342b8d72746493f49cd3d6480c64314b459394
|
||||
@ -1 +1 @@
|
||||
a61da11c608b924f927fcfae2de98cceaf6e4af5
|
||||
73bccf40a2839e368acecb0ba3fdc4d8293f1494
|
||||
@ -1 +1 @@
|
||||
01bfe8b94a6b2ae85868a40840ab2e392abd9431
|
||||
73949fb6408ba10f6a062dc356186fdefdd161d6
|
||||
@ -1 +1 @@
|
||||
a391b9bf31dae30d2daea73afc84acbb687ee94b
|
||||
fe29d992cf41104328b74fbf8e73c87b4b3b83af
|
||||
@ -1 +1 @@
|
||||
b334007a9154c5f0805bbb1890648819c403b7c3
|
||||
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
65ab94eb926cadebc8a7ce784dd477925f03a885
|
||||
dffdf72f972fa58a13c7358f2e264e9ca7eac517
|
||||
@ -1 +1 @@
|
||||
bafb2bd51111af716021b82d749d544a443563f9
|
||||
54bd86729415191b5aebb9366b0643ff156ded7d
|
||||
@ -1 +1 @@
|
||||
13a254c83a070f9983eb993795cff76be03815b3
|
||||
df342b8d72746493f49cd3d6480c64314b459394
|
||||
@ -1 +1 @@
|
||||
a61da11c608b924f927fcfae2de98cceaf6e4af5
|
||||
73bccf40a2839e368acecb0ba3fdc4d8293f1494
|
||||
@ -1 +1 @@
|
||||
01bfe8b94a6b2ae85868a40840ab2e392abd9431
|
||||
73949fb6408ba10f6a062dc356186fdefdd161d6
|
||||
@ -1 +1 @@
|
||||
a391b9bf31dae30d2daea73afc84acbb687ee94b
|
||||
fe29d992cf41104328b74fbf8e73c87b4b3b83af
|
||||
@ -1 +1 @@
|
||||
b334007a9154c5f0805bbb1890648819c403b7c3
|
||||
293242222f0e48a0c0ab519e6d67f5fe9dcc1c42
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
65ab94eb926cadebc8a7ce784dd477925f03a885
|
||||
dffdf72f972fa58a13c7358f2e264e9ca7eac517
|
||||
@ -1 +1 @@
|
||||
bafb2bd51111af716021b82d749d544a443563f9
|
||||
54bd86729415191b5aebb9366b0643ff156ded7d
|
||||
@ -1 +1 @@
|
||||
13a254c83a070f9983eb993795cff76be03815b3
|
||||
df342b8d72746493f49cd3d6480c64314b459394
|
||||
@ -1 +1 @@
|
||||
a61da11c608b924f927fcfae2de98cceaf6e4af5
|
||||
73bccf40a2839e368acecb0ba3fdc4d8293f1494
|
||||
@ -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);
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
02cc9844598f164f41eacd362abd81a74ebfca78
|
||||
77017967ec9b359a848a04a5c2dfd9d7602de5af
|
||||
@ -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);
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/78e155f"
|
||||
#define FULL_VERSION "explicit/a76ca3c"
|
||||
|
||||
@ -1 +1 @@
|
||||
25ee74b34d800261fdd6ede13203aa15bec10530
|
||||
2c3185717f056685b5164baa6403eba8dc71c2c0
|
||||
@ -1 +1 @@
|
||||
031bb242deb4238ad3218effcf5fbbeeba3ab399
|
||||
c5dd6438a8c22c8b04fe0e9d3f223eac5fec5c7b
|
||||
30
mono/tests/module-cctor-entrypoint.il
Normal file
30
mono/tests/module-cctor-entrypoint.il
Normal file
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
6b614d5a360c59edb60a86a90cb6a9a53777a3f5
|
||||
a500c9ba74b03cd688149996069eb3fe3fe7a6b8
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
841d13511c689e73843458f3c12f7de1803ee1d1
|
||||
6f30a22a871f073e7056ec52ddf425ff8bd429b5
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
53bc05053515abf582bb864aa45dcb2bcb6759d3
|
||||
ac2dfcdaf0bd1cb04526e95c8f24c8d1390123c7
|
||||
@ -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 <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
||||
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c16fa2a8e0e8d0ef9e740328e6bf493dfd1d3bd0
|
||||
05840c7b989008673515a0abde8d9bd90bca7d86
|
||||
Loading…
x
Reference in New Issue
Block a user