From cc017e5770c4903109828fa5a918a0bb4ecf9acc Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 11 Apr 2018 08:39:29 +0000 Subject: [PATCH] Imported Upstream version 5.10.1.42 Former-commit-id: fc4cafa487495cd406de2dca661ff1385900bb67 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../System/Test/System.Net/WebClientTest.cs | 3 ++- .../Test/System.Net/WebClientTestAsync.cs | 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 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/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 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/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 +- .../1051000003/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000003/mcs.exe.REMOVED.git-id | 2 +- .../1051000003/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 +- 36 files changed, 34 insertions(+), 33 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index bf18d0bef8..59db86d4ee 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -c0485c2f9df5d26693fb84576018067049031e0f \ No newline at end of file +0405eaad6e14272e250b5d0e228cdc25a526539a \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index a3de9640f4..0ca7d1c573 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -3e9a7e48b233632a7da0eb7f82c90ac92c3917d8 \ No newline at end of file +f67ab8f8f968ead24814554961a2506d220f1e84 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 05228717ec..81ff49f32e 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.10.1.40"; + public const string MonoVersion = "5.10.1.42"; 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/System/Test/System.Net/WebClientTest.cs b/mcs/class/System/Test/System.Net/WebClientTest.cs index cbeb1931b9..4e96882335 100644 --- a/mcs/class/System/Test/System.Net/WebClientTest.cs +++ b/mcs/class/System/Test/System.Net/WebClientTest.cs @@ -1691,10 +1691,11 @@ namespace MonoTests.System.Net // We throw a PlatformNotSupportedException deeper, which is caught and re-thrown as WebException [ExpectedException (typeof (WebException))] #endif + [Category ("InetAccess")] public void GetWebRequestOverriding () { GetWebRequestOverridingTestClass testObject = new GetWebRequestOverridingTestClass (); - testObject.DownloadData ("http://www.mono-project.com"); + testObject.DownloadData ("http://www.example.com"); Assert.IsTrue (testObject.overridedCodeRan, "Overrided code wasn't called"); } diff --git a/mcs/class/System/Test/System.Net/WebClientTestAsync.cs b/mcs/class/System/Test/System.Net/WebClientTestAsync.cs index e712d410b8..f9d3565fc3 100644 --- a/mcs/class/System/Test/System.Net/WebClientTestAsync.cs +++ b/mcs/class/System/Test/System.Net/WebClientTestAsync.cs @@ -88,7 +88,7 @@ namespace MonoTests.System.Net WebClient wc = new WebClient (); string filename = Path.GetTempFileName (); - var task = wc.DownloadFileTaskAsync ("http://www.mono-project.com/", filename); + var task = wc.DownloadFileTaskAsync ("http://www.example.com/", filename); Assert.IsTrue (task.Wait (15000)); Assert.IsTrue (task.IsCompleted); diff --git a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id index 3415bb1954..1a43102d88 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -448a569c80cc2adb9531d4fd84d718cdc9c68b21 \ No newline at end of file +1c3d609b892150c6a434c3230f6ee2f8f83d537f \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id index 4e67c13cf4..d5203df741 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -cc63b7237253ec87c3f7694dd2a62af2836bea0d \ No newline at end of file +d9ea405ef95e6eb3049b2861f6478655ead37e76 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id index ce0287e196..61b6d3e51f 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -bb87cba1da155b59229d7a7d8d470f490d29f1a9 \ No newline at end of file +e158ea8ae36eaa2b44ad45ed97442e2c2fd563e6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id index 3d5758a260..85d1b9783d 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -d9474a1a8877f61d1a43aae27b9c0055f2b0cdfc \ No newline at end of file +ff1bd0185e1491eafd682c1d28842630bafe23cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id index f8026bf82f..236b3ced78 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -8f416c1f007a014ae887930af7c2917a5fb23e42 \ No newline at end of file +c074b7f7035bfd438c978cf2313a5b70e3d2b6ec \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id index 8c3e91378f..819384b230 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -af4c64d9b19e049141b5f9c78a0ee8869e1ee4c8 \ No newline at end of file +3111797aa1d3362befcd97b2bbbf121ce7f0c710 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id index 406c669c21..ca254eab0d 100644 --- a/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -14e4ab0eaa2b6760d1d8b5c7c3f6ff156539cdbc \ No newline at end of file +1a5c5a66b822428856251965590510ac7e760117 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id index 3415bb1954..1a43102d88 100644 --- a/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -448a569c80cc2adb9531d4fd84d718cdc9c68b21 \ No newline at end of file +1c3d609b892150c6a434c3230f6ee2f8f83d537f \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id index 4e67c13cf4..d5203df741 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -cc63b7237253ec87c3f7694dd2a62af2836bea0d \ No newline at end of file +d9ea405ef95e6eb3049b2861f6478655ead37e76 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id index ce0287e196..61b6d3e51f 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -bb87cba1da155b59229d7a7d8d470f490d29f1a9 \ No newline at end of file +e158ea8ae36eaa2b44ad45ed97442e2c2fd563e6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id index 3d5758a260..85d1b9783d 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -d9474a1a8877f61d1a43aae27b9c0055f2b0cdfc \ No newline at end of file +ff1bd0185e1491eafd682c1d28842630bafe23cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id index f8026bf82f..236b3ced78 100644 --- a/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -8f416c1f007a014ae887930af7c2917a5fb23e42 \ No newline at end of file +c074b7f7035bfd438c978cf2313a5b70e3d2b6ec \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id index 8c3e91378f..819384b230 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -af4c64d9b19e049141b5f9c78a0ee8869e1ee4c8 \ No newline at end of file +3111797aa1d3362befcd97b2bbbf121ce7f0c710 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id index 406c669c21..ca254eab0d 100644 --- a/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -14e4ab0eaa2b6760d1d8b5c7c3f6ff156539cdbc \ No newline at end of file +1a5c5a66b822428856251965590510ac7e760117 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id index 3415bb1954..1a43102d88 100644 --- a/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -448a569c80cc2adb9531d4fd84d718cdc9c68b21 \ No newline at end of file +1c3d609b892150c6a434c3230f6ee2f8f83d537f \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id index 4e67c13cf4..d5203df741 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -cc63b7237253ec87c3f7694dd2a62af2836bea0d \ No newline at end of file +d9ea405ef95e6eb3049b2861f6478655ead37e76 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id index ce0287e196..61b6d3e51f 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -bb87cba1da155b59229d7a7d8d470f490d29f1a9 \ No newline at end of file +e158ea8ae36eaa2b44ad45ed97442e2c2fd563e6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id index 3d5758a260..85d1b9783d 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -d9474a1a8877f61d1a43aae27b9c0055f2b0cdfc \ No newline at end of file +ff1bd0185e1491eafd682c1d28842630bafe23cd \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id index f8026bf82f..236b3ced78 100644 --- a/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -8f416c1f007a014ae887930af7c2917a5fb23e42 \ No newline at end of file +c074b7f7035bfd438c978cf2313a5b70e3d2b6ec \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id index 8c3e91378f..819384b230 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -af4c64d9b19e049141b5f9c78a0ee8869e1ee4c8 \ No newline at end of file +3111797aa1d3362befcd97b2bbbf121ce7f0c710 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id index 406c669c21..ca254eab0d 100644 --- a/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -14e4ab0eaa2b6760d1d8b5c7c3f6ff156539cdbc \ No newline at end of file +1a5c5a66b822428856251965590510ac7e760117 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 5f4cb32cef..f24ccfca54 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/d194b8f" +#define FULL_VERSION "explicit/16cad3c" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 1ad62955e377337c89fa4b78e1d8d4b5931a1814..62c8111ef13405a0bf991a0da594c4e70235d6ee 100644 GIT binary patch delta 20 bcmbQIHBW29Q!aKx1p^B!L-WmVxQw^}N^%Bw delta 20 bcmbQIHBW29Q!aJ`1p^B!Bcsi4xQw^}N>2uI diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index 0f34e4e90f..1f6076e7a0 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -f39c9c0e7dd2615b738f596091d0441637de7368 \ No newline at end of file +89c9ebd5dccaf734d0a55210618a5c9a5a538b6e \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index f6e7d16b227a6ff8cd7533267aaedb8817e2a51b..ac9e914cf3bbb6a1288e6453ffd5ec0b3c977108 100644 GIT binary patch delta 20 bcmX?Ef3kjqo+7)Uf`NsVq4{Q0#VK+CQIZC& delta 20 bcmX?Ef3kjqo+7(}f`NsVk;?)37FI?^oB7oXv;bhi2Lu2B diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 9cf82a1acc..91724f194e 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -a334f9350a4d09f529824bfa3d840280474b48b9 \ No newline at end of file +2e72ce64dd8eae73864a2f2df8cfcebec186b755 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 0ee09137fc..73adbcba5b 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.10.1.40\n" +"Project-Id-Version: mono 5.10.1.42\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-04-10 08:22+0000\n" +"POT-Creation-Date: 2018-04-11 08:17+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 7bcf971f6e3a06e6be89f79ee4e4cc87e687b7cd..c5621d9d8c1ae6859a523fa954798578c6d54348 100644 GIT binary patch delta 22 ecmaF1gXP%{mJM-J*$ov8EUXO8H>XZzYzF{s+X#OE delta 22 ecmaF1gXP%{mJM-J*$os7EUb)-Hm6QyYzF{sxCnXx diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index cec6ef90ab..5e23e4cba5 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -b0b48d5e478e38925c7372f58d03230761122120 \ No newline at end of file +0214a33ffcf4f99e6c931dd8a16ea47af9424337 \ No newline at end of file