Merge branch 'upstream'

Former-commit-id: 672e408b8b87dc6e2efaef1edbee67e69dcfaf17
2018-02-21 08:46:49 +00:00 · 2018-02-21 08:46:49 +00:00 · 10f7e6778f
commit 10f7e6778f
parent 27215b4eb0 65dc56118c
35 changed files with 52 additions and 35 deletions
--- a/configure.REMOVED.git-id
+++ b/configure.REMOVED.git-id
@ -1 +1 @@
-21aa3c78c535a77efc5486d2beee95df662db20d
+5b02d173c15b509380185dfc6bb06fde914fbde7
--- a/configure.ac.REMOVED.git-id
+++ b/configure.ac.REMOVED.git-id
@ -1 +1 @@
-a7e7548d78cf0e90a5385b2b99ede5398e7558b7
+4b136661d4fc7104dbd8952f3ce47b7fd4919b23
--- 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";
--- 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<string, bool> ExpectedFeatures = new Dictionary<string, bool> {
+            {"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<string, bool> (
                    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));
        }
    }
 }
--- 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
+26ea60ec41ad2706e3bae8d3a2064124e86ba579
--- 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
+eab35ff7cf70feda7b2fe9be9a3f41e44e2fcd16
--- 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
+22d78d26fdb7091c7fb1aeb34020e5a174443ef1
--- 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
+b5dcf3ba8e3d663ac68168bcbaceb0c37ba70470
--- 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
+65174aa10ad5127ea9241e44a005688ac56f69a1
--- 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
+526a8bd343958be03f0d9536878f174c176632e6
--- 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
+eec0952259611a7cdb73f8953f0aa80e1bb28ca1
--- 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
+26ea60ec41ad2706e3bae8d3a2064124e86ba579
--- 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
+eab35ff7cf70feda7b2fe9be9a3f41e44e2fcd16
--- 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
+22d78d26fdb7091c7fb1aeb34020e5a174443ef1
--- 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
+b5dcf3ba8e3d663ac68168bcbaceb0c37ba70470
--- 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
+65174aa10ad5127ea9241e44a005688ac56f69a1
--- 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
+526a8bd343958be03f0d9536878f174c176632e6
--- 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
+eec0952259611a7cdb73f8953f0aa80e1bb28ca1
--- 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
+26ea60ec41ad2706e3bae8d3a2064124e86ba579
--- 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
+eab35ff7cf70feda7b2fe9be9a3f41e44e2fcd16
--- a/Show More
+++ b/Show More