Imported Upstream version 6.6.0.131

Former-commit-id: abd89e4657b7210a56ed85646ed35374fb3f4692
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-10-19 08:59:45 +00:00
parent 4edc784e8b
commit 617cd4d095
52 changed files with 108 additions and 51 deletions

View File

@ -170,6 +170,9 @@
/* Extension module enabled */
#undef ENABLE_EXTENSION_MODULE
/* ENABLE_GSS */
#undef ENABLE_GSS
/* Enable hybrid suspend for GC stop-the-world */
#undef ENABLE_HYBRID_SUSPEND

View File

@ -1 +1 @@
5ff3337832dd9373631c72289f1972a02ecaffe9
e63a80ab818ef0a46037803afb710be6ba0005c0

View File

@ -1 +1 @@
e745c73cd7c45328cc765d02bab525b7edb8d184
df71134b4bd3e4aed9d647417aa3330c4e9b3b4e

View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.6.0.129";
public const string MonoVersion = "6.6.0.131";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -25,3 +25,7 @@ ifdef PLATFORM_MACOS
MONO_FEATURE_APPLETLS=1
ENABLE_GSS=1
endif
ifeq ($(HOST_PLATFORM),linux)
ENABLE_GSS=1
endif

View File

@ -1 +1 @@
300722a98a05bc31dfb3f3fc97aaa86152d6626e
2a60a99140fc86dce86c936b58167fe78901347a

View File

@ -1 +1 @@
6ab34de67290bcc7a0088ecd8c8317e457e9bb61
dcd101068cd946291093bbd113d6e2d551d3cf42

View File

@ -1 +1 @@
0fb6236afda1dcfd99e4adca17530b21360700af
30fc7fab4ad97b7423a4b06e0081b2b217c19e3a

View File

@ -1 +1 @@
a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc
0b121317c7b73fcdf3e9a58f535d008d509fc37e

View File

@ -1 +1 @@
32f2b24aaa0b03c517b78e71da24e365056ee71f
ca81833a60fdf5e715648892e5f9ffa1d211a34f

View File

@ -1 +1 @@
2c1857d6aec99e5872da9a31885a3e7ff8d06ced
6680201b82f1dc7aa9b6ed727a066648c51d4632

View File

@ -1 +1 @@
e024162eae00395b415cd344e804a4ac0a841e3a
09d15444bec87738849c3420744a59e20724a05f

View File

@ -1 +1 @@
300722a98a05bc31dfb3f3fc97aaa86152d6626e
2a60a99140fc86dce86c936b58167fe78901347a

View File

@ -1 +1 @@
6ab34de67290bcc7a0088ecd8c8317e457e9bb61
dcd101068cd946291093bbd113d6e2d551d3cf42

View File

@ -1 +1 @@
0fb6236afda1dcfd99e4adca17530b21360700af
30fc7fab4ad97b7423a4b06e0081b2b217c19e3a

View File

@ -1 +1 @@
a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc
0b121317c7b73fcdf3e9a58f535d008d509fc37e

View File

@ -1 +1 @@
32f2b24aaa0b03c517b78e71da24e365056ee71f
ca81833a60fdf5e715648892e5f9ffa1d211a34f

View File

@ -1 +1 @@
2c1857d6aec99e5872da9a31885a3e7ff8d06ced
6680201b82f1dc7aa9b6ed727a066648c51d4632

View File

@ -1 +1 @@
70caf6f317b845757690c33fa4621758452fd86b
c644382c5fc1b4ef9c14b6f05e7119c1b9d4db31

View File

@ -1 +1 @@
e024162eae00395b415cd344e804a4ac0a841e3a
09d15444bec87738849c3420744a59e20724a05f

View File

@ -1 +1 @@
300722a98a05bc31dfb3f3fc97aaa86152d6626e
2a60a99140fc86dce86c936b58167fe78901347a

View File

@ -1 +1 @@
6ab34de67290bcc7a0088ecd8c8317e457e9bb61
dcd101068cd946291093bbd113d6e2d551d3cf42

View File

