Revert all changes for newly added NamedInstance unit test. There is …

…already a named instance test that is using the existing Tcp and Np connection strings.

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIProxy.cs

@@ -692,8 +692,8 @@ private bool InferNamedPipesInformation()
                             // NamedPipeClientStream object will create the network path using PipeHostName and PipeName
                             // and can be seen in its _normalizedPipePath variable in the format \\servername\pipe\MSSQL$<instancename>\sql\query
                             PipeHostName = ServerName = tokensByBackSlash[0];
-                            InferLocalServerName();
-                            PipeName = $"{InstancePrefix}{tokensByBackSlash[1].ToUpper()}{PathSeparator}{DefaultPipeName}";
+                            //InferLocalServerName();
+                            PipeName = $"{InstancePrefix}{tokensByBackSlash[1]}{PathSeparator}{DefaultPipeName}";
                         }
                         else
                         {
@@ -704,9 +704,11 @@ private bool InferNamedPipesInformation()
                     else
                     {
                         PipeHostName = ServerName = _dataSourceAfterTrimmingProtocol;
-                        InferLocalServerName();
+                        //InferLocalServerName();
                         PipeName = SNINpHandle.DefaultPipePath;
                     }
+
+                    InferLocalServerName();
                     return true;
                 }
 

src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs

@@ -27,8 +27,6 @@ public static class DataTestUtility
     {
         public static readonly string NPConnectionString = null;
         public static readonly string TCPConnectionString = null;
-        public static readonly string NPInstanceConnectionString = null;
-        public static readonly string TCPInstanceConnectionString = null;
         public static readonly string TCPConnectionStringHGSVBS = null;
         public static readonly string TCPConnectionStringAASVBS = null;
         public static readonly string TCPConnectionStringNoneVBS = null;
@@ -92,8 +90,6 @@ static DataTestUtility()
             Config c = Config.Load();
             NPConnectionString = c.NPConnectionString;
             TCPConnectionString = c.TCPConnectionString;
-            NPInstanceConnectionString = c.NPInstanceConnectionString;
-            TCPInstanceConnectionString = c.TCPInstanceConnectionString;
             TCPConnectionStringHGSVBS = c.TCPConnectionStringHGSVBS;
             TCPConnectionStringAASVBS = c.TCPConnectionStringAASVBS;
             TCPConnectionStringNoneVBS = c.TCPConnectionStringNoneVBS;
@@ -315,11 +311,6 @@ public static bool IsTCPConnStringSetup()
             return !string.IsNullOrEmpty(TCPConnectionString);
         }
 
-        public static bool IsNPInstanceConnStringsSetup()
-        {
-            return !string.IsNullOrEmpty(NPInstanceConnectionString);
-        }
-
         // Synapse: Always Encrypted is not supported with Azure Synapse.
         //          Ref: https://feedback.azure.com/forums/307516-azure-synapse-analytics/suggestions/17858869-support-always-encrypted-in-sql-data-warehouse
         public static bool AreConnStringSetupForAE()

src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/InstanceNameTest/InstanceNameTest.cs

@@ -85,26 +85,6 @@ public static void ConnectManagedWithInstanceNameTest(bool useMultiSubnetFailove
             }
         }
 
