Merge CreatePhysicalSNIHandle

Author: edwardneal

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObject.netcore.cs

@@ -67,25 +67,6 @@ protected TdsParserStateObject(TdsParser parser, TdsParserStateObject physicalCo
         // General methods //
         /////////////////////
 
-        internal abstract void CreatePhysicalSNIHandle(
-            string serverName,
-            TimeoutTimer timeout,
-            out byte[] instanceName,
-            ref string[] spns,
-            bool flushCache,
-            bool async,
-            bool fParallel,
-            TransparentNetworkResolutionState transparentNetworkResolutionState,
-            int totalTimeout,
-            SqlConnectionIPAddressPreference iPAddressPreference,
-            string cachedFQDN,
-            ref SQLDNSInfo pendingDNSInfo,
-            string serverSPN,
-            bool isIntegratedSecurity = false,
-            bool tlsFirst = false,
-            string hostNameInCertificate = "",
-            string serverCertificateFilename = "");
-
         protected abstract void FreeGcHandle(int remaining, bool release);
 
         internal abstract uint EnableSsl(ref uint info, bool tlsFirst, string serverCertificateFilename);

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

@@ -104,51 +104,6 @@ protected ConsumerInfo CreateConsumerInfo(bool async)
             return myInfo;
         }
 
-        internal void CreatePhysicalSNIHandle(
-            string serverName,
-            TimeoutTimer timeout,
-            out byte[] instanceName,
-            ref string[] spns,
-            bool flushCache,
-            bool async,
-            bool fParallel,
-            TransparentNetworkResolutionState transparentNetworkResolutionState,
-            int totalTimeout,
-            SqlConnectionIPAddressPreference iPAddressPreference,
-            string cachedFQDN,
-            ref SQLDNSInfo pendingDNSInfo,
-            string serverSPN,
-            bool isIntegratedSecurity = false,
-            bool tlsFirst = false,
-            string hostNameInCertificate = "",
-            string serverCertificateFilename = "")
-        {
-            if (isIntegratedSecurity)
-            {
-                if (!string.IsNullOrEmpty(serverSPN))
-                {
-                    SqlClientEventSource.Log.TryTraceEvent("<sc.TdsParser.Connect|SEC> Server SPN `{0}` from the connection string is used.", serverSPN);
-                }
-                else
-                {
-                    // Empty signifies to interop layer that SPN needs to be generated
-                    serverSPN = string.Empty;
-                }
-            }
-
-            ConsumerInfo myInfo = CreateConsumerInfo(async);
-
-            // serverName : serverInfo.ExtendedServerName
-            // may not use this serverName as key
-
-            _ = SQLFallbackDNSCache.Instance.GetDNSInfo(cachedFQDN, out SQLDNSInfo cachedDNSInfo);
-
-            _sessionHandle = new SNIHandle(myInfo, serverName, ref serverSPN, timeout.MillisecondsRemainingInt,
-                out instanceName, flushCache, !async, fParallel, transparentNetworkResolutionState, totalTimeout,
-                iPAddressPreference, cachedDNSInfo, hostNameInCertificate);
-            spns = new[] { serverSPN.TrimEnd() };
-        }
-
         internal uint CheckConnection() => SniNativeWrapper.SniCheckConnection(Handle);
 
         [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]

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

@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using Interop.Windows.Sni;
 using Microsoft.Data.Common;
+using Microsoft.Data.ProviderBase;
 
 namespace Microsoft.Data.SqlClient
 {
@@ -106,6 +107,51 @@ internal override void AssignPendingDNSInfo(string userProtocol, string DNSCache
             }
         }
 
+        internal override void CreatePhysicalSNIHandle(
+            string serverName,
+            TimeoutTimer timeout,
+            out byte[] instanceName,
+            ref string[] spns,
+            bool flushCache,
+            bool async,
+            bool fParallel,
+            TransparentNetworkResolutionState transparentNetworkResolutionState,
+            int totalTimeout,
+            SqlConnectionIPAddressPreference iPAddressPreference,
+            string cachedFQDN,
+            ref SQLDNSInfo pendingDNSInfo,
+            string serverSPN,
+            bool isIntegratedSecurity = false,
+            bool tlsFirst = false,
+            string hostNameInCertificate = "",
+            string serverCertificateFilename = "")
+        {
+            if (isIntegratedSecurity)
+            {
+                if (!string.IsNullOrEmpty(serverSPN))
+                {
+                    SqlClientEventSource.Log.TryTraceEvent("<sc.TdsParser.Connect|SEC> Server SPN `{0}` from the connection string is used.", serverSPN);
+                }
+                else
+                {
+                    // Empty signifies to interop layer that SPN needs to be generated
+                    serverSPN = string.Empty;
+                }
+            }
+
+            ConsumerInfo myInfo = CreateConsumerInfo(async);
+
+            // serverName : serverInfo.ExtendedServerName
+            // may not use this serverName as key
+
+            _ = SQLFallbackDNSCache.Instance.GetDNSInfo(cachedFQDN, out SQLDNSInfo cachedDNSInfo);
+
+            _sessionHandle = new SNIHandle(myInfo, serverName, ref serverSPN, timeout.MillisecondsRemainingInt,
+                out instanceName, flushCache, !async, fParallel, transparentNetworkResolutionState, totalTimeout,
+                iPAddressPreference, cachedDNSInfo, hostNameInCertificate);
+            spns = new[] { serverSPN.TrimEnd() };
+        }
+
         protected override uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize)
         {
             Debug.Assert(packet.Type == PacketHandle.NativePointerType, "unexpected packet type when requiring NativePointer");

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs

@@ -12,6 +12,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Data.Common;
+using Microsoft.Data.ProviderBase;
+
 #if NETFRAMEWORK
 using System.Runtime.ConstrainedExecution;
 #endif
@@ -487,6 +489,25 @@ internal long TimeoutTime
 
         internal abstract void AssignPendingDNSInfo(string userProtocol, string DNSCacheKey, ref SQLDNSInfo pendingDNSInfo);
 
+        internal abstract void CreatePhysicalSNIHandle(
+            string serverName,
+            TimeoutTimer timeout,
+            out byte[] instanceName,
+            ref string[] spns,
+            bool flushCache,
+            bool async,
+            bool fParallel,
+            TransparentNetworkResolutionState transparentNetworkResolutionState,
+            int totalTimeout,
+            SqlConnectionIPAddressPreference iPAddressPreference,
+            string cachedFQDN,
+            ref SQLDNSInfo pendingDNSInfo,
+            string serverSPN,
+            bool isIntegratedSecurity = false,
+            bool tlsFirst = false,
+            string hostNameInCertificate = "",
+            string serverCertificateFilename = "");
+
         internal abstract PacketHandle GetResetWritePacket(int dataSize);
 
         protected abstract uint SniPacketGetData(PacketHandle packet, byte[] _inBuff, ref uint dataSize);