Merge | Pull in the rest of the interop files

src/Microsoft.Data.SqlClient/netcore/src/Common/System/Net/DebugCriticalHandleMinusOneIsInvalid.cs → src/Microsoft.Data.SqlClient/src/Interop/Common/Handles/DebugCriticalHandleMinusOneIsInvalid.netcore.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 DEBUG && !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER && DEBUG
 
 using Microsoft.Win32.SafeHandles;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/System/Net/DebugCriticalHandleZeroOrMinusOneIsInvalid.cs → src/Microsoft.Data.SqlClient/src/Interop/Common/Handles/DebugCriticalHandleZeroOrMinusOneIsInvalid.netcore.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 DEBUG && !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER && DEBUG 
 
 using Microsoft.Win32.SafeHandles;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/System/Net/DebugSafeHandle.cs → src/Microsoft.Data.SqlClient/src/Interop/Common/Handles/DebugSafeHandle.netcore.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 DEBUG && !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER && DEBUG
 
 using System.Net.NetworkInformation;
 using System.Net.Sockets;

src/Microsoft.Data.SqlClient/netcore/src/Common/Microsoft/Win32/SafeHandles/GssSafeHandles.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/Handles/GssSafeHandles.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System;
 using System.Diagnostics;

src/Microsoft.Data.SqlClient/netcore/src/Common/System/Net/Security/Unix/SafeDeleteContext.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/Handles/SafeDeleteContext.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Diagnostics;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/System/Net/Security/Unix/SafeDeleteNegoContext.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/Handles/SafeDeleteNegoContext.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Diagnostics;
 using Microsoft.Win32.SafeHandles;

src/Microsoft.Data.SqlClient/netcore/src/Common/System/Net/Security/Unix/SafeFreeCredentials.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/Handles/SafeFreeCredentials.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;

src/Microsoft.Data.SqlClient/netcore/src/Common/System/Net/Security/Unix/SafeFreeNegoCredentials.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/Handles/SafeFreeNegoCredentials.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Diagnostics;
 using Microsoft.Win32.SafeHandles;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Unix/Interop.Libraries.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/Interop.Libraries.netcore.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 !NET8_0_OR_GREATER
+#if !NETFRAMEWORK && !NET8_0_OR_GREATER
 
 internal static partial class Interop
 {

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System;
 using System.Diagnostics;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs → src/Microsoft.Data.SqlClient/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/Crypt32/Interop.certificates.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/Crypt32/Interop.certificates.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/Crypt32/Interop.certificates_types.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/Crypt32/Interop.certificates_types.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Microsoft/Win32/SafeHandles/SafeLibraryHandle.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.netcore.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 NET
+
 namespace Microsoft.Win32.SafeHandles
 {
     sealed internal class SafeLibraryHandle : SafeHandleZeroOrMinusOneIsInvalid
@@ -14,3 +16,5 @@ override protected bool ReleaseHandle()
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/kernel32/Interop.CloseHandle.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Interop.CloseHandle.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/kernel32/Interop.FreeLibrary.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Interop.FreeLibrary.netcore.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 !NETFRAMEWORK
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -15,3 +17,5 @@ internal partial class Kernel32
         public static extern unsafe bool FreeLibrary([In] IntPtr hModule);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/kernel32/Interop.GetProcAddress.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Interop.GetProcAddress.netcore.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 NET
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -18,3 +20,5 @@ internal partial class Kernel32
         public static extern IntPtr GetProcAddress(IntPtr hModule, string lpProcName);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/kernel32/Interop.LoadLibraryEx.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Interop.LoadLibraryEx.netcore.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 NET
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -18,3 +20,5 @@ internal partial class Kernel32
         public static extern SafeLibraryHandle LoadLibraryExW([In] string lpwLibFileName, [In] IntPtr hFile, [In] uint dwFlags);
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/SChannel/Interop.SECURITY_STATUS.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SChannel/Interop.SECURITY_STATUS.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 internal static partial class Interop
 {

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/SChannel/Interop.SecPkgContext_ApplicationProtocol.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SChannel/Interop.SecPkgContext_ApplicationProtocol.netcore.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 NET
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -40,3 +42,5 @@ public byte[] Protocol
         }
     }
 }
+
+#endif

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/SChannel/SecPkgContext_ConnectionInfo.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SChannel/SecPkgContext_ConnectionInfo.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/GlobalSSPI.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/GlobalSSPI.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 namespace System.Net
 {

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/Interop.SSPI.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/Interop.SSPI.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System;
 using System.Net.Security;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/NegotiationInfoClass.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/NegotiationInfoClass.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SSPIAuthType.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SSPIAuthType.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Net.Security;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SSPIInterface.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SSPIInterface.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Net.Security;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SSPISecureChannelType.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SSPISecureChannelType.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Net.Security;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SSPIWrapper.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SSPIWrapper.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.ComponentModel;
 using System.Globalization;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SafeDeleteContext.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SafeDeleteContext.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SecPkgContext_Bindings.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SecPkgContext_Bindings.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SecPkgContext_NegotiationInfoW.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SecPkgContext_Sizes.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SecPkgContext_Sizes.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SecPkgContext_StreamSizes.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SecPkgContext_StreamSizes.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SecurityPackageInfo.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SecurityPackageInfo.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Runtime.InteropServices;
 

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SecurityPackageInfoClass.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SecurityPackageInfoClass.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Globalization;
 using System.Runtime.InteropServices;

src/Microsoft.Data.SqlClient/netcore/src/Common/Interop/Windows/sspicli/SecuritySafeHandles.cs → src/Microsoft.Data.SqlClient/src/Interop/Windows/SspiCli/SecuritySafeHandles.netcore.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 !NET8_0_OR_GREATER
+#if NET && !NET8_0_OR_GREATER
 
 using System.Diagnostics;
 using System.Globalization;