Imported Upstream version 5.10.1.2

Former-commit-id: 4a4d20b03e9e509d6d89eaf6a6226999e9214e2a
2018-03-20 09:34:06 +00:00
parent 67cbe538ec
commit 206c528043
44 changed files with 57 additions and 61 deletions
--- 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.179";
+	public const string MonoVersion = "5.10.1.2";
 	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/System/System.Net/Dns.cs
+++ b/mcs/class/System/System.Net/Dns.cs
@@ -320,11 +320,9 @@ namespace System.Net {
 				try {
 					IPAddress newAddress = IPAddress.Parse(h_addrlist[i]);

-#pragma warning disable 618
-					if( (Socket.SupportsIPv6 && newAddress.AddressFamily == AddressFamily.InterNetworkV6) ||
-					    (Socket.SupportsIPv4 && newAddress.AddressFamily == AddressFamily.InterNetwork) )
+					if( (Socket.OSSupportsIPv6 && newAddress.AddressFamily == AddressFamily.InterNetworkV6) ||
+					    (Socket.OSSupportsIPv4 && newAddress.AddressFamily == AddressFamily.InterNetwork) )
 						addrlist.Add(newAddress);
-#pragma warning restore 618
 				} catch (ArgumentNullException) {
 					/* Ignore this, as the
 					 * internal call might have
--- a/mcs/class/System/Test/System.Net/DnsTest.cs
+++ b/mcs/class/System/Test/System.Net/DnsTest.cs
@@ -209,6 +209,13 @@ namespace MonoTests.System.Net
 			}
 		}

+		[Test]
+		[Category("NotOnWindows")]
+		public void GetHostAddresses_IPv6 ()
+		{
+			var address = Dns.GetHostAddresses("ipv6.google.com");
+		}
+
 		[Test]
 		public void GetHostName ()
 		{
--- a/mcs/class/System/Test/System.Net/IPAddressTest.cs
+++ b/mcs/class/System/Test/System.Net/IPAddressTest.cs
@@ -241,9 +241,6 @@ public class IPAddressTest
 	[Test]
 	public void IsLoopbackV6 ()
 	{
-//		if (!Socket.SupportsIPv6)
-//			Assert.Ignore ("IPv6 must be enabled in machine.config");
-
 		IPAddress ip = IPAddress.IPv6Loopback;
 		Assert.IsTrue (IPAddress.IsLoopback (ip), "#1");

@@ -612,9 +609,6 @@ public class IPAddressTest
 	[Test]
 	public void ParseWrongV6 ()
 	{
-		//if (!Socket.SupportsIPv6)
-		//	Assert.Ignore ("IPv6 must be enabled in machine.config");
-
 		for (int i = 0; i < ipv6ParseWrong.Length; i++) {
 			string ipAddress = ipv6ParseWrong [i];

--- 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 @@
-70e29cd0e8b0b23bc8dc7580de11d973783d714e
+782ff3108fa8594e8f79418d1c0a5493c1f41b9e
--- 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 @@
-ac71f3f0709ddd3ac74b143c165630ddd064ba97
+397304064b2cf8faea733540adc178294323fa7c
--- 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 @@
-355ee74171cf5daf899b3cdc85a62836bf07fc25
+a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea
--- 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 @@
-378f224b082f58447996654813b4ea04385c49ad
+b13ba9b6351fc5188afd7b6f83a6a9c0a4844730
--- 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 @@
-d313843506c752224b1125738296aee06010db07
+00489f90d93ff78c4a085a84390061140e81a9af
--- a/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-darwin/1051000003/System.dll.REMOVED.git-id
@@ -1 +1 @@
-7b8696a9592252dafa94d4a38f88fa5e993f747e
+72326c29d144b8f48bb26a50f5f689488e4eca0b
--- 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 @@
-4f317c715c40a29b6569c4e5e41a8af8032b7949
+a43fee480db4e61c27d272bea6ba535d161d1cc2
--- 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 @@
-a3d1a27dada9d8e5b43cb31d116ce5231b684feb
+fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f
--- 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 @@
-70e29cd0e8b0b23bc8dc7580de11d973783d714e
+782ff3108fa8594e8f79418d1c0a5493c1f41b9e
--- 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 @@
-ac71f3f0709ddd3ac74b143c165630ddd064ba97
+397304064b2cf8faea733540adc178294323fa7c
--- 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 @@
-355ee74171cf5daf899b3cdc85a62836bf07fc25
+a55d25fffd32c53abee6c9c5f1754b59e2bbe3ea
--- 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 @@
-378f224b082f58447996654813b4ea04385c49ad
+b13ba9b6351fc5188afd7b6f83a6a9c0a4844730
--- 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 @@
-d313843506c752224b1125738296aee06010db07
+00489f90d93ff78c4a085a84390061140e81a9af
--- a/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id
+++ b/mcs/class/lib/monolite-linux/1051000003/System.dll.REMOVED.git-id
@@ -1 +1 @@
-7b8696a9592252dafa94d4a38f88fa5e993f747e
+72326c29d144b8f48bb26a50f5f689488e4eca0b
--- 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 @@
-4f317c715c40a29b6569c4e5e41a8af8032b7949
+a43fee480db4e61c27d272bea6ba535d161d1cc2
--- 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 @@
-a3d1a27dada9d8e5b43cb31d116ce5231b684feb
+fe973d5afdbe89f4e0d1767946f3fb69d9f2eb6f
--- a/Show More
+++ b/Show More