Imported Upstream version 6.0.0.230

Former-commit-id: 9450812e31c8497fd04ad7836f3d6737a66e3d3e
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-05-10 08:53:12 +00:00
parent 724bdae0c1
commit f18ba2cf19
49 changed files with 56 additions and 46 deletions

View File

@ -1 +1 @@
68e2a845bb27480070695a60f4cdcb72a154a353
5c2286d69e2b1592a3bb7109af675eda2ab00fec

View File

@ -1 +1 @@
8518cfdd7136281b77dc008b86eb265159face89
c1d028a3fafdc23199df14719085e90004fa9dbb

View File

@ -2,7 +2,6 @@
import re
import os
import urlparse
import helix.azure_storage
import helix.event
import helix.settings
@ -72,7 +71,7 @@ def main():
log.info("Uploading results from {}".format(results_path))
with file(results_path) as result_file:
with open(results_path) as result_file:
test_count = 0
total_regex = re.compile(r'total="(\d+)"')
for line in result_file:

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.0.0.225";
public const string MonoVersion = "6.0.0.230";
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 @@
f04488d495bbf3bdb7ac1c319baf571a2141c1c2
8960a37d653039a939985a12347c4314a5a51024

View File

@ -1 +1 @@
b17aadeb6b78a99aee2b77511d9884efa77888bc
1bebbd31ba08fbb639edab2308d54067ca5a76e1

View File

@ -1 +1 @@
c34d118fd276336ad85062d6a6a6b3f6b7444fe7
e37edc7ec583cebdbb28a44448621959aac3b6d1

View File

@ -1 +1 @@
15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1
f98f7a0854157e74434ed6ca591d3f44cc05dfef

View File

@ -1 +1 @@
c24fee98d9f0992305b9b31d8b1625981c725589
a40550ce059f422b02b777ed7c4231143e9bc979

View File

@ -1 +1 @@
42696c6ba9f54675dbbbb5084800d59f8b67c8af
4d176567891a9d0c459c114f930995c889db0678

View File

@ -1 +1 @@
77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb
bfcd14f430932203f7ef13fb87df53c5d05b439e

View File

@ -1 +1 @@
f04488d495bbf3bdb7ac1c319baf571a2141c1c2
8960a37d653039a939985a12347c4314a5a51024

View File

@ -1 +1 @@
b17aadeb6b78a99aee2b77511d9884efa77888bc
1bebbd31ba08fbb639edab2308d54067ca5a76e1

View File

@ -1 +1 @@
c34d118fd276336ad85062d6a6a6b3f6b7444fe7
e37edc7ec583cebdbb28a44448621959aac3b6d1

View File

@ -1 +1 @@
15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1
f98f7a0854157e74434ed6ca591d3f44cc05dfef

View File

@ -1 +1 @@
c24fee98d9f0992305b9b31d8b1625981c725589
a40550ce059f422b02b777ed7c4231143e9bc979

View File

@ -1 +1 @@
42696c6ba9f54675dbbbb5084800d59f8b67c8af
4d176567891a9d0c459c114f930995c889db0678

View File

@ -1 +1 @@
77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb
bfcd14f430932203f7ef13fb87df53c5d05b439e

View File

@ -1 +1 @@
f04488d495bbf3bdb7ac1c319baf571a2141c1c2
8960a37d653039a939985a12347c4314a5a51024

View File

@ -1 +1 @@
b17aadeb6b78a99aee2b77511d9884efa77888bc
1bebbd31ba08fbb639edab2308d54067ca5a76e1

View File

@ -1 +1 @@
c34d118fd276336ad85062d6a6a6b3f6b7444fe7
e37edc7ec583cebdbb28a44448621959aac3b6d1

View File

@ -1 +1 @@
15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1
f98f7a0854157e74434ed6ca591d3f44cc05dfef

View File

@ -1 +1 @@
c24fee98d9f0992305b9b31d8b1625981c725589
a40550ce059f422b02b777ed7c4231143e9bc979

View File

@ -1 +1 @@
42696c6ba9f54675dbbbb5084800d59f8b67c8af
4d176567891a9d0c459c114f930995c889db0678

View File

@ -1 +1 @@
77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb
bfcd14f430932203f7ef13fb87df53c5d05b439e

View File

@ -1 +1 @@
f04488d495bbf3bdb7ac1c319baf571a2141c1c2
8960a37d653039a939985a12347c4314a5a51024

View File

@ -1 +1 @@
b17aadeb6b78a99aee2b77511d9884efa77888bc
1bebbd31ba08fbb639edab2308d54067ca5a76e1

View File

@ -1 +1 @@
87092b691830def4e85f37628c7856ebe6facf7f
48146a199e025221ce7fc4bfd2c0fd678030fbb7

View File

@ -1 +1 @@
15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1
f98f7a0854157e74434ed6ca591d3f44cc05dfef

View File

@ -1 +1 @@
c24fee98d9f0992305b9b31d8b1625981c725589
a40550ce059f422b02b777ed7c4231143e9bc979

View File

@ -1 +1 @@
42696c6ba9f54675dbbbb5084800d59f8b67c8af
4d176567891a9d0c459c114f930995c889db0678

View File

@ -1 +1 @@
646c6b3bbe88902f112aed3d9bb883481119b0ba
174dfbf25db5e6b10b5fd5f1b49bca573c82c754

View File

@ -1 +1 @@
8aef81dfbcb6dbe4d1a2738ceb63a5a6e85d381d
a3b722c5a7a6c61307413cfd8ad1935c3375452c

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/238d4a7"
#define FULL_VERSION "explicit/7361a4f"

View File

@ -1442,10 +1442,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@clean-local:
@HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

View File

@ -278,10 +278,21 @@ mono_valloc (void *addr, size_t length, int flags, MonoMemAccountType type)
#endif
#if defined(__APPLE__) && defined(MAP_JIT)
if ((flags & MONO_MMAP_JIT) && use_mmap_jit) {
if (get_darwin_version () >= DARWIN_VERSION_MOJAVE) {
mflags |= MAP_JIT;
if (get_darwin_version () >= DARWIN_VERSION_MOJAVE) {
/* Check for hardened runtime */
static int is_hardened_runtime;
if (is_hardened_runtime == 0 && !use_mmap_jit) {
ptr = mmap (NULL, getpagesize (), PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
if (ptr == MAP_FAILED) {
is_hardened_runtime = 1;
} else {
is_hardened_runtime = 2;
munmap (ptr, getpagesize ());
}
}
if ((flags & MONO_MMAP_JIT) && (use_mmap_jit || is_hardened_runtime == 1))
mflags |= MAP_JIT;
}
#endif

Binary file not shown.

View File

@ -1 +1 @@
1d9fd2ca414d3988f8d153c89c5f8480e9ef7adc
5433f25e97c078584a1666eb0ce05d91661fbd9a

Binary file not shown.

View File

@ -1 +1 @@
6e3b7581aab0f08723345ec5f37f2b37e7371147
6140c7aae46302ae3bc4c2a7628ab4269cf152e6

Binary file not shown.

View File

@ -1 +1 @@
6754a605cfed6fbf3c4b3e9e17f65ebc89503ac2
2e21cfde8d1bd3330c552b9079d2ae5e550b8b30

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.0.0.225\n"
"Project-Id-Version: mono 6.0.0.230\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-05-09 08:06+0000\n"
"POT-Creation-Date: 2019-05-10 08:11+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 @@
3a987177ca13076412bcfb54c09e6174de4bc831
1ff2bc910eb050e8b693283c718b164bf3ca86b9