remove unneeded if/def

Author: twsouthwick

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -146,9 +146,6 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ApplicationIntent.cs">
       <Link>Microsoft\Data\SqlClient\ApplicationIntent.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ArrayBufferWriter.cs">
-      <Link>Microsoft\Data\SqlClient\ArrayBufferWriter.cs</Link>
-    </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\AssemblyRef.cs">
       <Link>Microsoft\Data\SqlClient\AssemblyRef.cs</Link>
     </Compile>

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIProxy.cs

@@ -26,121 +26,7 @@ internal class SNIProxy
         private static readonly SNIProxy s_singleton = new SNIProxy();
 
         internal static SNIProxy Instance => s_singleton;
-#if !NET8_0_OR_GREATER 
-        /// <summary>
-        /// Generate SSPI context
-        /// </summary>
-        /// <param name="sspiClientContextStatus">SSPI client context status</param>
-        /// <param name="receivedBuff">Receive buffer</param>
-        /// <param name="sendWriter">Writer for send buffer</param>
-        /// <param name="serverName">Service Principal Name buffer</param>
-        /// <returns>SNI error code</returns>
-        internal static void GenSspiClientContext(SspiClientContextStatus sspiClientContextStatus, ReadOnlySpan<byte> receivedBuff, IBufferWriter<byte> sendWriter, byte[][] serverName)
-        {
-            // TODO: this should use ReadOnlyMemory all the way through
-            byte[] array = null;
-
-            if (!receivedBuff.IsEmpty)
-            {
-                array = new byte[receivedBuff.Length];
-                receivedBuff.CopyTo(array);
-            }
-
-            GenSspiClientContext(sspiClientContextStatus, array, sendWriter, serverName);
-        }
-
-        private static void GenSspiClientContext(SspiClientContextStatus sspiClientContextStatus, byte[] receivedBuff, IBufferWriter<byte> sendWriter, byte[][] serverName)
-        {
-            SafeDeleteContext securityContext = sspiClientContextStatus.SecurityContext;
-            ContextFlagsPal contextFlags = sspiClientContextStatus.ContextFlags;
-            SafeFreeCredentials credentialsHandle = sspiClientContextStatus.CredentialsHandle;
-
-            string securityPackage = NegotiationInfoClass.Negotiate;
-
-            if (securityContext == null)
-            {
-                credentialsHandle = NegotiateStreamPal.AcquireDefaultCredential(securityPackage, false);
-            }
-
-            SecurityBuffer[] inSecurityBufferArray;
-            if (receivedBuff != null)
-            {
-                inSecurityBufferArray = new SecurityBuffer[] { new SecurityBuffer(receivedBuff, SecurityBufferType.SECBUFFER_TOKEN) };
-            }
-            else
-            {
-                inSecurityBufferArray = Array.Empty<SecurityBuffer>();
-            }
-
-            int tokenSize = NegotiateStreamPal.QueryMaxTokenSize(securityPackage);
-
-            SecurityBuffer outSecurityBuffer = new SecurityBuffer(tokenSize, SecurityBufferType.SECBUFFER_TOKEN);
 
-            ContextFlagsPal requestedContextFlags = ContextFlagsPal.Connection
-                | ContextFlagsPal.Confidentiality
-                | ContextFlagsPal.Delegate
-                | ContextFlagsPal.MutualAuth;
-
-            string[] serverSPNs = new string[serverName.Length];
-            for (int i = 0; i < serverName.Length; i++)
-            {
-                serverSPNs[i] = Encoding.Unicode.GetString(serverName[i]);
-            }
-            SecurityStatusPal statusCode = NegotiateStreamPal.InitializeSecurityContext(
-                       credentialsHandle,
-                       ref securityContext,
-                       serverSPNs,
-                       requestedContextFlags,
-                       inSecurityBufferArray,
-                       outSecurityBuffer,
-                       ref contextFlags);
-
-            if (statusCode.ErrorCode == SecurityStatusPalErrorCode.CompleteNeeded ||
-                statusCode.ErrorCode == SecurityStatusPalErrorCode.CompAndContinue)
-            {
-                inSecurityBufferArray = new SecurityBuffer[] { outSecurityBuffer };
-                statusCode = NegotiateStreamPal.CompleteAuthToken(ref securityContext, inSecurityBufferArray);
-                outSecurityBuffer.token = null;
-            }
-
-            if (outSecurityBuffer.token is { } token)
-            {
-                sendWriter.Write(token);
-            }
-
-            sspiClientContextStatus.SecurityContext = securityContext;
-            sspiClientContextStatus.ContextFlags = contextFlags;
-            sspiClientContextStatus.CredentialsHandle = credentialsHandle;
-
-            if (IsErrorStatus(statusCode.ErrorCode))
-            {
-                // Could not access Kerberos Ticket.
-                //
-                // SecurityStatusPalErrorCode.InternalError only occurs in Unix and always comes with a GssApiException,
-                // so we don't need to check for a GssApiException here.
-                if (statusCode.ErrorCode == SecurityStatusPalErrorCode.InternalError)
-                {
-                    throw new InvalidOperationException(SQLMessage.KerberosTicketMissingError() + Environment.NewLine + statusCode);
-                }
-                else
-                {
-                    throw new InvalidOperationException(SQLMessage.SSPIGenerateError() + Environment.NewLine + statusCode);
-                }
-            }
-        }
-
-        private static bool IsErrorStatus(SecurityStatusPalErrorCode errorCode)
-        {
-            return errorCode != SecurityStatusPalErrorCode.NotSet &&
-                errorCode != SecurityStatusPalErrorCode.OK &&
-                errorCode != SecurityStatusPalErrorCode.ContinueNeeded &&
-                errorCode != SecurityStatusPalErrorCode.CompleteNeeded &&
-                errorCode != SecurityStatusPalErrorCode.CompAndContinue &&
-                errorCode != SecurityStatusPalErrorCode.ContextExpired &&
-                errorCode != SecurityStatusPalErrorCode.CredentialsNeeded &&
-                errorCode != SecurityStatusPalErrorCode.Renegotiate;
-        }
-#endif
         /// <summary>
         /// Create a SNI connection handle
         /// </summary>

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ArrayBufferWriter.cs

@@ -242,7 +242,7 @@ private void CheckAndResizeBuffer(int sizeHint)
 
         private static void ThrowInvalidOperationException_AdvancedTooFar(int capacity)
         {
-            throw new InvalidOperationException($"Buffer advanced to far: {capacity}");
+            throw new InvalidOperationException($"Buffer advanced too far: {capacity}");
         }
 
         private static void ThrowOutOfMemoryException(uint capacity)