From e0066d95197e367b26854b31d77b973daab98500 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Tue, 30 Apr 2019 08:40:55 +0000 Subject: [PATCH] Imported Upstream version 6.0.0.205 Former-commit-id: 84f1104b57cacbdd1cc99d0d74d9a8251f311cc7 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- docs/deploy/mono-api-jitinternal.html | 1 + 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/version.h | 2 +- mono/sgen/sgen-marksweep.c | 4 +++- mono/unit-tests/Makefile.in | 4 ++-- mono/utils/monobitset.c | 7 +++++-- 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 +- 50 files changed, 50 insertions(+), 44 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 17abd579a1..287617790e 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -64732f5c747295ac40f6a4eec0eb6263ce3d894e \ No newline at end of file +874a4ec01311dc6c5075924f52a27c2988e99a1b \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index 15895fb6c2..5da286c9ed 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -332ac998e4f264d3b95ba6872b666922c5845a46 \ No newline at end of file +f516f0141e10f66dfb40a6be7786f4c4b2a983c1 \ No newline at end of file diff --git a/docs/deploy/mono-api-jitinternal.html b/docs/deploy/mono-api-jitinternal.html index 7a875586f4..8e3ebb35bb 100644 --- a/docs/deploy/mono-api-jitinternal.html +++ b/docs/deploy/mono-api-jitinternal.html @@ -921,6 +921,7 @@ mono_bitset_copyto (const MonoBitSet *src, MonoBitSet *dest)
Syntax
guint32 mono_bitset_count (const MonoBitSet *set) +

Parameters
diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index f94cd96fa0..42cc095157 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.200"; + public const string MonoVersion = "6.0.0.205"; 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 8db596ffd8..5aae8dc900 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 @@ -068708bca6cbf02077401210c057691aa68a1a7a \ No newline at end of file +fbac8fa50986dbf39863ea8b3628ed0df15e135a \ 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 635becff0c..6c46ed479b 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 @@ -77e40eb21368d5c3a81795a6a47df60ee214e3c5 \ No newline at end of file +4d282c7948e59697eabb11fb03b14ad2c8a19245 \ 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 fcbe943513..c146e85e09 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 @@ -112dfc274abf85bebb50691eb67567dcab985ce0 \ No newline at end of file +f709e4dc2dea5b2431b22443500ec10aa9b4c327 \ 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 839674a7d29dbec8ad0046ffc77a624919026b02..3f7ddb9d4880e64e2487a05a61d3ae421eba6d44 100644 GIT binary patch delta 58 zcmV-A0LA}+hz5X&29SsZyK7v%fsD0`0W=H{Wv$c!?AkLzl+yBo-ucHsx6lj$u?7P* Q04kTDeE}-Bt`h-LaP|=xxBvhE delta 58 zcmV-A0LA}+hz5X&29SsZ<0gmrfsD0`0W=H{q%Kn%vi<-?yRIHi{vL7size / BITS_PER_CHUNK; ++i) { d = set->data [i]; -#ifdef __GNUC__ +#if defined (__GNUC__) && !defined (HOST_WIN32) +// The builtins do work on Win32, but can cause a not worthwhile runtime dependency. +// See https://github.com/mono/mono/pull/14248. if (sizeof (gsize) == sizeof (unsigned int)) count += __builtin_popcount (d); else diff --git a/msvc/Makefile.in b/msvc/Makefile.in index f5ae54dbec..fdc1930e45 100644 --- a/msvc/Makefile.in +++ b/msvc/Makefile.in @@ -515,8 +515,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 b8f9b72e77836588169c88309a80371f6f41513c..9ed69ee06491b53e77fb4b71cce9bea228541f47 100644 GIT binary patch delta 21 ccmbQIHBW296D|&80|f&MD?_8rZ@7%O08kVLqyPW_ delta 21 ccmbQIHBW296D|%Ta|HtnD+9C5Z@7%O08nfOtpET3 diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 17e06214f7..43ab7f2772 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -bfa5c933bc9efaefbe72a13df7f90dfc1593bf7c \ No newline at end of file +5752897f532a1482efd12a0475e45c3e2089632a \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index a9555ccc8ed831015b17078da1328c22d2f00258..43f540b83e8042b1692a06a20f729271a63796df 100644 GIT binary patch delta 21 ccmX?Ef3kjqt|EuAfr5dBm7&pQQ^hHA09TX-+5i9m delta 21 ccmX?Ef3kjqt|Et#xq^X(m4Vr2Q^hHA09Wh=;{X5v diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 906484a1b7..b98cbfdedb 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -cd3257ba6536d30e9352a2b7809cce57045e65b0 \ No newline at end of file +5564073c3ef87fb7584b06785b9cf8400f399a6f \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 50f437323902532fcf4d409d537f58645b0d9c01..c77d267efdd77cef460cf4a075f312ee0bcd597b 100644 GIT binary patch delta 23 ecmeyri1Gg-#trQ19L5F;1{PL^Mw|K73$y@ddIvTD delta 23 ecmeyri1Gg-#trQ197g5}1{PKZW}Erd3$y@d(g!~P diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 3aca62b8cf..7c3ba8315f 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -9643eaed33a60a7a26462206811d7f5ce230b26e \ No newline at end of file +e8827dcb68689563e396a2f329d2c7b63fef6342 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 5cca3ecf55..d041dc3734 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.200\n" +"Project-Id-Version: mono 6.0.0.205\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2019-04-27 08:06+0000\n" +"POT-Creation-Date: 2019-04-30 08:12+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 a20f65c37565663ab7bd691ee729607088358e01..d26810d9d45367779a865bafe8dc31e7ea010e4a 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}IgAYy3@oe+jW(xFWo!okbu|dA delta 23 fcmaF1gXP%{mJP8}IgHE|3@oe+%r>V^Wo!okb&UwM diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 3191e251d3..1c4f4200d0 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -4916c8b2c9bf58e19c66c0ff74e9174fcbf6cff1 \ No newline at end of file +3904eab63cefdcac10f7cc7ab5987be2441293d3 \ No newline at end of file