Merge in 'main' changes

Author: SqlClient Azure DevOps

src/Microsoft.Data.SqlClient/netcore/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.CloseHandle.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET8_0_OR_GREATER
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -13,3 +15,5 @@ internal partial class Kernel32
         internal static extern bool CloseHandle(IntPtr handle);
     }
 }
+
+#endif

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

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET8_0_OR_GREATER
+
 internal static partial class Interop
 {
     internal static partial class Libraries
@@ -10,3 +12,5 @@ internal static partial class Libraries
         internal const string NetSecurityNative = "System.Net.Security.Native";
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs

@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Data;
+#if !NET8_0_OR_GREATER
+
 using System;
 using System.Runtime.InteropServices;
+using Microsoft.Data;
 
 internal static partial class Interop
 {
@@ -56,3 +58,5 @@ private static string GetGssApiDisplayStatus(Status status, bool isMinor)
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs

@@ -2,10 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.Data;
+#if !NET8_0_OR_GREATER
+
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using Microsoft.Data;
 
 internal static partial class Interop
 {
@@ -74,3 +76,5 @@ static GssBuffer()
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

@@ -2,8 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET8_0_OR_GREATER
+
 using System;
-using System.Diagnostics;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
 
@@ -126,3 +127,5 @@ static NetSecurityNative()
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/Crypt32/Interop.certificates.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET8_0_OR_GREATER
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -24,3 +26,5 @@ internal static extern bool CertVerifyCertificateChainPolicy(
             [In, Out] ref CERT_CHAIN_POLICY_STATUS pPolicyStatus);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/Crypt32/Interop.certificates_types.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET8_0_OR_GREATER
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -125,3 +127,5 @@ internal unsafe struct CERT_CHAIN_POLICY_STATUS
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/SChannel/Interop.SECURITY_STATUS.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET8_0_OR_GREATER
+
 internal static partial class Interop
 {
     internal enum SECURITY_STATUS
@@ -358,3 +360,5 @@ internal static string MapSecurityStatus(uint statusCode)
         }
 #endif // TRACE_VERBOSE
 }
+
+#endif // !NET8_OR_GREATER

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/SChannel/SecPkgContext_ConnectionInfo.cs

@@ -2,7 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics;
+#if !NET8_0_OR_GREATER
+
 using System.Runtime.InteropServices;
 
 namespace System.Net
@@ -45,3 +46,5 @@ internal unsafe SecPkgContext_ConnectionInfo(byte[] nativeBuffer)
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/GlobalSSPI.cs

@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET8_0_OR_GREATER
+
 namespace System.Net
 {
     internal static class GlobalSSPI
@@ -10,3 +12,5 @@ internal static class GlobalSSPI
         internal static readonly SSPIInterface SSPISecureChannel = new SSPISecureChannelType();
     }
 }
+
+#endif