-        [ConditionalFact(typeof(DataTestUtility), nameof(DataTestUtility.IsNPInstanceConnStringsSetup), nameof(DataTestUtility.IsNotAzureServer))]
-        [PlatformSpecific(TestPlatforms.Windows)] // Named pipes with the given input strings are not supported on Unix
-        public async static void NamedPipeSecondaryInstanceTest()
-        {
-            AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows", true);
-
-            SqlConnectionStringBuilder builder = new SqlConnectionStringBuilder(DataTestUtility.NPInstanceConnectionString);
-            builder.ConnectTimeout = 5;
-            await OpenGoodConnection(builder.ConnectionString);
-        }
-
-        private async static Task OpenGoodConnection(string connectionString)
-        {
-            using (SqlConnection conn = new SqlConnection(connectionString))
-            {
-                await conn.OpenAsync();
-                DataTestUtility.AssertEqualsWithDescription( ConnectionState.Open, conn.State, "FAILED: Connection should be in open state");
-            }
-        }
-
         private static bool IsBrowserAlive(string browserHostname)
         {
             const byte ClntUcastEx = 0x03;

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/SqlDbManager.cs

@@ -23,8 +23,6 @@ public static class SqlDbManager
 
         private const string TCPConnectionString = "TCPConnectionString";
         private const string NPConnectionString = "NPConnectionString";
-        private const string TCPInstanceConnectionString = "TCPInstanceConnectionString";
-        private const string NPInstanceConnectionString = "NPInstanceConnectionString";
         private const string TCPConnectionStringAASSGX = "TCPConnectionStringAASSGX";
         private const string TCPConnectionStringAASVBS = "TCPConnectionStringAASVBS";
         private const string TCPConnectionStringHGSVBS = "TCPConnectionStringHGSVBS";
@@ -65,7 +63,7 @@ public static void Run(string[] args)
                             {
                                 // We do not create database for HGS-VBS since SQL Server for AASVBS and HGSVBS connection strings is same.
                                 // Do not create database for NP connection string, since server is always same as TCP
-                                if (activeConnString.Key != TCPConnectionStringHGSVBS && activeConnString.Key != NPConnectionString && activeConnString.Key != NPInstanceConnectionString)
+                                if (activeConnString.Key != TCPConnectionStringHGSVBS && activeConnString.Key != NPConnectionString)
                                 {
                                     //Create a new database
                                     CreateDatabase(dbName, context);
@@ -79,7 +77,7 @@ public static void Run(string[] args)
                             {
                                 // We do not drop database for HGS-VBS since SQL Server for AASVBS and HGSVBS connection strings is same.
                                 // Do not drop database for NP connection string, since server is always same as TCP
-                                if (activeConnString.Key != TCPConnectionStringHGSVBS && activeConnString.Key != NPConnectionString && activeConnString.Key != NPInstanceConnectionString)
+                                if (activeConnString.Key != TCPConnectionStringHGSVBS && activeConnString.Key != NPConnectionString)
                                 {
                                     // Drop Northwind for test run.
                                     DropIfExistsDatabase(dbName, context);
@@ -120,16 +118,6 @@ private static void LoadActiveConnectionStrings()
             {
                 s_activeConnectionStrings.Add(NPConnectionString, s_configJson.NPConnectionString);
             }
-            if (!string.IsNullOrEmpty(s_configJson.TCPInstanceConnectionString))
-            {
-                Console.WriteLine($"Loading {s_configJson.TCPInstanceConnectionString}");
-                s_activeConnectionStrings.Add(TCPInstanceConnectionString, s_configJson.TCPInstanceConnectionString);
-            }
-            if (!string.IsNullOrEmpty(s_configJson.NPInstanceConnectionString))
-            {
-                Console.WriteLine($"Loading {s_configJson.NPInstanceConnectionString}");
-                s_activeConnectionStrings.Add(NPInstanceConnectionString, s_configJson.NPInstanceConnectionString);
-            }
             if (s_configJson.EnclaveEnabled)
             {
                 if (!string.IsNullOrEmpty(s_configJson.TCPConnectionStringAASSGX))
@@ -157,12 +145,6 @@ private static void UpdateConfig(string key, SqlConnectionStringBuilder builder)
                 case NPConnectionString:
                     s_configJson.NPConnectionString = builder.ConnectionString;
                     break;
-                case TCPInstanceConnectionString:
-                    s_configJson.TCPInstanceConnectionString = builder.ConnectionString;
-                    break;
-                case NPInstanceConnectionString:
-                    s_configJson.NPInstanceConnectionString = builder.ConnectionString;
-                    break;
                 case TCPConnectionStringAASSGX:
                     s_configJson.TCPConnectionStringAASSGX = builder.ConnectionString;
                     break;

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs

@@ -12,8 +12,6 @@ public class Config
     {
         public string TCPConnectionString = null;
         public string NPConnectionString = null;
-        public string TCPInstanceConnectionString = null;
-        public string NPInstanceConnectionString = null;
         public string TCPConnectionStringHGSVBS = null;
         public string TCPConnectionStringAASVBS = null;
         public string TCPConnectionStringNoneVBS = null;