From 0c2a85078e21256ae836f168f89458c4484b3963 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Sat, 21 Jul 2018 08:15:46 +0000 Subject: [PATCH] Imported Upstream version 5.14.0.172 Former-commit-id: 3f247eb53cff41b923e80f93ed660709d182aa8b --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- mcs/class/corlib/System/TermInfoReader.cs | 23 +----------------- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051400005/System.Xml.dll.REMOVED.git-id | 2 +- .../1051400005/mcs.exe.REMOVED.git-id | 2 +- .../1051400005/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051400005/System.Xml.dll.REMOVED.git-id | 2 +- .../1051400005/mcs.exe.REMOVED.git-id | 2 +- .../1051400005/mscorlib.dll.REMOVED.git-id | 2 +- .../Mono.Security.dll.REMOVED.git-id | 2 +- .../System.Configuration.dll.REMOVED.git-id | 2 +- .../System.Numerics.dll.REMOVED.git-id | 2 +- .../System.Security.dll.REMOVED.git-id | 2 +- .../1051400005/System.Xml.dll.REMOVED.git-id | 2 +- .../1051400005/mcs.exe.REMOVED.git-id | 2 +- .../1051400005/mscorlib.dll.REMOVED.git-id | 2 +- mono/mini/version.h | 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 +- 35 files changed, 32 insertions(+), 53 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 39d7aee6a1..c96e90ea55 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -c90694a5a334d4af0381fcf93eea0b359d1708b9 \ No newline at end of file +3f0d0c5a3b2386b0e7251bcbcaf67bc5e1ad1e52 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index d4fd67b5e8..3254836aa0 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -3998e85c1b62216ba2f5c64713f8b5127812e913 \ No newline at end of file +1577675c777512af107f4ec5a9ddd60285a4b9c6 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index ddb35f7b6e..972efb1028 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "5.14.0.171"; + public const string MonoVersion = "5.14.0.172"; 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/corlib/System/TermInfoReader.cs b/mcs/class/corlib/System/TermInfoReader.cs index 2be4627e79..bb36aca5e4 100644 --- a/mcs/class/corlib/System/TermInfoReader.cs +++ b/mcs/class/corlib/System/TermInfoReader.cs @@ -173,7 +173,7 @@ namespace System { offset++; offset += ((int) number) * intOffset; - return GetInteger (buffer, offset); + return GetInt16 (buffer, offset); } public string Get (TermInfoStrings tstr) @@ -222,27 +222,6 @@ namespace System { return (short) (uno + dos * 256); } - int GetInt32 (byte [] buffer, int offset) - { - int b1 = (int) buffer [offset]; - int b2 = (int) buffer [offset + 1]; - int b3 = (int) buffer [offset + 2]; - int b4 = (int) buffer [offset + 3]; - if (b1 == 255 && b2 == 255 && b3 == 255 && b4 == 255) - return -1; - - return b1 + b2 << 8 + b3 << 16 + b4 << 24; - } - - int GetInteger (byte [] buffer, int offset) - { - if (intOffset == 2) - return GetInt16 (buffer, offset); - else - // intOffset == 4 - return GetInt32 (buffer, offset); - } - string GetString (byte [] buffer, int offset) { int length = 0; diff --git a/mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id index 77ec7b5411..fe7b670614 100644 --- a/mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f846c0f0518298f26ffb2399ace8dc6a37537574 \ No newline at end of file +1b9a44332a612b60a46d6288a0d1c6072f7f8428 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id index 865004aa89..bb076b6b4d 100644 --- a/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -b05133cd7c331586deace52e4b262c1e752dfb4a \ No newline at end of file +a75eecb5c6b9b446e80ab028b9b4c29a6f5e9dd2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id index d948de0d3f..21f3030d82 100644 --- a/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2529bc8fe0705d0d044ba2437eec769e69ae178c \ No newline at end of file +37b028e2f8a160ce6678e35b345af9fef600934b \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id index fc57a4c997..b1fcbb48db 100644 --- a/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -168ff73c8a6ffe34cfbdcd6e5c83002011a1547f \ No newline at end of file +af34ccffcfc81d0195dd122b87643b9d9107fe96 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id index 1c08187cbb..33edcd6e73 100644 --- a/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4cd08e1ba992913daef88c9feb4740fca9ea0d31 \ No newline at end of file +eb3597bc417c874560030e98fdd4effd79bece68 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id index 7ae6199434..1a453eee8a 100644 --- a/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -274992efdddda839b2e0febd321f6e199e24f9a5 \ No newline at end of file +7aa4cfced2fae9ca66c248cfab3a74e5f5c1ecb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id index 92ececc6cd..6eccadad10 100644 --- a/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b664ccab2a1503d8bdcdfbac55240b6b99085c84 \ No newline at end of file +efde2771e83913ef603f521df00dfbe779bbc52b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id index 77ec7b5411..fe7b670614 100644 --- a/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f846c0f0518298f26ffb2399ace8dc6a37537574 \ No newline at end of file +1b9a44332a612b60a46d6288a0d1c6072f7f8428 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id index 865004aa89..bb076b6b4d 100644 --- a/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -b05133cd7c331586deace52e4b262c1e752dfb4a \ No newline at end of file +a75eecb5c6b9b446e80ab028b9b4c29a6f5e9dd2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id index d948de0d3f..21f3030d82 100644 --- a/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2529bc8fe0705d0d044ba2437eec769e69ae178c \ No newline at end of file +37b028e2f8a160ce6678e35b345af9fef600934b \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id index fc57a4c997..b1fcbb48db 100644 --- a/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -168ff73c8a6ffe34cfbdcd6e5c83002011a1547f \ No newline at end of file +af34ccffcfc81d0195dd122b87643b9d9107fe96 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id index 1c08187cbb..33edcd6e73 100644 --- a/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4cd08e1ba992913daef88c9feb4740fca9ea0d31 \ No newline at end of file +eb3597bc417c874560030e98fdd4effd79bece68 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id index 7ae6199434..1a453eee8a 100644 --- a/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400005/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -274992efdddda839b2e0febd321f6e199e24f9a5 \ No newline at end of file +7aa4cfced2fae9ca66c248cfab3a74e5f5c1ecb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id index 92ececc6cd..6eccadad10 100644 --- a/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051400005/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b664ccab2a1503d8bdcdfbac55240b6b99085c84 \ No newline at end of file +efde2771e83913ef603f521df00dfbe779bbc52b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id index 77ec7b5411..fe7b670614 100644 --- a/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400005/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -f846c0f0518298f26ffb2399ace8dc6a37537574 \ No newline at end of file +1b9a44332a612b60a46d6288a0d1c6072f7f8428 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id index 865004aa89..bb076b6b4d 100644 --- a/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400005/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -b05133cd7c331586deace52e4b262c1e752dfb4a \ No newline at end of file +a75eecb5c6b9b446e80ab028b9b4c29a6f5e9dd2 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400005/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/System.Numerics.dll.REMOVED.git-id index d948de0d3f..21f3030d82 100644 --- a/mcs/class/lib/monolite-win32/1051400005/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400005/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -2529bc8fe0705d0d044ba2437eec769e69ae178c \ No newline at end of file +37b028e2f8a160ce6678e35b345af9fef600934b \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400005/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/System.Security.dll.REMOVED.git-id index fc57a4c997..b1fcbb48db 100644 --- a/mcs/class/lib/monolite-win32/1051400005/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400005/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -168ff73c8a6ffe34cfbdcd6e5c83002011a1547f \ No newline at end of file +af34ccffcfc81d0195dd122b87643b9d9107fe96 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400005/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/System.Xml.dll.REMOVED.git-id index 1c08187cbb..33edcd6e73 100644 --- a/mcs/class/lib/monolite-win32/1051400005/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400005/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -4cd08e1ba992913daef88c9feb4740fca9ea0d31 \ No newline at end of file +eb3597bc417c874560030e98fdd4effd79bece68 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400005/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/mcs.exe.REMOVED.git-id index 7ae6199434..1a453eee8a 100644 --- a/mcs/class/lib/monolite-win32/1051400005/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400005/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -274992efdddda839b2e0febd321f6e199e24f9a5 \ No newline at end of file +7aa4cfced2fae9ca66c248cfab3a74e5f5c1ecb3 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051400005/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051400005/mscorlib.dll.REMOVED.git-id index 92ececc6cd..6eccadad10 100644 --- a/mcs/class/lib/monolite-win32/1051400005/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051400005/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b664ccab2a1503d8bdcdfbac55240b6b99085c84 \ No newline at end of file +efde2771e83913ef603f521df00dfbe779bbc52b \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 29c924235d..042be4dadf 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/e92217a" +#define FULL_VERSION "explicit/16538b2" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 7368ce050e23a3ddf27e5d049f870228706ef568..4a0e03ac757483878b6d2a18540e63a443cc0f79 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKx1p^B!1H;X4xQw^}N=F88 delta 20 bcmbQIHBW29Q!aJ`1p^B!1Cz~fxQw^}N=*iG diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 0e37856809..c1b32c4caa 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -25908e695c81eadd0240cd529230862de02895d3 \ No newline at end of file +2779c742879b8144989ec917964e7a5167a55bd3 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 36a1e569336960428f11fb9e0f22df2452c7be88..222965bf0da361a36770fd0488180e31084a7f77 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)Uf`NsVf#GIT#VK+CQD+9G delta 20 bcmX?Ef3kjqo+7(}f`NsVfyri5#VK+CQEdjO diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index d16b4da3b6..1a6cb3c66a 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -59470a287be652759d2c3f4dd666f82f256c9696 \ No newline at end of file +eb96432cf38c8cbe16a17cfd13083e6a3263a352 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index a879a0d3afadb67967bf47904947dc6f8876b471..72ab0d0acdb75220870bec62db3b16813d36019a 100644 GIT binary patch delta 22 dcmeyri1Gg-#tj_m?1l;k7FGs^oB7oXv;bha2Lb>9 delta 22 dcmeyri1Gg-#tj_m>;?)37FGr(oB7oXv;bhg2Lu2B diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index d1c9ac4ef6..7393cb5b62 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -65eb792ccc5b22741ec64fc7ee1a70a8d6c489b4 \ No newline at end of file +1b78d9f5fe198dec1e200a4eda818067112a757b \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 19c01c9c88..e8ad32e84b 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.14.0.171\n" +"Project-Id-Version: mono 5.14.0.172\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-07-20 08:04+0000\n" +"POT-Creation-Date: 2018-07-21 08:01+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 5309d1cc6b853200498cbbf92b51e4a18b0cb6c4..08a416d16a62573c15b79d144f3f96455821da3c 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*$ov8EUXL+H>XZzYzF{sun2en delta 22 ecmaF1gXP%{mJM-J*$os7EUXMnHm6QyYzF{swg`Fv diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 8f53f01d81..064d1a3361 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -3e8a2346f30c24ed931b1befdf5f8f3b04d9bf4a \ No newline at end of file +57939ed530fdafd9ca68ea71c03a0686e9fd2b1b \ No newline at end of file