@ -1 +1 @@
0fb6236afda1dcfd99e4adca17530b21360700af
30fc7fab4ad97b7423a4b06e0081b2b217c19e3a

View File

@ -1 +1 @@
a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc
0b121317c7b73fcdf3e9a58f535d008d509fc37e

View File

@ -1 +1 @@
32f2b24aaa0b03c517b78e71da24e365056ee71f
ca81833a60fdf5e715648892e5f9ffa1d211a34f

View File

@ -1 +1 @@
2c1857d6aec99e5872da9a31885a3e7ff8d06ced
6680201b82f1dc7aa9b6ed727a066648c51d4632

View File

@ -1 +1 @@
70caf6f317b845757690c33fa4621758452fd86b
c644382c5fc1b4ef9c14b6f05e7119c1b9d4db31

View File

@ -1 +1 @@
e024162eae00395b415cd344e804a4ac0a841e3a
09d15444bec87738849c3420744a59e20724a05f

View File

@ -1 +1 @@
300722a98a05bc31dfb3f3fc97aaa86152d6626e
2a60a99140fc86dce86c936b58167fe78901347a

View File

@ -1 +1 @@
6ab34de67290bcc7a0088ecd8c8317e457e9bb61
dcd101068cd946291093bbd113d6e2d551d3cf42

View File

@ -1 +1 @@
a6e3dd850207b906f007f26645603201afe2cfc8
773b2ec168d395f5a7180399463f7c94390efb23

View File

@ -1 +1 @@
a1eaa2f68f534f2c4b2ee4b1f772f15b1b67bdcc
0b121317c7b73fcdf3e9a58f535d008d509fc37e

View File

@ -1 +1 @@
32f2b24aaa0b03c517b78e71da24e365056ee71f
ca81833a60fdf5e715648892e5f9ffa1d211a34f

View File

@ -1 +1 @@
2c1857d6aec99e5872da9a31885a3e7ff8d06ced
6680201b82f1dc7aa9b6ed727a066648c51d4632

View File

@ -1 +1 @@
70caf6f317b845757690c33fa4621758452fd86b
c644382c5fc1b4ef9c14b6f05e7119c1b9d4db31

View File

@ -1 +1 @@
f4f22c4d91fac636ef3fc03f2dd022850d2000fa
a6b850c30bb967d6492550a5a2c17e0ef20b62ed

View File

@ -1 +1 @@
86ecaa47c7f867e5b29965754d7a50db8a44ab20
ea90d87c4867a8666ada8acae9f8d44ef95a18b8

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/3eb5f34"
#define FULL_VERSION "explicit/01dbbb7"

View File

@ -108,7 +108,7 @@ gss_sources = \
if ENABLE_GSS
macos_sources += $(gss_sources)
linux_sources += $(gss_sources)
ios_sources += $(gss_sources)
endif

View File

@ -1 +1 @@
2f3eaa05094ac9a86d197c8556c0e3aad479ada3
0b394286f326b2b950382465c8f0c9321d6e55ef

View File

@ -1 +1 @@
d4c5ade0115bacd247cf653ad240071353de96de
97c19db3f16ae75ca00ace17486cf403b7ae5bcc

View File

