Review changes.

Author: mdaigle

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs

@@ -1712,12 +1712,12 @@ private void LoginNoFailover(ServerInfo serverInfo,
                         continue;
                     }
 
+                    // If state != closed, indicates that the parser encountered an error while processing the
+                    // login response (e.g. an explicit error token). Transient network errors that impact 
+                    // connectivity will result in parser state being closed.
                     if (_parser == null
+                        || _parser.State != TdsParserState.Closed
                         || IsDoNotRetryConnectError(sqlex)
-                        // If state != closed, indicates that the parser encountered an error while processing the
-                        // login response (e.g. an explicit error token). Transient network errors that impact 
-                        // connectivity will result in parser state being closed.
-                        || TdsParserState.Closed != _parser.State
                         || timeout.IsExpired)
                     {
                         // no more time to try again

src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs

@@ -816,19 +816,19 @@ internal static Version GetAssemblyVersion()
 
         internal static readonly string[] s_azureSynapseOnDemandEndpoints = [.. s_azureSqlServerOnDemandEndpoints, .. s_azureSynapseEndpoints];
 
-        internal static bool IsAzureSynapseOnDemandEndpoint(string dataSource)
+        internal static bool C(string dataSource)
         {
             return IsEndpoint(dataSource, s_azureSynapseOnDemandEndpoints)
                 || dataSource.IndexOf(AZURE_SYNAPSE, StringComparison.OrdinalIgnoreCase) >= 0; 
         }
 
         internal static bool IsAzureSqlServerEndpoint(string dataSource)
         {
-            return IsEndpoint(dataSource, s_azureSqlServerEndpoints.AsReadOnly());
+            return IsEndpoint(dataSource, s_azureSqlServerEndpoints);
         }
 
         // This method assumes dataSource parameter is in TCP connection string format.
-        private static bool IsEndpoint(string dataSource, IReadOnlyList<string> endpoints)
+        private static bool IsEndpoint(string dataSource, ICollection<string> endpoints)
         {
             int length = dataSource.Length;
             // remove server port

src/Microsoft.Data.SqlClient/tests/FunctionalTests/LocalizationTest.cs

@@ -56,9 +56,11 @@ private string GetLocalizedErrorMessage(string culture)
             Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
             Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
 
-            using TdsServer server = new TdsServer(new TdsServerArguments() { });
+            using TdsServer server = new TdsServer(new TdsServerArguments());
             server.Start();
-            var connStr = new SqlConnectionStringBuilder() { DataSource = $"dummy,{server.EndPoint.Port}" }.ConnectionString;
+            var connStr = new SqlConnectionStringBuilder() { 
+                DataSource = $"dummy,{server.EndPoint.Port}" 
+            }.ConnectionString;
             using SqlConnection connection = new SqlConnection(connStr);
 
             try

src/Microsoft.Data.SqlClient/tests/UnitTests/Microsoft/Data/SqlClient/SqlConnectionStringTest.cs

@@ -34,7 +34,7 @@ public SqlConnectionStringTest()
         [InlineData("my.test.server", true, Tristate.NotInitialized, true)]
         [InlineData("my.test.server", false, Tristate.NotInitialized, false)]
         [InlineData("my.test.server", null, Tristate.NotInitialized, true)]
-        public void TestDefaultTNIR(string dataSource, bool? tnirEnabledInConnString, Tristate tnirDisabledAppContext, bool expectedValue)
+        public void TestDefaultTnir(string dataSource, bool? tnirEnabledInConnString, Tristate tnirDisabledAppContext, bool expectedValue)
         {
             // Note: TNIR is only supported on .NET Framework.
             // Note: TNIR is disabled by default for Azure SQL Database servers (i.e. *.database.windows.net)

src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionFailoverTests.cs

@@ -322,15 +322,8 @@ public void NetworkError_WithUserProvidedPartner_RetryEnabled_ShouldConnectToFai
                 Encrypt = false,
             };
             using SqlConnection connection = new(builder.ConnectionString);
-            try
-            {
-                // Act
-                connection.Open();
-            }
-            catch (Exception e)
-            {
-                Assert.Fail(e.Message);
-            }
+            // Act
+            connection.Open();
 
             // Assert
             // On the first connection attempt, failover partner information is available in the connection string,
@@ -374,15 +367,9 @@ public void TransientFault_ShouldConnectToPrimary(uint errorCode)
                 Encrypt = false
             };
             using SqlConnection connection = new(builder.ConnectionString);
-            try
-            {
-                // Act
-                connection.Open();
-            }
-            catch (Exception e)
-            {
-                Assert.Fail(e.Message);
-            }
+
+            // Act
+            connection.Open();
 
             // Assert
             Assert.Equal(ConnectionState.Open, connection.State);
@@ -474,15 +461,9 @@ public void TransientFault_WithUserProvidedPartner_ShouldConnectToPrimary(uint e
                 FailoverPartner = $"localhost:{failoverServer.EndPoint.Port}", // User provided failover partner
             };
             using SqlConnection connection = new(builder.ConnectionString);
-            try
-            {
-                // Act
-                connection.Open();
-            }
-            catch (Exception e)
-            {
-                Assert.Fail(e.Message);
-            }
+                
+            // Act
+            connection.Open();
 
             // Assert
             Assert.Equal(ConnectionState.Open, connection.State);

src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionReadOnlyRoutingTests.cs

@@ -43,12 +43,10 @@ public async Task NonRoutedAsyncConnection()
         }
 
         [Fact]
