From f94a1d941620f4ceccd168160f4511fcd21cd6f0 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 27 Aug 2019 08:38:14 +0000 Subject: [PATCH] Imported Upstream version 6.4.0.181 Former-commit-id: 642f13ab1e9c7aefd81e0aeaa2b2d9482fcda3fc --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- 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.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Xml.dll.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.REMOVED.git-id | 2 +- .../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.REMOVED.git-id | 2 +- .../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.REMOVED.git-id | 2 +- .../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/metadata/w32error.h | 2 ++ mono/metadata/w32socket-unix.c | 7 ++++--- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 ++-- mono/utils/mono-mmap.c | 6 ++++++ msvc/Makefile.in | 2 +- 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(+), 47 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 66f8a50666..05f0c82667 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -0b2a1214a98cbefd7d58e14ca2efbefbaa3f0057 \ No newline at end of file +ab06dc009f387763965cd03d86acb5f1d549d1a9 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 08536c16ed..205e954758 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -20cc6e3b8c7d65106b21cd262be62a6eac1e70cc \ No newline at end of file +ccb1e8a538dfd6e97ee03e96a16fa6def0f82433 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 38ca6ac9e5..28ab4ddb59 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.4.0.179"; + public const string MonoVersion = "6.4.0.181"; 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/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index fa2d59ebca..a71b1ffeba 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -627ab97bbabd65bbae7748d8d28e9e54bf56ff7c \ No newline at end of file +dfaa710d8cffa989eb11658766d4744ea5a6e602 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index c69ce3a8fc..a7c54d667d 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c2a9d813ccf421033d738b3f530b2de85c33dc47 \ No newline at end of file +01f8f6c6468af20d8c19ddeb64956ab06e7807fc \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 00e49c537e..ed66762641 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -3fe2ead56ae8646f2cb9b038dbb1d52d3fd0b0af \ No newline at end of file +edfdea03528d626dc090d70ac981441a1854222d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index eb945c4293..e884204d50 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -1a2c5420edf047287db4445353c603b5c5317ecf \ No newline at end of file +ca40e636a03390d303343a07feb3e07739b0482d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index c5a91d1714..d1ef643276 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -c2d93d57bf128fe40c27d2ed7ae42161f355f882 \ No newline at end of file +f8133a815d0ff5cc0c72c10e5ba6d97278601794 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index 826c376410..de8722a9a4 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c6fe85b54fa2b70584615a17de90e3dbdf215ccb \ No newline at end of file +a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index e27eeb0428..0fc2f82455 100644 --- a/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -4ab2f35229d314adf15f540839024dd8bbcdf76d \ No newline at end of file +08b8eee766db7b49dcefb7d9d1662649d31654f4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index fa2d59ebca..a71b1ffeba 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -627ab97bbabd65bbae7748d8d28e9e54bf56ff7c \ No newline at end of file +dfaa710d8cffa989eb11658766d4744ea5a6e602 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index c69ce3a8fc..a7c54d667d 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c2a9d813ccf421033d738b3f530b2de85c33dc47 \ No newline at end of file +01f8f6c6468af20d8c19ddeb64956ab06e7807fc \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 00e49c537e..ed66762641 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -3fe2ead56ae8646f2cb9b038dbb1d52d3fd0b0af \ No newline at end of file +edfdea03528d626dc090d70ac981441a1854222d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index eb945c4293..e884204d50 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -1a2c5420edf047287db4445353c603b5c5317ecf \ No newline at end of file +ca40e636a03390d303343a07feb3e07739b0482d \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index c5a91d1714..d1ef643276 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -c2d93d57bf128fe40c27d2ed7ae42161f355f882 \ No newline at end of file +f8133a815d0ff5cc0c72c10e5ba6d97278601794 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index 826c376410..de8722a9a4 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c6fe85b54fa2b70584615a17de90e3dbdf215ccb \ No newline at end of file +a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index be6d560b93..cc4c5eb887 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -25716aa06322368425562ef1bc5fb580d9cbb691 \ No newline at end of file +70454f8b5a181f77a55c7e8be735ed2b06d930f2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index e27eeb0428..0fc2f82455 100644 --- a/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -4ab2f35229d314adf15f540839024dd8bbcdf76d \ No newline at end of file +08b8eee766db7b49dcefb7d9d1662649d31654f4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index fa2d59ebca..a71b1ffeba 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -627ab97bbabd65bbae7748d8d28e9e54bf56ff7c \ No newline at end of file +dfaa710d8cffa989eb11658766d4744ea5a6e602 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index c69ce3a8fc..a7c54d667d 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c2a9d813ccf421033d738b3f530b2de85c33dc47 \ No newline at end of file +01f8f6c6468af20d8c19ddeb64956ab06e7807fc \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 00e49c537e..ed66762641 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -3fe2ead56ae8646f2cb9b038dbb1d52d3fd0b0af \ No newline at end of file +edfdea03528d626dc090d70ac981441a1854222d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index eb945c4293..e884204d50 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -1a2c5420edf047287db4445353c603b5c5317ecf \ No newline at end of file +ca40e636a03390d303343a07feb3e07739b0482d \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index c5a91d1714..d1ef643276 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -c2d93d57bf128fe40c27d2ed7ae42161f355f882 \ No newline at end of file +f8133a815d0ff5cc0c72c10e5ba6d97278601794 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index 826c376410..de8722a9a4 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c6fe85b54fa2b70584615a17de90e3dbdf215ccb \ No newline at end of file +a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index be6d560b93..cc4c5eb887 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -25716aa06322368425562ef1bc5fb580d9cbb691 \ No newline at end of file +70454f8b5a181f77a55c7e8be735ed2b06d930f2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index e27eeb0428..0fc2f82455 100644 --- a/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -4ab2f35229d314adf15f540839024dd8bbcdf76d \ No newline at end of file +08b8eee766db7b49dcefb7d9d1662649d31654f4 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id index fa2d59ebca..a71b1ffeba 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -627ab97bbabd65bbae7748d8d28e9e54bf56ff7c \ No newline at end of file +dfaa710d8cffa989eb11658766d4744ea5a6e602 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id index c69ce3a8fc..a7c54d667d 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -c2a9d813ccf421033d738b3f530b2de85c33dc47 \ No newline at end of file +01f8f6c6468af20d8c19ddeb64956ab06e7807fc \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id index 240298e2e5..4b7f9a1ae0 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -d78044dc72ca5ff1d78f02c10c8522e43c78626f \ No newline at end of file +0fbe23ab4e57bf05537345c1627fecb4583bebaa \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id index eb945c4293..e884204d50 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -1a2c5420edf047287db4445353c603b5c5317ecf \ No newline at end of file +ca40e636a03390d303343a07feb3e07739b0482d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id index c5a91d1714..d1ef643276 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -c2d93d57bf128fe40c27d2ed7ae42161f355f882 \ No newline at end of file +f8133a815d0ff5cc0c72c10e5ba6d97278601794 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id index 826c376410..de8722a9a4 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c6fe85b54fa2b70584615a17de90e3dbdf215ccb \ No newline at end of file +a60638f0af8bb80d1c7ce9b4c5941fe038ec9e50 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id index be6d560b93..cc4c5eb887 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -25716aa06322368425562ef1bc5fb580d9cbb691 \ No newline at end of file +70454f8b5a181f77a55c7e8be735ed2b06d930f2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id index 83c30d28a3..f428433d0d 100644 --- a/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -478b6561e172ce539629ccf678381a58edd4e1ed \ No newline at end of file +af3f69ba6e43443e118264541f28b41d5e9fd70a \ No newline at end of file diff --git a/mono/metadata/w32error.h b/mono/metadata/w32error.h index 83f061aee8..2ca20c8a9e 100644 --- a/mono/metadata/w32error.h +++ b/mono/metadata/w32error.h @@ -45,6 +45,8 @@ #define ERROR_IO_PENDING 997 #define ERROR_CANT_RESOLVE_FILENAME 1921 #define ERROR_ENCRYPTION_FAILED 6000 +#define WSA_INVALID_PARAMETER ERROR_INVALID_PARAMETER +#define WSA_INVALID_HANDLE ERROR_INVALID_HANDLE #define WSAEINTR 10004 #define WSAEBADF 10009 #define WSAEACCES 10013 diff --git a/mono/metadata/w32socket-unix.c b/mono/metadata/w32socket-unix.c index 2081aabb9e..394cfdbaae 100644 --- a/mono/metadata/w32socket-unix.c +++ b/mono/metadata/w32socket-unix.c @@ -1463,6 +1463,7 @@ mono_w32socket_convert_error (gint error) #ifdef ECONNRESET case ECONNRESET: return WSAECONNRESET; #endif + case EDOM: return WSAEINVAL; /* not a precise match, best wecan do. */ case EFAULT: return WSAEFAULT; #ifdef EHOSTUNREACH case EHOSTUNREACH: return WSAEHOSTUNREACH; @@ -1472,11 +1473,12 @@ mono_w32socket_convert_error (gint error) #endif case EINTR: return WSAEINTR; case EINVAL: return WSAEINVAL; - /*FIXME: case EIO: return WSAE????; */ + case EIO: return WSA_INVALID_HANDLE; /* not a precise match, best we can do. */ #ifdef EISCONN case EISCONN: return WSAEISCONN; #endif case ELOOP: return WSAELOOP; + case ENFILE: return WSAEMFILE; /* not a precise match, best we can do. */ case EMFILE: return WSAEMFILE; #ifdef EMSGSIZE case EMSGSIZE: return WSAEMSGSIZE; @@ -1488,7 +1490,6 @@ mono_w32socket_convert_error (gint error) #ifdef ENOBUFS case ENOBUFS: return WSAENOBUFS; /* not documented */ #endif - /* case ENOENT: return WSAE????; */ case ENOMEM: return WSAENOBUFS; #ifdef ENOPROTOOPT case ENOPROTOOPT: return WSAENOPROTOOPT; @@ -1499,7 +1500,7 @@ mono_w32socket_convert_error (gint error) #ifdef ENOTCONN case ENOTCONN: return WSAENOTCONN; #endif - /*FIXME: case ENOTDIR: return WSAE????; */ + case ENOTDIR: return WSA_INVALID_PARAMETER; /* not a precise match, best we can do. */ #ifdef ENOTSOCK case ENOTSOCK: return WSAENOTSOCK; #endif diff --git a/mono/mini/version.h b/mono/mini/version.h index 108dc47fcb..f428fce1f6 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/3608a49" +#define FULL_VERSION "explicit/5ecff82" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index a0d210942d..3dd91b5c86 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1491,10 +1491,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 0b4765fc10..7dbccec1dd 100644 --- a/mono/utils/mono-mmap.c +++ b/mono/utils/mono-mmap.c @@ -51,9 +51,11 @@ #define MAP_ANONYMOUS MAP_ANON #endif +#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it #ifndef MAP_32BIT #define MAP_32BIT 0 #endif +#endif typedef struct { int size; @@ -277,8 +279,10 @@ mono_valloc (void *addr, size_t length, int flags, MonoMemAccountType type) /* translate the flags */ if (flags & MONO_MMAP_FIXED) mflags |= MAP_FIXED; +#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it if (flags & MONO_MMAP_32BIT) mflags |= MAP_32BIT; +#endif #ifdef HOST_WASM if (length == 0) @@ -374,8 +378,10 @@ mono_file_map (size_t length, int flags, int fd, guint64 offset, void **ret_hand mflags |= MAP_SHARED; if (flags & MONO_MMAP_FIXED) mflags |= MAP_FIXED; +#if !defined(__APPLE__) // returning virtual addresses <4G requires entitlement on Apple platforms, do not use it if (flags & MONO_MMAP_32BIT) mflags |= MAP_32BIT; +#endif #ifdef HOST_WASM if (length == 0) diff --git a/msvc/Makefile.in b/msvc/Makefile.in index 8a179171f5..6f7912324c 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -520,8 +520,8 @@ 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." -@ENABLE_MSVC_FALSE@clean-local: @ENABLE_MSVC_FALSE@install-exec-local: +@ENABLE_MSVC_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-libtool clean-local mostlyclean-am diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index a860af4e64ff6068dea3ea1039ea818ce17c7911..831a2f94cbed52b5c2230cd3e75d1eee33a91dda 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aLM1p^B!1JliKxQw^}N~Z>T delta 20 bcmbQIHBW29Q!aK>1p^B!1Cz~fxQw^}N{I${ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index fff87107d1..22d57eb1b3 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -73f9b65a9ba79c531281048015310cf7db5d7c3b \ No newline at end of file +88f0e769332f884a52c56b22626f4d632a0c5eb0 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index ffc560a8b5bb1805c82d4ccf45a509d445030434..bf632dd37e190bd2c85902cdc05f28a694df2d33 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)sf`NsVf$3&b#VK+CQO5?b delta 20 bcmX?Ef3kjqo+7)cf`NsVfyri5#VK+CQK<&4 diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 20d8108a3d..9d17d3d4ac 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -21bb69978a1d9e2c2f5a54bf5686df1173065ee5 \ No newline at end of file +269c3fe708b9608aa227e9718e5b64f2aca6b50c \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 7c3ff036a209e1dfa2d63992293988bef28e033a..95c17175d725f145540c9f8d91c7b1750ede9f66 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?B)sv7FGtPoB7oXv;bil2MhoJ delta 22 dcmeyri1Gg-#tj_m?4}9^7FGr(oB7oXv;biH2MGWG diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 4b5d7c3e38..a27057b4d5 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -8209af39a9c482acc2479d3a933f1c6b52d3aa83 \ No newline at end of file +a893f94307c5e44b9455ea19a348b82b97606ea2 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 08acd8627f..b166be86f9 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 6.4.0.179\n" +"Project-Id-Version: mono 6.4.0.181\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-08-25 08:04+0000\n" +"POT-Creation-Date: 2019-08-27 08:05+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 0714c074c55905e469b74de0711571a39090c1a1..bb75a37e575bef87ffdbf7ad9dc670a6adc3b854 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J+07LUEUXMnH>XZzYzF{t5D0<* delta 22 ecmaF1gXP%{mJM-J*-aG;EUXMnHm6QyYzF{s@(6zb diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 6e7ae7eebb..76374cb317 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -0f7e4f71dc1a88fadc4e1d35fb19cd9b76bfec66 \ No newline at end of file +f4ccdfbaae15c5a0d969d63b009f851927437f24 \ No newline at end of file