From 65dc56118c1b8d31b19780e8a32f0d58c9821107 Mon Sep 17 00:00:00 2001 From: "Xamarin Public Jenkins (auto-signing)" Date: Wed, 21 Feb 2018 08:38:00 +0000 Subject: [PATCH] Imported Upstream version 5.10.0.130 Former-commit-id: e3de1cfbe4cdec293baff4e9f7bf6aac737f2ac4 --- configure.REMOVED.git-id | 2 +- configure.ac.REMOVED.git-id | 2 +- mcs/build/common/Consts.cs | 2 +- .../RuntimeFeatureTest.cs | 25 +++++++++++++++--- .../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 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/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 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/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 +- .../1051000002/System.Xml.dll.REMOVED.git-id | 2 +- .../1051000002/mcs.exe.REMOVED.git-id | 2 +- .../1051000002/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, 52 insertions(+), 35 deletions(-) diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index c3f509bd5d..887d2e9170 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -21aa3c78c535a77efc5486d2beee95df662db20d \ No newline at end of file +5b02d173c15b509380185dfc6bb06fde914fbde7 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index be9d7edf82..d0cfbc4902 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -a7e7548d78cf0e90a5385b2b99ede5398e7558b7 \ No newline at end of file +4b136661d4fc7104dbd8952f3ce47b7fd4919b23 \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 65f63b97ff..1c547b355f 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.0.129"; + public const string MonoVersion = "5.10.0.130"; 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/Test/System.Runtime.CompilerServices/RuntimeFeatureTest.cs b/mcs/class/corlib/Test/System.Runtime.CompilerServices/RuntimeFeatureTest.cs index 586e53cd20..f8a39bf47f 100644 --- a/mcs/class/corlib/Test/System.Runtime.CompilerServices/RuntimeFeatureTest.cs +++ b/mcs/class/corlib/Test/System.Runtime.CompilerServices/RuntimeFeatureTest.cs @@ -28,6 +28,7 @@ using NUnit.Framework; using System; +using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Linq; @@ -36,10 +37,22 @@ namespace MonoTests.System.Runtime.CompilerServices [TestFixture] public class RuntimeFeatureTest { - readonly (string, bool)[] ExpectedFeatures = new [] { - ("PortablePdb", true) + readonly Dictionary ExpectedFeatures = new Dictionary { + {"PortablePdb", true} }; + [Test] + public void PortablePdbSupported () + { + Assert.IsTrue (RuntimeFeature.IsSupported (RuntimeFeature.PortablePdb)); + } + + [Test] + public void NonExistingFeatureNotSupported () + { + Assert.IsFalse (RuntimeFeature.IsSupported ("foo")); + } + [Test] public void NoNewFeaturesAdded () { @@ -47,11 +60,15 @@ namespace MonoTests.System.Runtime.CompilerServices var features = from field in t.GetFields() where field.FieldType == typeof (string) let value = field.GetValue (null) - select ( + select new KeyValuePair ( field.Name, RuntimeFeature.IsSupported ((string)value) ); - Assert.AreEqual (ExpectedFeatures, features.ToArray ()); + + if (features.Count() == 0) + Assert.Inconclusive ("No features found, this can happen when running the linker."); + + CollectionAssert.AreEquivalent (ExpectedFeatures, features.ToDictionary (k => k.Key, v => v.Value)); } } } diff --git a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id index 77695f047f..c35c2e128f 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b510e8bff1113be7a9a1d62060a5efcdb7bdcc12 \ No newline at end of file +26ea60ec41ad2706e3bae8d3a2064124e86ba579 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id index 01c4c32dae..365146684c 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -bcce3c2ded0ad00bb49a3469f38302367003ade6 \ No newline at end of file +eab35ff7cf70feda7b2fe9be9a3f41e44e2fcd16 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id index 0ebb5098f5..3c5e637841 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -84849ae2d0369cd97bf2cd870cf694cc97fde651 \ No newline at end of file +22d78d26fdb7091c7fb1aeb34020e5a174443ef1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id index fe8563948e..71d6f2e505 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2b7060d86b43aafbf55b39fb1f170906ccd47e86 \ No newline at end of file +b5dcf3ba8e3d663ac68168bcbaceb0c37ba70470 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id index 7861ec5896..efd0960df2 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c60c1a782d836c859abeb9503f345353c8ec1997 \ No newline at end of file +65174aa10ad5127ea9241e44a005688ac56f69a1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id index 0fff488bea..360ac014f4 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ba2a1d3760b8dd2d67125c6027177bacf92f73ff \ No newline at end of file +526a8bd343958be03f0d9536878f174c176632e6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id index d842a6c0e5..c3a3ae325b 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ad3cffdf7ffb10dbdd82ec7b7ffc84a1d3a61480 \ No newline at end of file +eec0952259611a7cdb73f8953f0aa80e1bb28ca1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id index 77695f047f..c35c2e128f 100644 --- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b510e8bff1113be7a9a1d62060a5efcdb7bdcc12 \ No newline at end of file +26ea60ec41ad2706e3bae8d3a2064124e86ba579 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id index 01c4c32dae..365146684c 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -bcce3c2ded0ad00bb49a3469f38302367003ade6 \ No newline at end of file +eab35ff7cf70feda7b2fe9be9a3f41e44e2fcd16 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id index 0ebb5098f5..3c5e637841 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -84849ae2d0369cd97bf2cd870cf694cc97fde651 \ No newline at end of file +22d78d26fdb7091c7fb1aeb34020e5a174443ef1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id index fe8563948e..71d6f2e505 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2b7060d86b43aafbf55b39fb1f170906ccd47e86 \ No newline at end of file +b5dcf3ba8e3d663ac68168bcbaceb0c37ba70470 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id index 7861ec5896..efd0960df2 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c60c1a782d836c859abeb9503f345353c8ec1997 \ No newline at end of file +65174aa10ad5127ea9241e44a005688ac56f69a1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id index 0fff488bea..360ac014f4 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ba2a1d3760b8dd2d67125c6027177bacf92f73ff \ No newline at end of file +526a8bd343958be03f0d9536878f174c176632e6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id index d842a6c0e5..c3a3ae325b 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ad3cffdf7ffb10dbdd82ec7b7ffc84a1d3a61480 \ No newline at end of file +eec0952259611a7cdb73f8953f0aa80e1bb28ca1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id index 77695f047f..c35c2e128f 100644 --- a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b510e8bff1113be7a9a1d62060a5efcdb7bdcc12 \ No newline at end of file +26ea60ec41ad2706e3bae8d3a2064124e86ba579 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id index 01c4c32dae..365146684c 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -bcce3c2ded0ad00bb49a3469f38302367003ade6 \ No newline at end of file +eab35ff7cf70feda7b2fe9be9a3f41e44e2fcd16 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id index 0ebb5098f5..3c5e637841 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -84849ae2d0369cd97bf2cd870cf694cc97fde651 \ No newline at end of file +22d78d26fdb7091c7fb1aeb34020e5a174443ef1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id index fe8563948e..71d6f2e505 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -2b7060d86b43aafbf55b39fb1f170906ccd47e86 \ No newline at end of file +b5dcf3ba8e3d663ac68168bcbaceb0c37ba70470 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id index 7861ec5896..efd0960df2 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -c60c1a782d836c859abeb9503f345353c8ec1997 \ No newline at end of file +65174aa10ad5127ea9241e44a005688ac56f69a1 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id index 0fff488bea..360ac014f4 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -ba2a1d3760b8dd2d67125c6027177bacf92f73ff \ No newline at end of file +526a8bd343958be03f0d9536878f174c176632e6 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id index d842a6c0e5..c3a3ae325b 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -ad3cffdf7ffb10dbdd82ec7b7ffc84a1d3a61480 \ No newline at end of file +eec0952259611a7cdb73f8953f0aa80e1bb28ca1 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index eb0299b375..1ee3d4a0dd 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/177997b" +#define FULL_VERSION "explicit/721462c" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 54bf9632b81be58953f56cb1460107769ca63514..5fe8ffdf73ff3c966cd017d5cd6cc57c9b0ba759 100644 GIT binary patch delta 21 ccmbQIHBW296D|%TLj?m1D?`i8Z@7%O08l*!s{jB1 delta 21 ccmbQIHBW296D|%zO9ev\n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index dd2115c1642c8fe2a285e36dcd214397ebef488d..48d2c92b540b0e7be8ebbf02765e2a0d31e33350 100644 GIT binary patch delta 23 fcmaF1gXP%{mJP8}IgAVy3@oe+EjOo5Wo!okbzTUw delta 23 fcmaF1gXP%{mJP8}ISefo3@xlojW(xFWo!okb*%`v diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index 52f8374580..4c343b43c2 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -c84d08da2af74fc873c2a68a30ca6eda9311e385 \ No newline at end of file +c68519e77c2dcd54e02740009a95651d45f526db \ No newline at end of file