Streamline conditional compilation symbols (#2486)

Author: ErikEJ

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

@@ -478,7 +478,7 @@ public static partial class SqlClientMetaDataCollectionNames
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlClientMetaDataCollectionNames.xml' path='docs/members[@name="SqlClientMetaDataCollectionNames"]/StructuredTypeMembers/*' />
         public static readonly string StructuredTypeMembers;
     }
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
     /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionAttestationProtocol.xml' path='docs/members[@name="SqlConnectionAttestationProtocol"]/SqlConnectionAttestationProtocol/*' />
     public enum SqlConnectionAttestationProtocol
     {
@@ -1017,7 +1017,7 @@ public SqlConnectionStringBuilder(string connectionString) { }
         [System.ComponentModel.DisplayNameAttribute("Data Source")]
         [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
         public string DataSource { get { throw null; } set { } }
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnectionStringBuilder.xml' path='docs/members[@name="SqlConnectionStringBuilder"]/AttestationProtocol/*' />
         [System.ComponentModel.DisplayNameAttribute("Attestation Protocol")]
         [System.ComponentModel.RefreshPropertiesAttribute(System.ComponentModel.RefreshProperties.All)]
@@ -1444,7 +1444,7 @@ internal SqlException() { }
         public byte State { get { throw null; } }
 
         /// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlException.xml' path='docs/members[@name="SqlException"]/GetObjectData/*'/>
-#if !NET6_0_OR_GREATER
+#if NETFRAMEWORK
         [System.Security.Permissions.SecurityPermissionAttribute(System.Security.Permissions.SecurityAction.LinkDemand, Flags = System.Security.Permissions.SecurityPermissionFlag.SerializationFormatter)]
 #endif
 #if NET8_0_OR_GREATER

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/Interop.Libraries.cs

@@ -9,7 +9,7 @@ internal static partial class Libraries
         internal const string Crypt32 = "crypt32.dll";
         internal const string Kernel32 = "kernel32.dll";
         internal const string NtDll = "ntdll.dll";
-#if !NET7_0_OR_GREATER
+#if !NET8_0_OR_GREATER
         internal const string SspiCli = "sspicli.dll";
 #endif
     }

src/Microsoft.Data.SqlClient/netcore/src/Common/src/System/Net/Logging/NetEventSource.Common.cs

@@ -13,7 +13,7 @@
 using System.Diagnostics.Tracing;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-#if net462
+#if NETFRAMEWORK
 using System.Security;
 #endif
 
@@ -45,7 +45,7 @@ namespace System.Net
     //   method that takes an object and optionally provides a string representation of it, in case a particular library wants to customize further.
 
     /// <summary>Provides logging facilities for System.Net libraries.</summary>
-#if net462
+#if NETFRAMEWORK
     [SecuritySafeCritical]
 #endif
     internal sealed partial class NetEventSource : EventSource

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.NetCoreApp.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
 
 using System.Diagnostics;
 using Microsoft.Data.Common;

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/ProviderBase/DbConnectionPool.cs

@@ -776,7 +776,7 @@ private DbConnectionInternal CreateObject(DbConnection owningObject, DbConnectio
                     throw;
                 }
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
                 if (!IsBlockingPeriodEnabled())
                 {
                     throw;

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

@@ -190,7 +190,7 @@ internal static bool ValidateSslServerCertificate(string targetServerName, X509C
 
                 if (policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNameMismatch))
                 {
-#if NET7_0_OR_GREATER
+#if NET8_0_OR_GREATER
                     X509Certificate2 cert2 = cert as X509Certificate2;
                     if (!cert2.MatchesHostname(targetServerName))
                     {
@@ -297,7 +297,7 @@ internal static bool ValidateSslServerCertificate(X509Certificate clientCert, X5
 
                 if (policyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNameMismatch))
                 {
-#if NET7_0_OR_GREATER
+#if NET8_0_OR_GREATER
                     X509Certificate2 s_cert = serverCert as X509Certificate2;
                     X509Certificate2 c_cert = clientCert as X509Certificate2;
 

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

@@ -26,7 +26,7 @@ internal class SNIProxy
         private static readonly SNIProxy s_singleton = new SNIProxy();
 
         internal static SNIProxy Instance => s_singleton;
-#if !NET7_0_OR_GREATER 
+#if !NET8_0_OR_GREATER 
         /// <summary>
         /// Generate SSPI context
         /// </summary>

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

@@ -1008,7 +1008,7 @@ public override void KillConnection()
 
         internal static void SetKeepAliveValues(ref Socket socket)
         {
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
             socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
             socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 1);
             socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 30);

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

@@ -3994,7 +3994,7 @@ private SqlDataReader GetParameterEncryptionDataReader(out Task returnTask, Task
                     SqlCommand command = (SqlCommand)state;
                     bool processFinallyBlockAsync = true;
                     bool decrementAsyncCountInFinallyBlockAsync = true;
-#if !NET6_0_OR_GREATER 
+#if NETFRAMEWORK 
                     RuntimeHelpers.PrepareConstrainedRegions();
 #endif
                     try
@@ -4068,7 +4068,7 @@ private SqlDataReader GetParameterEncryptionDataReaderAsync(out Task returnTask,
                 bool processFinallyBlockAsync = true;
                 bool decrementAsyncCountInFinallyBlockAsync = true;
 
-#if !NET6_0_OR_GREATER 
+#if NETFRAMEWORK
                 RuntimeHelpers.PrepareConstrainedRegions();
 #endif
                 try

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionFactory.AssemblyLoadContext.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETCOREAPP
+#if NET6_0_OR_GREATER
 
 using System;
 using System.Reflection;