Address comments

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

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionIPAddressPreference.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlConnectionIPAddressPreference.xml
@@ -1,6 +1,6 @@
 <docs>
  <members name="SqlConnectionIPAddressPreference">
- <SqlConnectionIPAddressPreference>
+ <SqlConnectionIPAddressPreferenceNetfx>
  <summary>
  Specifies a value for IP address preference during a TCP connection.
  </summary>
@@ -9,6 +9,18 @@
 
 ## Remarks
 If `Multi Subnet Failover` or "Transparent Network IP Resolution" is set to `true`, this setting has no effect.
+]]></format>
+ </remarks>
+ </SqlConnectionIPAddressPreferenceNetfx>
+ <SqlConnectionIPAddressPreference>
+ <summary>
+ Specifies a value for IP address preference during a TCP connection.
+ </summary>
+ <remarks>
+ <format type="text/markdown"><![CDATA[
+
+## Remarks
+If `Multi Subnet Failover` is set to `true`, this setting has no effect.
 ]]></format>
  </remarks>
  </SqlConnectionIPAddressPreference>

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);