From f18ba2cf19d3e51882d358f4b993f1391439a523 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Fri, 10 May 2019 08:53:12 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.230 Former-commit-id: 9450812e31c8497fd04ad7836f3d6737a66e3d3e --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- external/helix-binaries/xunit-reporter.py | 3 +-- mcs/build/common/Consts.cs | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Core.dll.REMOVED.git-id | 2 +- .../System.IO.Compression.dll | Bin 99328 -> 99328 bytes .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.REMOVED.git-id | 2 +- .../mcs.exe.REMOVED.git-id | 2 +- .../mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/mini-exceptions.c.REMOVED.git-id | 2 +- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 ++-- mono/utils/mono-mmap.c | 17 ++++++++++++++--- po/mcs/de.gmo | Bin 5406 -> 5406 bytes po/mcs/de.po.REMOVED.git-id | 2 +- po/mcs/es.gmo | Bin 16329 -> 16329 bytes po/mcs/es.po.REMOVED.git-id | 2 +- po/mcs/ja.gmo | Bin 20863 -> 20863 bytes po/mcs/ja.po.REMOVED.git-id | 2 +- po/mcs/mcs.pot | 4 ++-- po/mcs/pt_BR.gmo | Bin 72806 -> 72806 bytes po/mcs/pt_BR.po.REMOVED.git-id | 2 +- 49 files changed, 56 insertions(+), 46 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 12efc66511..5adf6301bc 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -68e2a845bb27480070695a60f4cdcb72a154a353 \ No newline at end of file +5c2286d69e2b1592a3bb7109af675eda2ab00fec \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index d8bdbd6371..8fadeb04e6 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -8518cfdd7136281b77dc008b86eb265159face89 \ No newline at end of file +c1d028a3fafdc23199df14719085e90004fa9dbb \ No newline at end of file diff --git a/external/helix-binaries/xunit-reporter.py b/external/helix-binaries/xunit-reporter.py index e1b41fc9a9..71312aa3a6 100644 --- a/external/helix-binaries/xunit-reporter.py +++ b/external/helix-binaries/xunit-reporter.py @@ -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: diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 57c3ccc6cf..67f2c19144 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -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"; diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index f9d3d6e9c2..0415a3a517 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f04488d495bbf3bdb7ac1c319baf571a2141c1c2 \ No newline at end of file +8960a37d653039a939985a12347c4314a5a51024 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index d2c41a4a7e..a11fbb3fa9 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -b17aadeb6b78a99aee2b77511d9884efa77888bc \ No newline at end of file +1bebbd31ba08fbb639edab2308d54067ca5a76e1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index dcfe3080e7..0aba65be92 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c34d118fd276336ad85062d6a6a6b3f6b7444fe7 \ No newline at end of file +e37edc7ec583cebdbb28a44448621959aac3b6d1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index ba2ce6e4d8b8f629bce655ff5826dbbf1bc31919..2eb932446ec464099e8d90e60fa4484c4ec81609 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ=&A9zfsD0`0W=H{H_1?d<2&O+igAK3Y2FKex6lj$uLcD( S05AY5m!N$CDz~l^0a9=fuosvB delta 60 zcmV-C0K@-)hz5X&29SsZ&vVK7fsD0`0W=H{mb+U>pDa^BvhY53gv<&nx6lj$uLcD& S05t$Am!N$CDz~l^0a9@KuonXW diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index d78ac57236..e4f8f9aa86 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1 \ No newline at end of file +f98f7a0854157e74434ed6ca591d3f44cc05dfef \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 0783235c53..156a980ef5 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c24fee98d9f0992305b9b31d8b1625981c725589 \ No newline at end of file +a40550ce059f422b02b777ed7c4231143e9bc979 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 40e191ca56..8b4801ee9d 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -42696c6ba9f54675dbbbb5084800d59f8b67c8af \ No newline at end of file +4d176567891a9d0c459c114f930995c889db0678 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index c8e0455bdf..35f5d6ad79 100644 --- a/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb \ No newline at end of file +bfcd14f430932203f7ef13fb87df53c5d05b439e \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index f9d3d6e9c2..0415a3a517 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f04488d495bbf3bdb7ac1c319baf571a2141c1c2 \ No newline at end of file +8960a37d653039a939985a12347c4314a5a51024 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index d2c41a4a7e..a11fbb3fa9 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -b17aadeb6b78a99aee2b77511d9884efa77888bc \ No newline at end of file +1bebbd31ba08fbb639edab2308d54067ca5a76e1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index dcfe3080e7..0aba65be92 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c34d118fd276336ad85062d6a6a6b3f6b7444fe7 \ No newline at end of file +e37edc7ec583cebdbb28a44448621959aac3b6d1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index ba2ce6e4d8b8f629bce655ff5826dbbf1bc31919..2eb932446ec464099e8d90e60fa4484c4ec81609 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ=&A9zfsD0`0W=H{H_1?d<2&O+igAK3Y2FKex6lj$uLcD( S05AY5m!N$CDz~l^0a9=fuosvB delta 60 zcmV-C0K@-)hz5X&29SsZ&vVK7fsD0`0W=H{mb+U>pDa^BvhY53gv<&nx6lj$uLcD& S05t$Am!N$CDz~l^0a9@KuonXW diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index d78ac57236..e4f8f9aa86 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1 \ No newline at end of file +f98f7a0854157e74434ed6ca591d3f44cc05dfef \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 0783235c53..156a980ef5 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c24fee98d9f0992305b9b31d8b1625981c725589 \ No newline at end of file +a40550ce059f422b02b777ed7c4231143e9bc979 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 40e191ca56..8b4801ee9d 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -42696c6ba9f54675dbbbb5084800d59f8b67c8af \ No newline at end of file +4d176567891a9d0c459c114f930995c889db0678 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index c8e0455bdf..35f5d6ad79 100644 --- a/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb \ No newline at end of file +bfcd14f430932203f7ef13fb87df53c5d05b439e \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index f9d3d6e9c2..0415a3a517 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f04488d495bbf3bdb7ac1c319baf571a2141c1c2 \ No newline at end of file +8960a37d653039a939985a12347c4314a5a51024 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index d2c41a4a7e..a11fbb3fa9 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -b17aadeb6b78a99aee2b77511d9884efa77888bc \ No newline at end of file +1bebbd31ba08fbb639edab2308d54067ca5a76e1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index dcfe3080e7..0aba65be92 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -c34d118fd276336ad85062d6a6a6b3f6b7444fe7 \ No newline at end of file +e37edc7ec583cebdbb28a44448621959aac3b6d1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index ba2ce6e4d8b8f629bce655ff5826dbbf1bc31919..2eb932446ec464099e8d90e60fa4484c4ec81609 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ=&A9zfsD0`0W=H{H_1?d<2&O+igAK3Y2FKex6lj$uLcD( S05AY5m!N$CDz~l^0a9=fuosvB delta 60 zcmV-C0K@-)hz5X&29SsZ&vVK7fsD0`0W=H{mb+U>pDa^BvhY53gv<&nx6lj$uLcD& S05t$Am!N$CDz~l^0a9@KuonXW diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index d78ac57236..e4f8f9aa86 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1 \ No newline at end of file +f98f7a0854157e74434ed6ca591d3f44cc05dfef \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 0783235c53..156a980ef5 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c24fee98d9f0992305b9b31d8b1625981c725589 \ No newline at end of file +a40550ce059f422b02b777ed7c4231143e9bc979 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 40e191ca56..8b4801ee9d 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -42696c6ba9f54675dbbbb5084800d59f8b67c8af \ No newline at end of file +4d176567891a9d0c459c114f930995c889db0678 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index c8e0455bdf..35f5d6ad79 100644 --- a/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -77e0e45a2a98bbdb0f0f9aecb1c75608ab4430eb \ No newline at end of file +bfcd14f430932203f7ef13fb87df53c5d05b439e \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id index f9d3d6e9c2..0415a3a517 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f04488d495bbf3bdb7ac1c319baf571a2141c1c2 \ No newline at end of file +8960a37d653039a939985a12347c4314a5a51024 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id index d2c41a4a7e..a11fbb3fa9 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -b17aadeb6b78a99aee2b77511d9884efa77888bc \ No newline at end of file +1bebbd31ba08fbb639edab2308d54067ca5a76e1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id index 31ec2ab365..cc6c401467 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -87092b691830def4e85f37628c7856ebe6facf7f \ No newline at end of file +48146a199e025221ce7fc4bfd2c0fd678030fbb7 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.IO.Compression.dll index ba2ce6e4d8b8f629bce655ff5826dbbf1bc31919..2eb932446ec464099e8d90e60fa4484c4ec81609 100644 GIT binary patch delta 60 zcmV-C0K@-)hz5X&29SsZ=&A9zfsD0`0W=H{H_1?d<2&O+igAK3Y2FKex6lj$uLcD( S05AY5m!N$CDz~l^0a9=fuosvB delta 60 zcmV-C0K@-)hz5X&29SsZ&vVK7fsD0`0W=H{mb+U>pDa^BvhY53gv<&nx6lj$uLcD& S05t$Am!N$CDz~l^0a9@KuonXW diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id index d78ac57236..e4f8f9aa86 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -15b36dcfcbdfbcf409bdc8d146d53b8a0c4aa6b1 \ No newline at end of file +f98f7a0854157e74434ed6ca591d3f44cc05dfef \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id index 0783235c53..156a980ef5 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c24fee98d9f0992305b9b31d8b1625981c725589 \ No newline at end of file +a40550ce059f422b02b777ed7c4231143e9bc979 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id index 40e191ca56..8b4801ee9d 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -42696c6ba9f54675dbbbb5084800d59f8b67c8af \ No newline at end of file +4d176567891a9d0c459c114f930995c889db0678 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id index 86be06f07d..6e319b4fb2 100644 --- a/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/9032116E-BB4E-4ED5-9C71-9E5E0B0230CA/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -646c6b3bbe88902f112aed3d9bb883481119b0ba \ No newline at end of file +174dfbf25db5e6b10b5fd5f1b49bca573c82c754 \ No newline at end of file diff --git a/mono/mini/mini-exceptions.c.REMOVED.git-id b/mono/mini/mini-exceptions.c.REMOVED.git-id index 5b21a98c74..6e818e9fda 100644 --- a/mono/mini/mini-exceptions.c.REMOVED.git-id +++ b/mono/mini/mini-exceptions.c.REMOVED.git-id @@ -1 +1 @@ -8aef81dfbcb6dbe4d1a2738ceb63a5a6e85d381d \ No newline at end of file +a3b722c5a7a6c61307413cfd8ad1935c3375452c \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 3ca7a7993a..266e53d238 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/238d4a7" +#define FULL_VERSION "explicit/7361a4f" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index fa36c48fae..4dc46b1f38 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -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 \ diff --git a/mono/utils/mono-mmap.c b/mono/utils/mono-mmap.c index e3c4be634a..29782d6a6f 100644 --- a/mono/utils/mono-mmap.c +++ b/mono/utils/mono-mmap.c @@ -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 diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 752d94e0998a147335d70f20f06b4b6e3f29af1a..0a8c2a8abb3c501f446c55b7b2a8f3b85fa9b1db 100644 GIT binary patch delta 21 ccmbQIHBW296D|%z0|f&MD?`K0Z@7%O08jJ=p#T5? delta 21 ccmbQIHBW296D|$|O9cZ9D+9C5Z@7%O08nZMtpET3 diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index aa0894d9f9..db8cfa9026 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -1d9fd2ca414d3988f8d153c89c5f8480e9ef7adc \ No newline at end of file +5433f25e97c078584a1666eb0ce05d91661fbd9a \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 3ce2791c4dd69825826dfe7b3f937ecb641ddfa4..54f2e86a064fda80c6165c9223de11ca7e912413 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|Et_fr5dBm7(EgQ^hHA09SMd*8l(j delta 21 ccmX?Ef3kjqt|EtlrGkNlm4Vr2Q^hHA09Wb;;{X5v diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 320b451f11..d9e6cfc332 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -6e3b7581aab0f08723345ec5f37f2b37e7371147 \ No newline at end of file +6140c7aae46302ae3bc4c2a7628ab4269cf152e6 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 59c84275d9f73c02bf3a4f6e6229f09b51efa864..35bf0030e3ba0409a182f76baaa8558183a11f76 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ19EJu81{PL^hMW1-3$y@dS_d-# delta 23 ecmeyri1Gg-#trQ190ryO1{PKZW}Erd3$y@d&<8&N diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index b6a43137d0..beeaa786dc 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -6754a605cfed6fbf3c4b3e9e17f65ebc89503ac2 \ No newline at end of file +2e21cfde8d1bd3330c552b9079d2ae5e550b8b30 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 3bd8afba47..43b60cde14 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -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 \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 6678b1c5eff10dd592a54b50599cb865897045a7..f9ad2f1798b7f9408c82b36205016ea44287b2cd 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}ISdUH3@oe+4L7GwWo!okbrlGy delta 23 fcmaF1gXP%{mJP8}ISecn3@oe+%r>V^Wo!okb&CkK diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 5c47903bcb..4266aae518 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -3a987177ca13076412bcfb54c09e6174de4bc831 \ No newline at end of file +1ff2bc910eb050e8b693283c718b164bf3ca86b9 \ No newline at end of file