@ -55,13 +55,22 @@ public class Tests {
[DllImport ("libtest", EntryPoint="mono_safe_handle_ref")]
public static extern void mono_safe_handle_ref2 (ref MyHandleNoCtor handle);
[DllImport ("libtest", EntryPoint="mono_safe_handle_ref_nomod")]
public static extern IntPtr mono_safe_handle_ref_nomod_in (in MyHandle handle);
[DllImport ("libtest", EntryPoint="mono_safe_handle_ref_nomod")]
public static extern IntPtr mono_safe_handle_ref_nomod_out (out MyHandle handle);
[DllImport ("libtest", EntryPoint="mono_safe_handle_ref_nomod")]
public static extern IntPtr mono_safe_handle_ref_nomod_ref (ref MyHandle handle);
public static int test_0_safehandle_ref_noctor ()
{
MyHandleNoCtor m = new MyHandleNoCtor ((IntPtr) 0xdead);
try {
mono_safe_handle_ref2 (ref m);
} catch (MissingMethodException e){
} catch (MissingMethodException) {
Console.WriteLine ("Good: got exception requried");
return 0;
}
@ -72,6 +81,7 @@ public class Tests {
public static int test_0_safehandle_ref ()
{
MyHandle m = new MyHandle ((IntPtr) 0xdead);
MyHandle m_saved = m;
mono_safe_handle_ref (ref m);
@ -79,10 +89,50 @@ public class Tests {
Console.WriteLine ("test_0_safehandle_ref: fail; Expected 0x800d, got: {0:x}", m.DangerousGetHandle ());
return 1;
}
if (m == m_saved) {
Console.WriteLine ("test_0_safehandle_ref: fail; Expected new SafeHandle on return");
return 2;
}
Console.WriteLine ("test_0_safehandle_ref: pass");
return 0;
}
public static int test_0_safehandle_ref_nomod_in ()
{
MyHandle m = new MyHandle ((IntPtr) 0xdead);
IntPtr ret = mono_safe_handle_ref_nomod_in (in m);
return ret == (IntPtr) 0xdead ? 0 : 1;
}
public static int test_0_safehandle_ref_nomod_out ()
{
MyHandle m;
IntPtr ret = mono_safe_handle_ref_nomod_out (out m);
return ret == IntPtr.Zero ? 0 : 1;
}
public static int test_0_safehandle_ref_nomod_ref ()
{
MyHandle m = new MyHandle ((IntPtr) 0xdead);
MyHandle m_saved = m;
IntPtr ret = mono_safe_handle_ref_nomod_ref (ref m);
if (ret != (IntPtr) 0xdead) {
Console.WriteLine ("test_0_safehandle_ref_nomod_ref: fail; Expected 0xdead, got {0:x}", ret);
return 1;
}
if (m != m_saved) {
Console.WriteLine ("test_0_safehandle_ref_nomod_ref: fail; Expected same SafeHandle on input and output");
return 2;
}
if (m.DangerousGetHandle () != (IntPtr) 0xdead) {
Console.WriteLine ("test_0_safehandle_ref_nomod_ref: fail; Expected 0xdead, got {0:x}", m.DangerousGetHandle ());
return 3;
}
return 0;
}
[DllImport ("libtest")]
public static extern int mono_xr (SafeHandle sh);
@ -105,12 +155,12 @@ public class Tests {
}
[StructLayout (LayoutKind.Sequential)]
[StructLayout (LayoutKind.Sequential)]
public struct StringOnStruct {
public string a;
}
[StructLayout (LayoutKind.Sequential)]
[StructLayout (LayoutKind.Sequential)]
public struct StructTest {
public int a;
public SafeHandle handle1;
@ -118,7 +168,7 @@ public class Tests {
public int b;
}
[StructLayout (LayoutKind.Sequential)]
[StructLayout (LayoutKind.Sequential)]
public struct StructTest1 {
public SafeHandle a;
}

View File

@ -1496,10 +1496,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 \

Binary file not shown.

View File

@ -1 +1 @@
cd2ee4f457d612eef9e14287cac43ba7089669f2
e0c2b3284cbaacfee200eeea19997d8d57c5baa4

Binary file not shown.

View File

@ -1 +1 @@
4d3a86a1e872b378c8910c237e0dd4a3c37bfb25
b52180d02661eda1bcd33c853f80dbc6d4ca48b1

Binary file not shown.

View File

@ -1 +1 @@
edda0118e4f4d795d59607753344f59a48c2f708
ce9e2bce529f8a6a704e0810216525a1601744a7

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.6.0.129\n"
"Project-Id-Version: mono 6.6.0.131\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-10-17 08:32+0000\n"
"POT-Creation-Date: 2019-10-19 08:32+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"

Binary file not shown.

View File

@ -1 +1 @@
07afc155f6e9ad9a685a188a70238ca92c219768
1bd1876df90eaf8eaf78a38695510c2cae20aac8