Address comments

+ Disable TNIR in connection string
dotnet · May 14, 2021 · 5e5f4ce · 5e5f4ce
1 parent 0f27fde
commit 5e5f4ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs
@@ -888,7 +888,7 @@ public enum SqlConnectionAttestationProtocol
         HGS = 3
     }
 
-    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionIPAddressPreference.xml' path='docs/members[@name="SqlConnectionIPAddressPreference"]/SqlConnectionIPAddressPreference/*' />
+    /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionIPAddressPreference.xml' path='docs/members[@name="SqlConnectionIPAddressPreference"]/SqlConnectionIPAddressPreferenceNetfx/*' />
     public enum SqlConnectionIPAddressPreference
     {
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionIPAddressPreference.xml' path='docs/members[@name="SqlConnectionIPAddressPreference"]/IPv4First/*' />

diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsEnums.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsEnums.cs
@@ -1076,7 +1076,7 @@ public enum SqlConnectionAttestationProtocol
         HGS = 3
     }
 
-    /// <include file='..\..\..\..\..\..\..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionIPAddressPreference.xml' path='docs/members[@name="SqlConnectionIPAddressPreference"]/SqlConnectionIPAddressPreference/*' />
+    /// <include file='..\..\..\..\..\..\..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionIPAddressPreference.xml' path='docs/members[@name="SqlConnectionIPAddressPreference"]/SqlConnectionIPAddressPreferenceNetfx/*' />
     public enum SqlConnectionIPAddressPreference
     {
         /// <include file='..\..\..\..\..\..\..\doc\snippets\Microsoft.Data.SqlClient\SqlConnectionIPAddressPreference.xml' path='docs/members[@name="SqlConnectionIPAddressPreference"]/IPv4First/*' />

diff --git a/...Client/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs b/...Client/tests/ManualTests/SQL/ConfigurableIpPreferenceTest/ConfigurableIpPreferenceTest.cs
@@ -22,11 +22,6 @@ public class ConfigurableIpPreferenceTest
         private const string CnnPrefIPv6 = ";IPAddressPreference=IPv6First";
         private const string CnnPrefIPv4 = ";IPAddressPreference=IPv4First";
 
-        static ConfigurableIpPreferenceTest()
-        { 
-            AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.DisableTNIRByDefaultInConnectionString", true); 
-        }
-
         private static bool IsTCPConnectionStringSetup() => !string.IsNullOrEmpty(TCPConnectionString);
         private static bool IsValidDataSource()
         {
@@ -54,7 +49,11 @@ private static bool IsValidDataSource()
         [InlineData(";IPAddressPreference=UsePlatformDefault")]
         public void ConfigurableIpPreference(string ipPreference)
         {
-            using (SqlConnection connection = new SqlConnection(TCPConnectionString + ipPreference))
+            using (SqlConnection connection = new SqlConnection(TCPConnectionString + ipPreference
+#if NETFRAMEWORK
+                + ";TransparentNetworkIPResolution=false"   // doesn't support in .NET Core
+#endif
+                ))
             {
                 connection.Open();
                 Assert.Equal(ConnectionState.Open, connection.State);