Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs

@@ -138,7 +138,9 @@ namespace System.Data.SqlClient
 
 		[DefaultValue ("")]
 		[EditorAttribute ("Microsoft.VSDesigner.Data.SQL.Design.SqlConnectionStringEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		[RecommendedAsConfigurable (true)]
+#pragma warning disable 618 // ignore obsolete warning about RecommendedAsConfigurable to use SettingsBindableAttribute
+		[RecommendedAsConfigurable(true)]
+#pragma warning restore 618
 		[RefreshProperties (RefreshProperties.All)]
 		public override string ConnectionString {
 			get {
@@ -929,13 +931,21 @@ namespace System.Data.SqlClient
 				if (Client.Available <= 0)
 					return -1; // Error
 
-				IPEndPoint endpoint = CreateLocalEndpoint ();
-				if (endpoint == null)
-					return -1;
+				IPEndPoint remoteEndpoint;
+				switch (Client.AddressFamily) {
+					case AddressFamily.InterNetwork:
+						remoteEndpoint = new IPEndPoint(IPAddress.Any, 0);
+						break;
+					case AddressFamily.InterNetworkV6:
+						remoteEndpoint = new IPEndPoint(IPAddress.IPv6Any, 0);
+						break;
+					default:
+						return -1; // Error
+				}
 
 				Byte [] rawrs;
 
-				rawrs = Receive (ref endpoint);
+				rawrs = Receive (ref remoteEndpoint);
 
 				string rs = Encoding.ASCII.GetString (rawrs);
 
@@ -957,16 +967,6 @@ namespace System.Data.SqlClient
 
 				return SqlServerTcpPort;
 			}
-
-			IPEndPoint CreateLocalEndpoint ()
-			{
-				foreach (var addr in Dns.GetHostEntry ("localhost").AddressList) {
-					if (addr.AddressFamily == Client.AddressFamily)
-						return new IPEndPoint (addr, 0);
-				}
-
-				return null;
-			}
 		}
 
 		struct ColumnInfo