Merge branch 'upstream'
Former-commit-id: 332727609407d986b6cc54e284626472e6dd3adb
This commit is contained in:
commit
f07de2f6cd
@ -1 +1 @@
|
||||
310ac57117e8e6a2f61ff9ea284aebe81b91dbac
|
||||
be51aee6a4d46467b01bdf54eb5f6eb66614e5ec
|
@ -1 +1 @@
|
||||
1a33c5856813c6bea4ec252379424c550a86e7a5
|
||||
3aeb6892849d7d4682e98abe8765e27839222204
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.4.0.142";
|
||||
public const string MonoVersion = "6.4.0.145";
|
||||
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 @@
|
||||
fffc7c21db4147a53b28c9e4a188907ea1247843
|
||||
19a09ef1500779ca93295004aa7b6e5e06a3320c
|
@ -1 +1 @@
|
||||
904a92cefe590f7327272b5c9250e4f4a4c8ff2f
|
||||
5054ed0c269199a26fe05ff617310bc9895def34
|
@ -1 +1 @@
|
||||
6ee24a6752578ff09a82cc49c4cdbc555183a0b9
|
||||
54dd7225f827974fcd98aefa502b691597841d6d
|
@ -1 +1 @@
|
||||
c9d22c5e39ffd06ceaf5fa47d3238ada91ad7cbd
|
||||
5d8d9cf840ff4b4f6818f5cec4bbe8f0198172e7
|
@ -1 +1 @@
|
||||
1c37f6fc8b240528d2d02c2bab4280413ef86555
|
||||
672a454a619bbdb3911ab154bac4dbb122a3432b
|
@ -1 +1 @@
|
||||
6f9b1e36920f6381f3c4ad31e7fa6f17f92e5062
|
||||
1eddd7e070f48a2e96a6c8109e888707ac30b4b5
|
@ -1 +1 @@
|
||||
33cfdcec5032f714321efaa4cd2e9a7afef55077
|
||||
8d6d7239c31b14adb44a703420d6073e6d314590
|
@ -1 +1 @@
|
||||
fffc7c21db4147a53b28c9e4a188907ea1247843
|
||||
19a09ef1500779ca93295004aa7b6e5e06a3320c
|
@ -1 +1 @@
|
||||
904a92cefe590f7327272b5c9250e4f4a4c8ff2f
|
||||
5054ed0c269199a26fe05ff617310bc9895def34
|
@ -1 +1 @@
|
||||
6ee24a6752578ff09a82cc49c4cdbc555183a0b9
|
||||
54dd7225f827974fcd98aefa502b691597841d6d
|
@ -1 +1 @@
|
||||
c9d22c5e39ffd06ceaf5fa47d3238ada91ad7cbd
|
||||
5d8d9cf840ff4b4f6818f5cec4bbe8f0198172e7
|
@ -1 +1 @@
|
||||
1c37f6fc8b240528d2d02c2bab4280413ef86555
|
||||
672a454a619bbdb3911ab154bac4dbb122a3432b
|
@ -1 +1 @@
|
||||
6f9b1e36920f6381f3c4ad31e7fa6f17f92e5062
|
||||
1eddd7e070f48a2e96a6c8109e888707ac30b4b5
|
@ -1 +1 @@
|
||||
11c50089e2d3d6b8f1c585f9b0438735a0aa44fc
|
||||
156909062540cb562993d7602039100e2f4678cd
|
@ -1 +1 @@
|
||||
33cfdcec5032f714321efaa4cd2e9a7afef55077
|
||||
8d6d7239c31b14adb44a703420d6073e6d314590
|
@ -1 +1 @@
|
||||
fffc7c21db4147a53b28c9e4a188907ea1247843
|
||||
19a09ef1500779ca93295004aa7b6e5e06a3320c
|
@ -1 +1 @@
|
||||
904a92cefe590f7327272b5c9250e4f4a4c8ff2f
|
||||
5054ed0c269199a26fe05ff617310bc9895def34
|
@ -1 +1 @@
|
||||
6ee24a6752578ff09a82cc49c4cdbc555183a0b9
|
||||
54dd7225f827974fcd98aefa502b691597841d6d
|
@ -1 +1 @@
|
||||
c9d22c5e39ffd06ceaf5fa47d3238ada91ad7cbd
|
||||
5d8d9cf840ff4b4f6818f5cec4bbe8f0198172e7
|
@ -1 +1 @@
|
||||
1c37f6fc8b240528d2d02c2bab4280413ef86555
|
||||
672a454a619bbdb3911ab154bac4dbb122a3432b
|
@ -1 +1 @@
|
||||
6f9b1e36920f6381f3c4ad31e7fa6f17f92e5062
|
||||
1eddd7e070f48a2e96a6c8109e888707ac30b4b5
|
@ -1 +1 @@
|
||||
11c50089e2d3d6b8f1c585f9b0438735a0aa44fc
|
||||
156909062540cb562993d7602039100e2f4678cd
|
@ -1 +1 @@
|
||||
33cfdcec5032f714321efaa4cd2e9a7afef55077
|
||||
8d6d7239c31b14adb44a703420d6073e6d314590
|
@ -1 +1 @@
|
||||
fffc7c21db4147a53b28c9e4a188907ea1247843
|
||||
19a09ef1500779ca93295004aa7b6e5e06a3320c
|
@ -1 +1 @@
|
||||
904a92cefe590f7327272b5c9250e4f4a4c8ff2f
|
||||
5054ed0c269199a26fe05ff617310bc9895def34
|
@ -1 +1 @@
|
||||
52a757f9095824011518feb21ced7d9da6935594
|
||||
9ea675c7b935f14232ad7ee52b4cf09a86477d32
|
@ -1 +1 @@
|
||||
c9d22c5e39ffd06ceaf5fa47d3238ada91ad7cbd
|
||||
5d8d9cf840ff4b4f6818f5cec4bbe8f0198172e7
|
@ -1 +1 @@
|
||||
1c37f6fc8b240528d2d02c2bab4280413ef86555
|
||||
672a454a619bbdb3911ab154bac4dbb122a3432b
|
@ -1 +1 @@
|
||||
6f9b1e36920f6381f3c4ad31e7fa6f17f92e5062
|
||||
1eddd7e070f48a2e96a6c8109e888707ac30b4b5
|
@ -1 +1 @@
|
||||
11c50089e2d3d6b8f1c585f9b0438735a0aa44fc
|
||||
156909062540cb562993d7602039100e2f4678cd
|
@ -1 +1 @@
|
||||
771b4d288f16667725b68b3ca56f37fe4b1174d5
|
||||
70738b2070f66daf356201615b8bfd00ea8d7489
|
@ -1 +1 @@
|
||||
84131ee44689dab68ed6e1bd2ac0f0e8dd24792e
|
||||
4ef0685b1c69c68502bec5a5a0241d405ad04275
|
@ -735,7 +735,8 @@ MonoCustomAttrInfo*
|
||||
mono_custom_attrs_from_builders (MonoImage *alloc_img, MonoImage *image, MonoArray* cattrs)
|
||||
{
|
||||
HANDLE_FUNCTION_ENTER ();
|
||||
HANDLE_FUNCTION_RETURN_VAL (mono_custom_attrs_from_builders_handle (alloc_img, image, MONO_HANDLE_NEW (MonoArray, cattrs)));
|
||||
MonoCustomAttrInfo* const result = mono_custom_attrs_from_builders_handle (alloc_img, image, MONO_HANDLE_NEW (MonoArray, cattrs));
|
||||
HANDLE_FUNCTION_RETURN_VAL (result);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -2045,7 +2046,7 @@ mono_reflection_get_custom_attrs_info (MonoObject *obj_raw)
|
||||
HANDLE_FUNCTION_ENTER ();
|
||||
ERROR_DECL (error);
|
||||
MONO_HANDLE_DCL (MonoObject, obj);
|
||||
MonoCustomAttrInfo *result = mono_reflection_get_custom_attrs_info_checked (obj, error);
|
||||
MonoCustomAttrInfo * const result = mono_reflection_get_custom_attrs_info_checked (obj, error);
|
||||
mono_error_assert_ok (error);
|
||||
HANDLE_FUNCTION_RETURN_VAL (result);
|
||||
}
|
||||
|
@ -263,7 +263,7 @@ mono_reflection_lookup_dynamic_token (MonoImage *image, guint32 token, gboolean
|
||||
|
||||
if (!handle_class)
|
||||
handle_class = &klass;
|
||||
gpointer result = mono_reflection_resolve_object_handle (image, obj, handle_class, context, error);
|
||||
gpointer const result = mono_reflection_resolve_object_handle (image, obj, handle_class, context, error);
|
||||
HANDLE_FUNCTION_RETURN_VAL (result);
|
||||
}
|
||||
#else /* DISABLE_REFLECTION_EMIT */
|
||||
|
@ -217,6 +217,8 @@ Icall macros
|
||||
MONO_RESTORE_WARNING
|
||||
|
||||
// Return a non-pointer or non-managed pointer, e.g. gboolean.
|
||||
// VAL should be a local variable or at least not use handles in the current frame.
|
||||
// i.e. it is "val", not "expr".
|
||||
#define HANDLE_FUNCTION_RETURN_VAL(VAL) \
|
||||
CLEAR_ICALL_FRAME; \
|
||||
return (VAL); \
|
||||
|
@ -1 +1 @@
|
||||
184854e32327ba82ad85996ecaa1d5b34cf3566f
|
||||
fdb814d235c46c345bc05186c95aa7013f34e6e1
|
@ -1 +1 @@
|
||||
a4787ee7961f01eb5c109094c930b920211e05ef
|
||||
a407eb4b93c0cf16f3f6f118b7eb57fee4b4c924
|
@ -1 +1 @@
|
||||
8cf94d30b51da5f556dcb61e4c4f4590bbd835d6
|
||||
19a34cd850dfabefa0002a7a689013fec3fd504e
|
@ -281,7 +281,7 @@ try_invoke_perform_wait_callback (MonoObject** exc, MonoError *error)
|
||||
{
|
||||
HANDLE_FUNCTION_ENTER ();
|
||||
error_init (error);
|
||||
MonoObject *res = mono_runtime_try_invoke (mono_defaults.threadpool_perform_wait_callback_method, NULL, NULL, exc, error);
|
||||
MonoObject * const res = mono_runtime_try_invoke (mono_defaults.threadpool_perform_wait_callback_method, NULL, NULL, exc, error);
|
||||
HANDLE_FUNCTION_RETURN_VAL (res);
|
||||
}
|
||||
|
||||
|
@ -1 +1 @@
|
||||
913f01ea4583e438cdaca45bb19d1d52d902b6a6
|
||||
e3d6a9ce398159b7c1be2dd91ee6e8d7562b8c6d
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/17ac7dc"
|
||||
#define FULL_VERSION "explicit/0c44ef1"
|
||||
|
@ -520,8 +520,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
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
d3aa9d2d0f9f6165c58b48df40c0180bac5c809e
|
||||
74736a2c68a3d7e6576a496cb215dd72dd648a54
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
1a9d98ec8a1b446c2895f22accd6ccd0679b311d
|
||||
066074723606faaadafef5558bdb274da7a5db60
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
c546dfd16fb15f56886b16a82fdc2cfcaefde4fe
|
||||
7923e6ce201939a8eb8be00f3e2ce9f543e7ef24
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.4.0.142\n"
|
||||
"Project-Id-Version: mono 6.4.0.145\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-07-30 08:14+0000\n"
|
||||
"POT-Creation-Date: 2019-07-31 08:05+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 @@
|
||||
608cad8a8f860c81920ac360c931e7a2821a2a2c
|
||||
2c3ce2e0172e5a63791f232fd7fcc957e856ceba
|
Loading…
x
Reference in New Issue
Block a user