From 76568287a209a15bf1ce267f17f269bc3fb9a907 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 31 Dec 2019 08:37:01 +0000 Subject: [PATCH] Imported Upstream version 6.8.0.84 Former-commit-id: 958ad50c990339a6af3272acac61d64bf77068b6 --- 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 +- .../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.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/eglib/Makefile.am | 6 +++++- mono/eglib/Makefile.in | 4 +++- mono/eglib/test/Makefile.am | 5 ++++- mono/eglib/test/Makefile.in | 4 +++- mono/mini/version.h | 2 +- mono/unit-tests/Makefile.in | 4 ++-- 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 +- 51 files changed, 60 insertions(+), 49 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 6228ff0123..e616194953 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -9567e0b51a5e952159e6a9a35a842b19d6ed87d1 \ No newline at end of file +c4cb122706dc3dd17d1f20dd64454ff1ce13d113 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 2b1dc39f6d..ee692515be 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -fe47b25a64e0581f34f27ce68b3c004c78eabccb \ No newline at end of file +f2f1238a63d9a4660cbb5f5fe5305c72610d2d32 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 8b6adcf579..d1f15a31fc 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.8.0.83"; + public const string MonoVersion = "6.8.0.84"; 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/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index a7317a3e76..d9cd3f25e9 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -311bf23c35978c29c338986086d61787d24eccd4 \ No newline at end of file +05f6c92e7ec1f233ffc81bff781c7262b4483bd9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index b13d003321..bf8674510d 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0a8c1308de3672e2801102477ff44a859b576911 \ No newline at end of file +2aa50f904becc6c64f2f41fdb59e04ce9d5b8555 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index d2c3df4563..75556fc757 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -593f68823ad67c7ce0760bc8bdca382e1282939f \ No newline at end of file +9c1ca6f5c8ace398d66accfa9aacd323606a7ca6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 6667a9ad37..15b20a075e 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -246cb8941aee8be6eeee3b9da53fe86548dab0cd \ No newline at end of file +b4f77c67046acf51d2f87e638d5c50adad2c5850 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index aa2bccc1f9..ec845f13bb 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -4ee6749b4ca84775f5f8d0db2b3c277e6bb4c0fe \ No newline at end of file +b47e4b7dfc7a4de4979bc04479a03cd435acfd10 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index dc34c9663b..07f11baa00 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6c8a9c02678a7b3830255726c6814bd8579425fe \ No newline at end of file +0d3ec4a9453b79bfa1c3b334b2898e65f0bfa149 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 7c698048db..72e0d99c75 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -c24b56499f88cf385e1243cc95ac27434062c941 \ No newline at end of file +bb4ad23068446e162da3782bf47783f81c77fe8a \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index a4e32ef141..ad629d625e 100644 --- a/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -eafa887f2ff92693014a9cd4739f3b072702cb0d \ No newline at end of file +c4e58d40e2b2a6f0b23abb8338d5dac4625ced0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index a7317a3e76..d9cd3f25e9 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -311bf23c35978c29c338986086d61787d24eccd4 \ No newline at end of file +05f6c92e7ec1f233ffc81bff781c7262b4483bd9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index b13d003321..bf8674510d 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0a8c1308de3672e2801102477ff44a859b576911 \ No newline at end of file +2aa50f904becc6c64f2f41fdb59e04ce9d5b8555 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index d2c3df4563..75556fc757 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -593f68823ad67c7ce0760bc8bdca382e1282939f \ No newline at end of file +9c1ca6f5c8ace398d66accfa9aacd323606a7ca6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 6667a9ad37..15b20a075e 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -246cb8941aee8be6eeee3b9da53fe86548dab0cd \ No newline at end of file +b4f77c67046acf51d2f87e638d5c50adad2c5850 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index aa2bccc1f9..ec845f13bb 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -4ee6749b4ca84775f5f8d0db2b3c277e6bb4c0fe \ No newline at end of file +b47e4b7dfc7a4de4979bc04479a03cd435acfd10 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index dc34c9663b..07f11baa00 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6c8a9c02678a7b3830255726c6814bd8579425fe \ No newline at end of file +0d3ec4a9453b79bfa1c3b334b2898e65f0bfa149 \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 7c698048db..72e0d99c75 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -c24b56499f88cf385e1243cc95ac27434062c941 \ No newline at end of file +bb4ad23068446e162da3782bf47783f81c77fe8a \ No newline at end of file diff --git a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index a4e32ef141..ad629d625e 100644 --- a/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-macos/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -eafa887f2ff92693014a9cd4739f3b072702cb0d \ No newline at end of file +c4e58d40e2b2a6f0b23abb8338d5dac4625ced0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index a7317a3e76..d9cd3f25e9 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -311bf23c35978c29c338986086d61787d24eccd4 \ No newline at end of file +05f6c92e7ec1f233ffc81bff781c7262b4483bd9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index b13d003321..bf8674510d 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0a8c1308de3672e2801102477ff44a859b576911 \ No newline at end of file +2aa50f904becc6c64f2f41fdb59e04ce9d5b8555 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index d2c3df4563..75556fc757 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -593f68823ad67c7ce0760bc8bdca382e1282939f \ No newline at end of file +9c1ca6f5c8ace398d66accfa9aacd323606a7ca6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 6667a9ad37..15b20a075e 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -246cb8941aee8be6eeee3b9da53fe86548dab0cd \ No newline at end of file +b4f77c67046acf51d2f87e638d5c50adad2c5850 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index aa2bccc1f9..ec845f13bb 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -4ee6749b4ca84775f5f8d0db2b3c277e6bb4c0fe \ No newline at end of file +b47e4b7dfc7a4de4979bc04479a03cd435acfd10 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index dc34c9663b..07f11baa00 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6c8a9c02678a7b3830255726c6814bd8579425fe \ No newline at end of file +0d3ec4a9453b79bfa1c3b334b2898e65f0bfa149 \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 7c698048db..72e0d99c75 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -c24b56499f88cf385e1243cc95ac27434062c941 \ No newline at end of file +bb4ad23068446e162da3782bf47783f81c77fe8a \ No newline at end of file diff --git a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index a4e32ef141..ad629d625e 100644 --- a/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-unix/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -eafa887f2ff92693014a9cd4739f3b072702cb0d \ No newline at end of file +c4e58d40e2b2a6f0b23abb8338d5dac4625ced0b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id index a7317a3e76..d9cd3f25e9 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -311bf23c35978c29c338986086d61787d24eccd4 \ No newline at end of file +05f6c92e7ec1f233ffc81bff781c7262b4483bd9 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id index b13d003321..bf8674510d 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -0a8c1308de3672e2801102477ff44a859b576911 \ No newline at end of file +2aa50f904becc6c64f2f41fdb59e04ce9d5b8555 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id index 405bdf4cfb..de0623bf6a 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Core.dll.REMOVED.git-id @@ -1 +1 @@ -6e1cb84e76075fbf385255a1042c86b3d132bd14 \ No newline at end of file +e8f8a13543dbf70b17a77a5d9ffeb1ab349752b1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id index 6667a9ad37..15b20a075e 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.IO.Compression.dll.REMOVED.git-id @@ -1 +1 @@ -246cb8941aee8be6eeee3b9da53fe86548dab0cd \ No newline at end of file +b4f77c67046acf51d2f87e638d5c50adad2c5850 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id index aa2bccc1f9..ec845f13bb 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -4ee6749b4ca84775f5f8d0db2b3c277e6bb4c0fe \ No newline at end of file +b47e4b7dfc7a4de4979bc04479a03cd435acfd10 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id index dc34c9663b..07f11baa00 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -6c8a9c02678a7b3830255726c6814bd8579425fe \ No newline at end of file +0d3ec4a9453b79bfa1c3b334b2898e65f0bfa149 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id index 7c698048db..72e0d99c75 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -c24b56499f88cf385e1243cc95ac27434062c941 \ No newline at end of file +bb4ad23068446e162da3782bf47783f81c77fe8a \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id index 4d1ce97435..dfefd0009a 100644 --- a/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/ABB721D6-116A-4555-B4FD-9248146D2051/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -a446a85e3e2b85e0e17eb73a1e29639f150c09bc \ No newline at end of file +e749f826d52af6a19c34e70cd1b0505debbfeffd \ No newline at end of file diff --git a/mono/eglib/Makefile.am b/mono/eglib/Makefile.am index 0c5132c633..1cfc667ce0 100644 --- a/mono/eglib/Makefile.am +++ b/mono/eglib/Makefile.am @@ -63,7 +63,11 @@ if !ENABLE_MSVC_ONLY eglibdir=$(datadir)/mono-$(API_VER)/mono/eglib eglib_DATA = eglib-config.h -libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE +libeglib_la_CFLAGS = -g -Wall -D_GNU_SOURCE + +if !HOST_WIN32 +libeglib_la_CFLAGS += -D_FORTIFY_SOURCE=2 +endif AM_CPPFLAGS = -I$(srcdir) diff --git a/mono/eglib/Makefile.in b/mono/eglib/Makefile.in index 110508477b..182fe8da58 100644 --- a/mono/eglib/Makefile.in +++ b/mono/eglib/Makefile.in @@ -90,6 +90,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@ENABLE_MSVC_ONLY_FALSE@@HOST_WIN32_FALSE@am__append_1 = -D_FORTIFY_SOURCE=2 subdir = mono/eglib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/apple-target.m4 \ @@ -625,7 +626,8 @@ MAKEFLAGS := $(MAKEFLAGS) --no-builtin-rules @ENABLE_MSVC_ONLY_FALSE@eglibdir = $(datadir)/mono-$(API_VER)/mono/eglib @ENABLE_MSVC_ONLY_FALSE@eglib_DATA = eglib-config.h -@ENABLE_MSVC_ONLY_FALSE@libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE +@ENABLE_MSVC_ONLY_FALSE@libeglib_la_CFLAGS = -g -Wall -D_GNU_SOURCE \ +@ENABLE_MSVC_ONLY_FALSE@ $(am__append_1) @ENABLE_MSVC_ONLY_FALSE@AM_CPPFLAGS = -I$(srcdir) @ENABLE_MSVC_ONLY_FALSE@@HOST_ANDROID_FALSE@@HOST_WIN32_FALSE@libeglib_la_LIBADD = -lm $(LTLIBICONV) @ENABLE_MSVC_ONLY_FALSE@@HOST_ANDROID_FALSE@@HOST_WIN32_TRUE@libeglib_la_LIBADD = -lm -lpsapi $(LTLIBICONV) diff --git a/mono/eglib/test/Makefile.am b/mono/eglib/test/Makefile.am index 68b68d66a4..9e4efb3518 100644 --- a/mono/eglib/test/Makefile.am +++ b/mono/eglib/test/Makefile.am @@ -34,7 +34,10 @@ SOURCES = \ test_eglib_SOURCES = $(SOURCES) -GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -D_FORTIFY_SOURCE=2 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\" +GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\" +if !HOST_WIN32 +GLIB_TEST_FLAGS_COMMON += -D_FORTIFY_SOURCE=2 +endif CFLAGS += $(GLIB_TEST_FLAGS_COMMON) CXXFLAGS += $(GLIB_TEST_FLAGS_COMMON) @CXXFLAGS_COMMON@ diff --git a/mono/eglib/test/Makefile.in b/mono/eglib/test/Makefile.in index 923d454575..81615baa79 100644 --- a/mono/eglib/test/Makefile.in +++ b/mono/eglib/test/Makefile.in @@ -89,6 +89,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ +@HOST_WIN32_FALSE@am__append_1 = -D_FORTIFY_SOURCE=2 @DISABLE_EXECUTABLES_FALSE@@HOST_WIN32_FALSE@noinst_PROGRAMS = test-eglib$(EXEEXT) \ @DISABLE_EXECUTABLES_FALSE@@HOST_WIN32_FALSE@ assertf$(EXEEXT) subdir = mono/eglib/test @@ -508,7 +509,8 @@ SOURCES = \ memory.c test_eglib_SOURCES = $(SOURCES) -GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -D_FORTIFY_SOURCE=2 -I$(srcdir)/.. -I.. -DDRIVER_NAME=\"EGlib\" +GLIB_TEST_FLAGS_COMMON = -Wall -DEGLIB_TESTS=1 -I$(srcdir)/.. -I.. \ + -DDRIVER_NAME=\"EGlib\" $(am__append_1) test_eglib_LDADD = ../libeglib.la $(LTLIBICONV) assertf_LDADD = ../libeglib.la $(LTLIBICONV) MAINTAINERCLEANFILES = Makefile.in diff --git a/mono/mini/version.h b/mono/mini/version.h index 3c50e03048..9d37c9b118 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/dc5902c" +#define FULL_VERSION "explicit/5f0704c" diff --git a/mono/unit-tests/Makefile.in b/mono/unit-tests/Makefile.in index 3a1340eb62..72e4985504 100644 --- a/mono/unit-tests/Makefile.in +++ b/mono/unit-tests/Makefile.in @@ -1598,10 +1598,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 \ diff --git a/msvc/Makefile.in b/msvc/Makefile.in index 7bd8058722..3f7935e25c 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -526,8 +526,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 20b068211774b82cdea1c4b0b379f8353df59afe..d2ed4057cbf7ef69e58eda80950693782484d075 100644 GIT binary patch delta 21 ccmbQIHBW296D|&8Lj?m1D+80wZ@7%O08k|crT_o{ delta 21 ccmbQIHBW296D|%T69oecD+BY*Z@7%O08mZ_s{jB1 diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index c4685cf079..8b93037300 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -6d5a33661929f4667e72b150f813974cbfa17a95 \ No newline at end of file +be4ed4673f3749d382c2c55ae947a67fa32f0b50 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index ddf8ee360f0c44bc280debea35eab639d0d9a9bc..a24254735a73b4e5c31e26b2506e632c05faeb19 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|EuAp@M;hm4V4-Q^hHA09U03+yDRo delta 21 ccmX?Ef3kjqt|Et#iGqQJm4W$YQ^hHA09Vci;Q#;t diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index e303aa9340..e20bc1aee1 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -6e446a933d87d37170180cc3a38c0e04697959a7 \ No newline at end of file +49f9e06e07da73f10c128c80048ef21a8306d7b9 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index d281d521341b41e7bdb386a0971c6682a1ae907f..851b4d1ff02a4bbf769447e45a717dcc264b14d3 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ19L9zU1{PKZCY$-y3$y@diw8IW delta 23 ecmeyri1Gg-#trQ197ZMz1{PKZ=9~G|3$y@dv\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 6e85d7d6eeae9a6d1b90a066cd8fabb55ad3da1d..b76bac702c22103fdcd2437617a6725a2f977cc2 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}IgAYz3@oe+Og5)ZWo!okbw&uT delta 23 fcmaF1gXP%{mJP8}IgCsc3@oe+%r~b_Wo!okb#Dl> diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 338edfa592..6105ac64d5 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -6534960ce1ee7d98988940d39980f3decbba9a24 \ No newline at end of file +11be02bb30eed8b11a217f8ff7505acd50e54ee1 \ No newline at end of file