Merge 21ff396 into ea7ad53

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

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/Interop.SSPI.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.Net.Security;
 using System.Runtime.InteropServices;
@@ -388,3 +390,5 @@ internal static extern unsafe SECURITY_STATUS SspiEncodeStringsAsAuthIdentity(
             [Out] out SafeSspiAuthDataHandle authData);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/NegotiationInfoClass.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.Runtime.InteropServices;
 
 namespace System.Net
@@ -59,3 +61,5 @@ internal NegotiationInfoClass(SafeHandle safeHandle, int negotiationState)
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.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.Net.Security;
 using System.Runtime.InteropServices;
 using Microsoft.Data;
@@ -199,3 +201,5 @@ public int ApplyControlToken(ref SafeDeleteContext refContext, SecurityBuffer[]
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIInterface.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.Net.Security;
 using System.Runtime.InteropServices;
 
@@ -30,3 +32,5 @@ internal interface SSPIInterface
         int ApplyControlToken(ref SafeDeleteContext refContext, SecurityBuffer[] inputBuffers);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.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.Net.Security;
 using System.Runtime.InteropServices;
 using Microsoft.Data;
@@ -155,3 +157,5 @@ public int ApplyControlToken(ref SafeDeleteContext refContext, SecurityBuffer[]
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.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.ComponentModel;
 using System.Globalization;
 using System.Net.Security;
@@ -595,3 +597,5 @@ public static string ErrorDescription(int errorCode)
         }
     } // class SSPIWrapper
 }
+
+#endif

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

@@ -2,11 +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.
 
-using Microsoft.Win32.SafeHandles;
+#if !NET8_0_OR_GREATER
 
-using System.Diagnostics;
 using System.Runtime.InteropServices;
-using System.Security.Authentication.ExtendedProtection;
 
 namespace System.Net.Security
 {
@@ -53,3 +51,5 @@ public override string ToString()
 #endif
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecPkgContext_Bindings.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.Runtime.InteropServices;
 
 namespace System.Net
@@ -14,3 +16,5 @@ internal struct SecPkgContext_Bindings
         internal IntPtr Bindings;
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.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.Runtime.InteropServices;
 
 namespace System.Net
@@ -14,3 +16,5 @@ internal struct SecPkgContext_NegotiationInfoW
         internal uint NegotiationState;
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecPkgContext_Sizes.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
@@ -40,3 +41,5 @@ internal unsafe SecPkgContext_Sizes(byte[] memory)
         public static readonly int SizeOf = Marshal.SizeOf<SecPkgContext_Sizes>();
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecPkgContext_StreamSizes.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
@@ -42,3 +43,5 @@ internal unsafe SecPkgContext_StreamSizes(byte[] memory)
         public static readonly int SizeOf = Marshal.SizeOf<SecPkgContext_StreamSizes>();
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.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.Runtime.InteropServices;
 
 namespace System.Net
@@ -18,3 +20,5 @@ internal struct SecurityPackageInfo
         internal IntPtr Comment;
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.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.Globalization;
 using System.Runtime.InteropServices;
 
@@ -76,3 +78,5 @@ public override string ToString()
         }
     }
 }
+
+#endif

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

@@ -2,12 +2,13 @@
 // 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.Win32.SafeHandles;
+#if !NET8_0_OR_GREATER
 
 using System.Diagnostics;
 using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Security.Authentication.ExtendedProtection;
+using Microsoft.Win32.SafeHandles;
 
 namespace System.Net.Security
 {
@@ -1279,3 +1280,5 @@ protected override bool ReleaseHandle()
         }
     }
 }
+
+#endif // !NET8_OR_GREATER

src/Microsoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.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.Diagnostics;
 using System.Runtime.InteropServices;
@@ -135,3 +137,5 @@ protected override bool ReleaseHandle()
         }
     }
 }
+
+#endif