Merge branch 'upstream'

Former-commit-id: 480210fa9cdd5cce1d22d8973d5f391d5299288c
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-10-22 08:35:05 +00:00
commit d8d522ad55
47 changed files with 57 additions and 39 deletions

View File

@ -1 +1 @@
94ed6d6aa3a39f0a2d844de937d6d5672e204248
e7676284a28529def2313ff3d9d16399599feb5a

View File

@ -1 +1 @@
046bdfaafd8d462c64dee0ce538b63baed899c0b
57aea1ddfca9ac0e28658115f2e9d64af595dea2

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.18.0.169";
public const string MonoVersion = "5.18.0.170";
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

@ -1 +1 @@
540d114a92a41cc7ac3ed228b3bb6aedad59e801
9fd23fb5d11f48db3c6617281544330923c0fb4f

View File

@ -1 +1 @@
ed2882ad95de0cc502243aa733b10de59dcf969e
34119802dd4c3fb18352e9841c78ae89bb9bf8b5

View File

@ -1 +1 @@
a7e54246e1aa9a8a3dd148e587410706fc3e85c7
6085ab7d0fcc015d403fc80ec1919c010d57d7b9

View File

@ -1 +1 @@
2467a38e74764a85a81a0f405dd69eba69285306
7461f44dc8fba16c94aae0b77f90a2c244abbbf3

View File

@ -1 +1 @@
a34769007b43b981e9663f6a7bca50247adfb246
e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5

View File

@ -1 +1 @@
771a0a31fff0ceb4e0b58f5e4e590f2e6a1483da
3f39704c9ca7c7c843c26e835dac8242d2fbea2d

View File

@ -1 +1 @@
043eb2b709e4118eb66a505b08f90a9d34316822
39d2084efa771325cbde99e8772fa026c5a276a9

View File

@ -1 +1 @@
540d114a92a41cc7ac3ed228b3bb6aedad59e801
9fd23fb5d11f48db3c6617281544330923c0fb4f

View File

@ -1 +1 @@
ed2882ad95de0cc502243aa733b10de59dcf969e
34119802dd4c3fb18352e9841c78ae89bb9bf8b5

View File

@ -1 +1 @@
a7e54246e1aa9a8a3dd148e587410706fc3e85c7
6085ab7d0fcc015d403fc80ec1919c010d57d7b9

View File

@ -1 +1 @@
2467a38e74764a85a81a0f405dd69eba69285306
7461f44dc8fba16c94aae0b77f90a2c244abbbf3

View File

@ -1 +1 @@
a34769007b43b981e9663f6a7bca50247adfb246
e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5

View File

@ -1 +1 @@
771a0a31fff0ceb4e0b58f5e4e590f2e6a1483da
3f39704c9ca7c7c843c26e835dac8242d2fbea2d

View File

@ -1 +1 @@
043eb2b709e4118eb66a505b08f90a9d34316822
39d2084efa771325cbde99e8772fa026c5a276a9

View File

@ -1 +1 @@
540d114a92a41cc7ac3ed228b3bb6aedad59e801
9fd23fb5d11f48db3c6617281544330923c0fb4f

View File

@ -1 +1 @@
ed2882ad95de0cc502243aa733b10de59dcf969e
34119802dd4c3fb18352e9841c78ae89bb9bf8b5

View File

@ -1 +1 @@
a7e54246e1aa9a8a3dd148e587410706fc3e85c7
6085ab7d0fcc015d403fc80ec1919c010d57d7b9

View File

@ -1 +1 @@
2467a38e74764a85a81a0f405dd69eba69285306
7461f44dc8fba16c94aae0b77f90a2c244abbbf3

View File

@ -1 +1 @@
a34769007b43b981e9663f6a7bca50247adfb246
e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5

View File

@ -1 +1 @@
771a0a31fff0ceb4e0b58f5e4e590f2e6a1483da
3f39704c9ca7c7c843c26e835dac8242d2fbea2d

View File

@ -1 +1 @@
043eb2b709e4118eb66a505b08f90a9d34316822
39d2084efa771325cbde99e8772fa026c5a276a9

View File

@ -1 +1 @@
540d114a92a41cc7ac3ed228b3bb6aedad59e801
9fd23fb5d11f48db3c6617281544330923c0fb4f

View File

@ -1 +1 @@
ed2882ad95de0cc502243aa733b10de59dcf969e
34119802dd4c3fb18352e9841c78ae89bb9bf8b5

View File

@ -1 +1 @@
a7e54246e1aa9a8a3dd148e587410706fc3e85c7
6085ab7d0fcc015d403fc80ec1919c010d57d7b9

View File

@ -1 +1 @@
2467a38e74764a85a81a0f405dd69eba69285306
7461f44dc8fba16c94aae0b77f90a2c244abbbf3

View File

@ -1 +1 @@
a34769007b43b981e9663f6a7bca50247adfb246
e345e8ae7cfdaf1de6c2d39fa6acc5db054593d5

View File

@ -1 +1 @@
771a0a31fff0ceb4e0b58f5e4e590f2e6a1483da
3f39704c9ca7c7c843c26e835dac8242d2fbea2d

View File

@ -1 +1 @@
043eb2b709e4118eb66a505b08f90a9d34316822
39d2084efa771325cbde99e8772fa026c5a276a9

View File

@ -421,6 +421,24 @@ public class BuiltinTests {
return 0;
}
static int NuintConstructor (nuint cap)
{
if (cap > (ulong) nint.MaxValue)
return 1;
return 0;
}
/* resembles https://github.com/xamarin/xamarin-macios/blob/bc492585d137d8c3d3a2ffc827db3cdaae3cc869/tests/monotouch-test/Foundation/MutableDataTest.cs#L62-L89 */
static int test_0_nint_maxintcmp ()
{
/* does not work on 32bit */
if (IntPtr.Size == 4)
return 0;
uint cap = (uint) Int32.MaxValue + 2;
return NuintConstructor (cap);
}
static int test_0_nuint_ctor ()
{

View File

@ -1 +1 @@
98063ae908dc2d45f5965d523b08eedfd50c1a05
bf983dbc7462d8db220cf3b14b4369b0e28b72a6

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/145155d"
#define FULL_VERSION "explicit/d7dcd45"

Binary file not shown.

View File

@ -1 +1 @@
abe117ac87b9aca4cc4d58c2bd66dc4d1b6bdf61
5e821d27b7af7f50711b910568945cb723b79cd0

Binary file not shown.

View File

@ -1 +1 @@
4609e2de64e9c3b675d97898a360721a9db8db60
1870abcb201ac6b07ff63b096b2573738824de31

Binary file not shown.

View File

@ -1 +1 @@
35fd44fbe2dbcdeafa85e80ccfe26ac90679d5b5
31f00599305f2986164407653773487d6b4b6413

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.18.0.169\n"
"Project-Id-Version: mono 5.18.0.170\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-10-21 08:08+0000\n"
"POT-Creation-Date: 2018-10-22 08:12+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 @@
8f7fbf293b73352a5fd6d044fe41412b73f751cf
f4f705d44e83353a50f50096ab2fe8f11d4f2af5