Merge branch 'upstream'
Former-commit-id: 0146e0591ea6a5a5b351c5f4f1009d466ab59707
This commit is contained in:
commit
816b42ea6d
@ -1 +1 @@
|
||||
5eb529b799f9174122e0474702a3887026dc42f7
|
||||
883755a49375ef8272a1c19782d40e035299c2e0
|
@ -1 +1 @@
|
||||
59551571a15d05ef6461e45f29ba1fb7a7d7ea5e
|
||||
2523cade2c9862ced1a879f3bf34273c2df49083
|
@ -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.77";
|
||||
public const string MonoVersion = "6.8.0.78";
|
||||
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 @@
|
||||
81f2049c3abbb7269d7ab51715b10359057bad0e
|
||||
b1c3fa6d2f379f9a44cbfd12b5a8e40aa4445d39
|
@ -1 +1 @@
|
||||
670b802985b0515833d839bf3d435d7280968746
|
||||
941de9b5276b4fb19e62a1e7102d8d6125e57c70
|
@ -1 +1 @@
|
||||
43c2b4e532082828ddc2bdb0c89a12a8a89945c1
|
||||
99cecb8ad4491b12dc57dcd0ff72c00294a6c240
|
@ -1 +1 @@
|
||||
9db6d6d638d0fdc2ac977b7e039db9658904e84d
|
||||
91f9fb35cd271fd30a8b539e65d90c41ead8d627
|
@ -1 +1 @@
|
||||
acd1132f7ea20a6b86ace502217734983ff839c2
|
||||
429a44da845726e63670c71870a4d35bcb520b62
|
@ -1 +1 @@
|
||||
8abbfc6d64ae3a7ea550a726701b8fc86c47c979
|
||||
9e7f5d9cc7f7b58c6ef529ecf953ba122dda560b
|
@ -1 +1 @@
|
||||
72d0a809e9b81b85d159f6782f5e3c86bba900bf
|
||||
d7e0d6fb91c204316a7098226601b279cd7cdf43
|
@ -1 +1 @@
|
||||
79ce3f2b0493d36c6811ab43f20eb33da7a4f140
|
||||
ad5c93ab83b6f4321e10a4627561e4a49906751b
|
@ -1 +1 @@
|
||||
81f2049c3abbb7269d7ab51715b10359057bad0e
|
||||
b1c3fa6d2f379f9a44cbfd12b5a8e40aa4445d39
|
@ -1 +1 @@
|
||||
670b802985b0515833d839bf3d435d7280968746
|
||||
941de9b5276b4fb19e62a1e7102d8d6125e57c70
|
@ -1 +1 @@
|
||||
43c2b4e532082828ddc2bdb0c89a12a8a89945c1
|
||||
99cecb8ad4491b12dc57dcd0ff72c00294a6c240
|
@ -1 +1 @@
|
||||
9db6d6d638d0fdc2ac977b7e039db9658904e84d
|
||||
91f9fb35cd271fd30a8b539e65d90c41ead8d627
|
@ -1 +1 @@
|
||||
acd1132f7ea20a6b86ace502217734983ff839c2
|
||||
429a44da845726e63670c71870a4d35bcb520b62
|
@ -1 +1 @@
|
||||
8abbfc6d64ae3a7ea550a726701b8fc86c47c979
|
||||
9e7f5d9cc7f7b58c6ef529ecf953ba122dda560b
|
@ -1 +1 @@
|
||||
72d0a809e9b81b85d159f6782f5e3c86bba900bf
|
||||
d7e0d6fb91c204316a7098226601b279cd7cdf43
|
@ -1 +1 @@
|
||||
79ce3f2b0493d36c6811ab43f20eb33da7a4f140
|
||||
ad5c93ab83b6f4321e10a4627561e4a49906751b
|
@ -1 +1 @@
|
||||
81f2049c3abbb7269d7ab51715b10359057bad0e
|
||||
b1c3fa6d2f379f9a44cbfd12b5a8e40aa4445d39
|
@ -1 +1 @@
|
||||
670b802985b0515833d839bf3d435d7280968746
|
||||
941de9b5276b4fb19e62a1e7102d8d6125e57c70
|
@ -1 +1 @@
|
||||
43c2b4e532082828ddc2bdb0c89a12a8a89945c1
|
||||
99cecb8ad4491b12dc57dcd0ff72c00294a6c240
|
@ -1 +1 @@
|
||||
9db6d6d638d0fdc2ac977b7e039db9658904e84d
|
||||
91f9fb35cd271fd30a8b539e65d90c41ead8d627
|
@ -1 +1 @@
|
||||
acd1132f7ea20a6b86ace502217734983ff839c2
|
||||
429a44da845726e63670c71870a4d35bcb520b62
|
@ -1 +1 @@
|
||||
8abbfc6d64ae3a7ea550a726701b8fc86c47c979
|
||||
9e7f5d9cc7f7b58c6ef529ecf953ba122dda560b
|
@ -1 +1 @@
|
||||
72d0a809e9b81b85d159f6782f5e3c86bba900bf
|
||||
d7e0d6fb91c204316a7098226601b279cd7cdf43
|
@ -1 +1 @@
|
||||
79ce3f2b0493d36c6811ab43f20eb33da7a4f140
|
||||
ad5c93ab83b6f4321e10a4627561e4a49906751b
|
@ -1 +1 @@
|
||||
81f2049c3abbb7269d7ab51715b10359057bad0e
|
||||
b1c3fa6d2f379f9a44cbfd12b5a8e40aa4445d39
|
@ -1 +1 @@
|
||||
670b802985b0515833d839bf3d435d7280968746
|
||||
941de9b5276b4fb19e62a1e7102d8d6125e57c70
|
@ -1 +1 @@
|
||||
1a66f71c3bb574a7f9d2d08a71de07bb9b3d6466
|
||||
c22550669e6d927c4833b747763e260b972517d8
|
@ -1 +1 @@
|
||||
9db6d6d638d0fdc2ac977b7e039db9658904e84d
|
||||
91f9fb35cd271fd30a8b539e65d90c41ead8d627
|
@ -1 +1 @@
|
||||
acd1132f7ea20a6b86ace502217734983ff839c2
|
||||
429a44da845726e63670c71870a4d35bcb520b62
|
@ -1 +1 @@
|
||||
8abbfc6d64ae3a7ea550a726701b8fc86c47c979
|
||||
9e7f5d9cc7f7b58c6ef529ecf953ba122dda560b
|
@ -1 +1 @@
|
||||
72d0a809e9b81b85d159f6782f5e3c86bba900bf
|
||||
d7e0d6fb91c204316a7098226601b279cd7cdf43
|
@ -1 +1 @@
|
||||
1f109495d33a8d9fee4fa6f91909a167c684fdcb
|
||||
420b87729800074ea6689224e849ef0a94fdc765
|
@ -1 +1 @@
|
||||
20f61293e61a78ef7bdba3de480886d23e8f9ffe
|
||||
160d330a62101af0d2f822e0026a87f71f6e63ff
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/25f7937"
|
||||
#define FULL_VERSION "explicit/8f396bb"
|
||||
|
@ -269,6 +269,12 @@ public class Tests
|
||||
[DllImport("libtest")]
|
||||
public static extern int mono_test_cominterop_ccw_queryinterface ([MarshalAs (UnmanagedType.Interface)] IOtherTest itest);
|
||||
|
||||
[DllImport("libtest")]
|
||||
public static extern int mono_test_cominterop_ccw_queryinterface_foreign_thread ([MarshalAs (UnmanagedType.Interface)] ITest itest);
|
||||
|
||||
[DllImport ("libtest")]
|
||||
public static extern int mono_test_cominterop_ccw_itest_foreign_thread ([MarshalAs (UnmanagedType.Interface)] ITest itest);
|
||||
|
||||
[DllImport("libtest")]
|
||||
public static extern int mono_test_marshal_safearray_out_1dim_vt_bstr_empty ([MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
|
||||
|
||||
@ -598,6 +604,7 @@ public class Tests
|
||||
if (mono_test_cominterop_ccw_queryinterface (otherTest) != 0)
|
||||
return 202;
|
||||
|
||||
|
||||
if (mono_test_marshal_retval_ccw_itest(test, true) != 0)
|
||||
return 203;
|
||||
|
||||
@ -608,6 +615,19 @@ public class Tests
|
||||
if (mono_test_default_interface_ccw(test) != 0)
|
||||
return 205;
|
||||
|
||||
if (mono_test_cominterop_ccw_queryinterface_foreign_thread (test) != 0)
|
||||
return 206;
|
||||
|
||||
{
|
||||
ManagedTest mt = new ManagedTest ();
|
||||
if (mono_test_cominterop_ccw_itest_foreign_thread (test) != 0)
|
||||
return 207;
|
||||
if (mt.Status != 0) {
|
||||
Console.Error.WriteLine ("after mono_test_cominterop_ccw_itest_foreign_thread Status = {0}", mt.Status);
|
||||
return 208;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion // COM Callable Wrapper Tests
|
||||
|
||||
#region SAFEARRAY tests
|
||||
|
@ -1 +1 @@
|
||||
2b80cd95a39b1b425bc936099f61e712280076cd
|
||||
5498541d7c486a19f43114f0cbcfb6030407b08a
|
@ -1598,10 +1598,10 @@ 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."
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
30f651b603d1f97a704100b8d490dd90967e7704
|
||||
51e20a3f16590848d84073edbfda394baa744861
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
d04d7cee67c7b627349a353cfe94a4c19222842b
|
||||
22208df067a4385c8fd6e9db33564711f1f0549b
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
2558e30d25e11d90e19fb82b304f673f393fddac
|
||||
4ce9fcce20e3099838573e7906eff6d584dc634b
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.8.0.77\n"
|
||||
"Project-Id-Version: mono 6.8.0.78\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-12-14 08:08+0000\n"
|
||||
"POT-Creation-Date: 2019-12-17 08:10+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 @@
|
||||
64b323d93d026419c9c6c5cce871e1c7ad08281a
|
||||
371cd88eda9cd45dfe435ed3b474339d059dc4a8
|
Loading…
x
Reference in New Issue
Block a user