Feature | Adding TDS 8 support

src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/Interop/SNINativeMethodWrapper.cs

@@ -170,14 +170,18 @@ internal struct ConsumerInfo
             internal IntPtr key;
         }
 
-
+        [StructLayout(LayoutKind.Sequential)]
         internal struct AuthProviderInfo
         {
-            internal uint flags;
-            internal string certId;
-            internal bool certHash;
-            internal object clientCertificateCallbackContext;
-            internal SqlClientCertificateDelegate clientCertificateCallback;
+            public uint flags;
+            [MarshalAs(UnmanagedType.Bool)]
+            public bool tlsFirst;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string certId;
+            [MarshalAs(UnmanagedType.Bool)]
+            public bool certHash;
+            public object clientCertificateCallbackContext;
+            public SqlClientCertificateDelegate clientCertificateCallback;
         };
 
         internal struct CTAIPProviderInfo
@@ -810,10 +814,7 @@ internal static unsafe uint SNIOpenSyncEx(
             Boolean isAzureSqlServerEndpoint,
             SqlConnectionIPAddressPreference ipPreference,
             SQLDNSInfo cachedDNSInfo,
-            bool tlsFirst,
-            string hostNameInCertificate,
-            string databaseName,
-            ApplicationIntent applicationIntent)
+            string hostNameInCertificate)
         {
             //TDS 8 TODO: Plumb new options into native SNI call
 
@@ -891,7 +892,6 @@ internal static uint SNIAddProvider(SNIHandle pConn,
                 authInfo.clientCertificateCallbackContext = sniAuthInfoWrapper;
                 authInfo.clientCertificateCallback = SNIClientCertificateFallbackWrapper;
             }
-
             ret = SNIAddProviderWrapper(pConn, providerEnum, ref authInfo);
 
             if (ret == ERROR_SUCCESS)

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

@@ -1203,7 +1203,7 @@ private void EnableSsl(uint info, bool encrypt, bool integratedSecurity, ServerC
                     authInfo.clientCertificateCallback = _clientCertificateCallback;
                 }
             }
-
+            authInfo.tlsFirst = encrypt == SqlConnectionEncryptOption.Strict;
             error = SNINativeMethodWrapper.SNIAddProvider(_physicalStateObj.Handle, SNINativeMethodWrapper.ProviderEnum.SSL_PROV, authInfo);
 
             if (error != TdsEnums.SNI_SUCCESS)

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

@@ -152,9 +152,7 @@ internal SNIHandle(
             SqlConnectionIPAddressPreference ipPreference,
             SQLDNSInfo cachedDNSInfo,
             bool tlsFirst,
-            string hostNameInCertificate,
-            string databaseName,
-            ApplicationIntent applicationIntent)
+            string hostNameInCertificate)
             : base(IntPtr.Zero, true)
         {
 
@@ -176,7 +174,7 @@ internal SNIHandle(
                 int transparentNetworkResolutionStateNo = (int)transparentNetworkResolutionState;
                 _status = SNINativeMethodWrapper.SNIOpenSyncEx(myInfo, serverName, ref base.handle,
                             spnBuffer, instanceName, flushCache, fSync, timeout, fParallel, transparentNetworkResolutionStateNo, totalTimeout,
-                            ADP.IsAzureSqlServerEndpoint(serverName), ipPreference, cachedDNSInfo, tlsFirst, hostNameInCertificate, databaseName, applicationIntent);
+                            ADP.IsAzureSqlServerEndpoint(serverName), ipPreference, cachedDNSInfo, hostNameInCertificate);
             }
         }
 

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

@@ -890,7 +890,7 @@ internal void CreatePhysicalSNIHandle(
 
             _sessionHandle = new SNIHandle(myInfo, serverName, spnBuffer, ignoreSniOpenTimeout, checked((int)timeout),
                 out instanceName, flushCache, !async, fParallel, transparentNetworkResolutionState, totalTimeout,
-                ipPreference, cachedDNSInfo, tlsFirst, hostNameInCertificate, databaseName, applicationIntent);
+                ipPreference, cachedDNSInfo, tlsFirst, hostNameInCertificate);
         }
 
         internal bool Deactivate()