Imported Upstream version 5.20.0.237
Former-commit-id: ad504501f4473c2a04a114df29a094eb6b9fbc5a
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
9cd29658eb
commit
3711254460
@ -1 +1 @@
|
||||
e60587a6530024d1e09fa8b3fae2071a7baa49ca
|
||||
45307b705bed97a4a8b7045f329caf82bfd2cc90
|
||||
@ -1 +1 @@
|
||||
bd0e5dfd7cf736c2d10c084942f51b1f440c9dd4
|
||||
1ee650edadac9ee5cea8593caad67248813737fa
|
||||
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.0.232";
|
||||
public const string MonoVersion = "5.20.0.237";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
617daca15ea56d904ec2c8ad23b7e03bb209c7c7
|
||||
01bfe8b94a6b2ae85868a40840ab2e392abd9431
|
||||
@ -1 +1 @@
|
||||
9eb8caad9a594ec47394891d0c93a703e7f3462a
|
||||
a391b9bf31dae30d2daea73afc84acbb687ee94b
|
||||
@ -1 +1 @@
|
||||
e1aa28f449be20c90d6cfb72ca9817b9907c2f41
|
||||
b334007a9154c5f0805bbb1890648819c403b7c3
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
718b94a811cbec0035b44ca779a50f886bcc6a10
|
||||
65ab94eb926cadebc8a7ce784dd477925f03a885
|
||||
@ -1 +1 @@
|
||||
ee4c3a63131787592824bd4584ca6d166debe9c8
|
||||
bafb2bd51111af716021b82d749d544a443563f9
|
||||
@ -1 +1 @@
|
||||
9860c1fa326aeeff1dab3cb4ca49f9328b3a94c4
|
||||
13a254c83a070f9983eb993795cff76be03815b3
|
||||
@ -1 +1 @@
|
||||
b8359f1f0c71a0dbb9d2114251eda4b65b537f40
|
||||
a61da11c608b924f927fcfae2de98cceaf6e4af5
|
||||
@ -1 +1 @@
|
||||
617daca15ea56d904ec2c8ad23b7e03bb209c7c7
|
||||
01bfe8b94a6b2ae85868a40840ab2e392abd9431
|
||||
@ -1 +1 @@
|
||||
9eb8caad9a594ec47394891d0c93a703e7f3462a
|
||||
a391b9bf31dae30d2daea73afc84acbb687ee94b
|
||||
@ -1 +1 @@
|
||||
e1aa28f449be20c90d6cfb72ca9817b9907c2f41
|
||||
b334007a9154c5f0805bbb1890648819c403b7c3
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
718b94a811cbec0035b44ca779a50f886bcc6a10
|
||||
65ab94eb926cadebc8a7ce784dd477925f03a885
|
||||
@ -1 +1 @@
|
||||
ee4c3a63131787592824bd4584ca6d166debe9c8
|
||||
bafb2bd51111af716021b82d749d544a443563f9
|
||||
@ -1 +1 @@
|
||||
9860c1fa326aeeff1dab3cb4ca49f9328b3a94c4
|
||||
13a254c83a070f9983eb993795cff76be03815b3
|
||||
@ -1 +1 @@
|
||||
b8359f1f0c71a0dbb9d2114251eda4b65b537f40
|
||||
a61da11c608b924f927fcfae2de98cceaf6e4af5
|
||||
@ -1 +1 @@
|
||||
617daca15ea56d904ec2c8ad23b7e03bb209c7c7
|
||||
01bfe8b94a6b2ae85868a40840ab2e392abd9431
|
||||
@ -1 +1 @@
|
||||
9eb8caad9a594ec47394891d0c93a703e7f3462a
|
||||
a391b9bf31dae30d2daea73afc84acbb687ee94b
|
||||
@ -1 +1 @@
|
||||
e1aa28f449be20c90d6cfb72ca9817b9907c2f41
|
||||
b334007a9154c5f0805bbb1890648819c403b7c3
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
718b94a811cbec0035b44ca779a50f886bcc6a10
|
||||
65ab94eb926cadebc8a7ce784dd477925f03a885
|
||||
@ -1 +1 @@
|
||||
ee4c3a63131787592824bd4584ca6d166debe9c8
|
||||
bafb2bd51111af716021b82d749d544a443563f9
|
||||
@ -1 +1 @@
|
||||
9860c1fa326aeeff1dab3cb4ca49f9328b3a94c4
|
||||
13a254c83a070f9983eb993795cff76be03815b3
|
||||
@ -1 +1 @@
|
||||
b8359f1f0c71a0dbb9d2114251eda4b65b537f40
|
||||
a61da11c608b924f927fcfae2de98cceaf6e4af5
|
||||
@ -1 +1 @@
|
||||
617daca15ea56d904ec2c8ad23b7e03bb209c7c7
|
||||
01bfe8b94a6b2ae85868a40840ab2e392abd9431
|
||||
@ -1 +1 @@
|
||||
9eb8caad9a594ec47394891d0c93a703e7f3462a
|
||||
a391b9bf31dae30d2daea73afc84acbb687ee94b
|
||||
@ -1 +1 @@
|
||||
e1aa28f449be20c90d6cfb72ca9817b9907c2f41
|
||||
b334007a9154c5f0805bbb1890648819c403b7c3
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
718b94a811cbec0035b44ca779a50f886bcc6a10
|
||||
65ab94eb926cadebc8a7ce784dd477925f03a885
|
||||
@ -1 +1 @@
|
||||
ee4c3a63131787592824bd4584ca6d166debe9c8
|
||||
bafb2bd51111af716021b82d749d544a443563f9
|
||||
@ -1 +1 @@
|
||||
9860c1fa326aeeff1dab3cb4ca49f9328b3a94c4
|
||||
13a254c83a070f9983eb993795cff76be03815b3
|
||||
@ -1 +1 @@
|
||||
b8359f1f0c71a0dbb9d2114251eda4b65b537f40
|
||||
a61da11c608b924f927fcfae2de98cceaf6e4af5
|
||||
@ -1377,8 +1377,20 @@ mono_lookup_pinvoke_call (MonoMethod *method, const char **exc_class, const char
|
||||
|
||||
base = g_path_get_dirname (resolvedname);
|
||||
newbase = g_path_get_dirname(base);
|
||||
mdirname = g_strdup_printf ("%s/lib", newbase);
|
||||
|
||||
// On Android the executable for the application is going to be /system/bin/app_process{32,64} depending on
|
||||
// the application's architecture. However, libraries for the different architectures live in different
|
||||
// subdirectories of `/system`: `lib` for 32-bit apps and `lib64` for 64-bit ones. Thus appending `/lib` below
|
||||
// will fail to load the DSO for a 64-bit app, even if it exists there, because it will have a different
|
||||
// architecture. This is the cause of https://github.com/xamarin/xamarin-android/issues/2780 and the ifdef
|
||||
// below is the fix.
|
||||
mdirname = g_strdup_printf (
|
||||
#if defined(TARGET_ANDROID) && (defined(TARGET_ARM64) || defined(TARGET_AMD64))
|
||||
"%s/lib64",
|
||||
#else
|
||||
"%s/lib",
|
||||
#endif
|
||||
newbase);
|
||||
g_free (resolvedname);
|
||||
g_free (base);
|
||||
g_free (newbase);
|
||||
|
||||
@ -165,6 +165,8 @@ rehash_table (MonoConcGHashTable *hash_table, int multiplier)
|
||||
mono_memory_barrier ();
|
||||
hash_table->table = new_table;
|
||||
hash_table->overflow_count = (int)(new_table->table_size * LOAD_FACTOR);
|
||||
hash_table->element_count -= hash_table->tombstone_count;
|
||||
hash_table->tombstone_count = 0;
|
||||
conc_table_lf_free (old_table);
|
||||
}
|
||||
|
||||
|
||||
@ -682,7 +682,7 @@ typedef struct {
|
||||
void (*set_cast_details) (MonoClass *from, MonoClass *to);
|
||||
void (*debug_log) (int level, MonoStringHandle category, MonoStringHandle message);
|
||||
gboolean (*debug_log_is_enabled) (void);
|
||||
void (*init_delegate) (MonoDelegate *del);
|
||||
void (*init_delegate) (MonoDelegate *del, MonoError *error);
|
||||
MonoObject* (*runtime_invoke) (MonoMethod *method, void *obj, void **params, MonoObject **exc, MonoError *error);
|
||||
void* (*compile_method) (MonoMethod *method, MonoError *error);
|
||||
gpointer (*create_jump_trampoline) (MonoDomain *domain, MonoMethod *method, gboolean add_sync_wrapper, MonoError *error);
|
||||
|
||||
@ -1 +1 @@
|
||||
2b5e48f6b5e4004a85e795fdd0ab63d28067d42b
|
||||
02cc9844598f164f41eacd362abd81a74ebfca78
|
||||
@ -15,7 +15,7 @@
|
||||
#ifndef __MONO_EE_H__
|
||||
#define __MONO_EE_H__
|
||||
|
||||
#define MONO_EE_API_VERSION 0x60010
|
||||
#define MONO_EE_API_VERSION 0x60011
|
||||
|
||||
typedef struct _MonoInterpStackIter MonoInterpStackIter;
|
||||
|
||||
@ -31,7 +31,7 @@ struct _MonoEECallbacks {
|
||||
void (*to_native_trampoline) (gpointer addr, gpointer ccontext);
|
||||
gpointer (*create_method_pointer) (MonoMethod *method, gboolean compile, MonoError *error);
|
||||
MonoObject* (*runtime_invoke) (MonoMethod *method, void *obj, void **params, MonoObject **exc, MonoError *error);
|
||||
void (*init_delegate) (MonoDelegate *del);
|
||||
void (*init_delegate) (MonoDelegate *del, MonoError *error);
|
||||
void (*delegate_ctor) (MonoObjectHandle this_obj, MonoObjectHandle target, gpointer addr, MonoError *error);
|
||||
gpointer (*get_remoting_invoke) (gpointer imethod, MonoError *error);
|
||||
void (*set_resume_state) (MonoJitTlsData *jit_tls, MonoException *ex, MonoJitExceptionInfo *ei, MonoInterpFrameHandle interp_frame, gpointer handler_ip);
|
||||
|
||||
@ -121,7 +121,7 @@ stub_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **
|
||||
}
|
||||
|
||||
static void
|
||||
stub_init_delegate (MonoDelegate *del)
|
||||
stub_init_delegate (MonoDelegate *del, MonoError *error)
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
a3f36e4c8dd3d07809567960ad2afa58934260eb
|
||||
f708ef5d1ff991c7f508e12409f2ad4b9b18c1cc
|
||||
@ -1 +1 @@
|
||||
4f5461a7a3713b4e2199f95f0586196b0512f72d
|
||||
73c852006087d6db84f887814754c4593eb8cf83
|
||||
@ -1173,6 +1173,8 @@ mini_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSign
|
||||
!strcmp (cmethod_klass_name_space, "XamCore.ObjCRuntime") &&
|
||||
!strcmp (cmethod_klass_name, "Selector")) ||
|
||||
((!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.iOS") ||
|
||||
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.WatchOS") ||
|
||||
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.TVOS") ||
|
||||
!strcmp (cmethod_klass_image->assembly->aname.name, "Xamarin.Mac")) &&
|
||||
!strcmp (cmethod_klass_name_space, "ObjCRuntime") &&
|
||||
!strcmp (cmethod_klass_name, "Selector"))
|
||||
|
||||
@ -1 +1 @@
|
||||
b4e48873ea9699ddedb859bf10b9ff0a47d61a45
|
||||
3cc151ea061d7a33f92117c62a2f4940f433e9ee
|
||||
@ -1 +1 @@
|
||||
438aa6d7b5a20ce512ecb31cd610e36c5beadbc5
|
||||
b7ce24d3949d4ae2739d92cdf7156e46c67b3450
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/74cfbd2"
|
||||
#define FULL_VERSION "explicit/78e155f"
|
||||
|
||||
@ -129,6 +129,8 @@ rehash_table (MonoConcurrentHashTable *hash_table, int multiplier)
|
||||
mono_memory_barrier ();
|
||||
hash_table->table = new_table;
|
||||
hash_table->overflow_count = (int)(new_table->table_size * LOAD_FACTOR);
|
||||
hash_table->element_count -= hash_table->tombstone_count;
|
||||
hash_table->tombstone_count = 0;
|
||||
conc_table_lf_free (old_table);
|
||||
}
|
||||
|
||||
@ -351,12 +353,11 @@ mono_conc_hashtable_insert (MonoConcurrentHashTable *hash_table, gpointer key, g
|
||||
kvs [i].value = value;
|
||||
/* The write to values must happen after the write to keys */
|
||||
mono_memory_barrier ();
|
||||
kvs [i].key = key;
|
||||
if (kvs [i].key == TOMBSTONE)
|
||||
--hash_table->tombstone_count;
|
||||
else
|
||||
++hash_table->element_count;
|
||||
|
||||
kvs [i].key = key;
|
||||
return NULL;
|
||||
}
|
||||
if (key == kvs [i].key) {
|
||||
@ -372,11 +373,11 @@ mono_conc_hashtable_insert (MonoConcurrentHashTable *hash_table, gpointer key, g
|
||||
kvs [i].value = value;
|
||||
/* The write to values must happen after the write to keys */
|
||||
mono_memory_barrier ();
|
||||
kvs [i].key = key;
|
||||
if (kvs [i].key == TOMBSTONE)
|
||||
--hash_table->tombstone_count;
|
||||
else
|
||||
++hash_table->element_count;
|
||||
kvs [i].key = key;
|
||||
return NULL;
|
||||
}
|
||||
if (equal (key, kvs [i].key)) {
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
91f136d1cda98ed73e69a452ab6d9c23a81603d5
|
||||
6b614d5a360c59edb60a86a90cb6a9a53777a3f5
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
4ca9efc3c22d5f88173dd6f36d47a33bc7e99e87
|
||||
841d13511c689e73843458f3c12f7de1803ee1d1
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
b342a4bc3b6f812d720ca53bb897d70826b13773
|
||||
53bc05053515abf582bb864aa45dcb2bcb6759d3
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.20.0.232\n"
|
||||
"Project-Id-Version: mono 5.20.0.237\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-03-02 08:07+0000\n"
|
||||
"POT-Creation-Date: 2019-03-05 08:07+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 @@
|
||||
a850b58626adeb85a98ae7bf2e1f13442701b800
|
||||
c16fa2a8e0e8d0ef9e740328e6bf493dfd1d3bd0
|
||||
Loading…
x
Reference in New Issue
Block a user