-        public void RoutedConnection()
-            => RecursivelyRoutedConnection(1);
+        public void RoutedConnection() => RecursivelyRoutedConnection(1);
 
         [Fact]
-        public async Task RoutedAsyncConnection()
-            => await RecursivelyRoutedAsyncConnection(1);
+        public async Task RoutedAsyncConnection() => await RecursivelyRoutedAsyncConnection(1);
 
         [Theory]
         [InlineData(11)] // 11 layers of routing should succeed, 12 should fail

src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTests.cs

@@ -103,7 +103,8 @@ public void TransientFaultAtRoutedLocation_RetryDisabled_ShouldFail(uint errorCo
                 Encrypt = false,
             };
             using SqlConnection connection = new(builder.ConnectionString);
-            //TODO validate exception type
+
+            //Act and Assert
             Assert.Throws<SqlException>(() => connection.Open());
         }
 

src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionRoutingTestsAzure.cs

@@ -46,7 +46,6 @@ public void TransientFaultAtRoutedLocation_ShouldReturnToGateway(uint errorCode)
             using RoutingTdsServer router = new(
                 new RoutingTdsServerArguments()
                 {
-                    //RoutingTCPHost = server.EndPoint.Address.ToString() == IPAddress.Any.ToString() ? IPAddress.Loopback.ToString() : server.EndPoint.Address.ToString(),
                     RoutingTCPHost = "localhost",
                     RoutingTCPPort = (ushort)server.EndPoint.Port,
                 });
@@ -100,7 +99,6 @@ public void TransientFaultAtRoutedLocation_RetryDisabled_ShouldFail(uint errorCo
             using RoutingTdsServer router = new(
                 new RoutingTdsServerArguments()
                 {
-                    //RoutingTCPHost = server.EndPoint.Address.ToString() == IPAddress.Any.ToString() ? IPAddress.Loopback.ToString() : server.EndPoint.Address.ToString(),
                     RoutingTCPHost = "localhost",
                     RoutingTCPPort = (ushort)server.EndPoint.Port,
                 });
@@ -116,7 +114,6 @@ public void TransientFaultAtRoutedLocation_RetryDisabled_ShouldFail(uint errorCo
                 Encrypt = false,
             };
             using SqlConnection connection = new(builder.ConnectionString);
-            //TODO validate exception type
             Assert.Throws<SqlException>(() => connection.Open());
         }
 

src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPointConnection.cs

@@ -140,6 +140,14 @@ public void Dispose()
             {
                 Connection.Close();
                 Connection.Dispose();
+                Connection = null;
+            }
+
+            // TODO: there's a deadlock condition when awaiting the processor task
+            // only dispose of it if it's already completed
+            if (ProcessorTask.Status == TaskStatus.RanToCompletion)
+            {
+                ProcessorTask.Dispose();
             }
         }