Merge | Pull in the rest of the interop files (#2933)

* Move crypt32 libraries * Move the rest of kernel32 interop * Move SChannel interop * Move SSPI interop * Move unix interop * Moving handle classes into common project * Move debug handles back out to common folder * Moving Unix handles to common project * Sweep of `!NETFRAMEWORK` to `NET` * Moving the logical location of the interop files in netcore project to the same as their physical location ... mostly so I don't lose my mind --------- Co-authored-by: Ben Russell <ben@holycrapitsbenrussell>
dotnet · Nov 1, 2024 · 984d544 · 984d544
1 parent 87fa6dc
commit 984d544
Show file tree

Hide file tree

Showing 38 changed files with 182 additions and 88 deletions.
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
diff --git a/...t/DebugCriticalHandleMinusOneIsInvalid.cs → ...riticalHandleMinusOneIsInvalid.netcore.cs b/...t/DebugCriticalHandleMinusOneIsInvalid.cs → ...riticalHandleMinusOneIsInvalid.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;
 

diff --git a/...gCriticalHandleZeroOrMinusOneIsInvalid.cs → ...lHandleZeroOrMinusOneIsInvalid.netcore.cs b/...gCriticalHandleZeroOrMinusOneIsInvalid.cs → ...lHandleZeroOrMinusOneIsInvalid.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;
 

diff --git a/.../src/Common/System/Net/DebugSafeHandle.cs → ...Common/Handles/DebugSafeHandle.netcore.cs b/.../src/Common/System/Net/DebugSafeHandle.cs → ...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;

diff --git a/...osoft/Win32/SafeHandles/GssSafeHandles.cs → ...op/Unix/Handles/GssSafeHandles.netcore.cs b/...osoft/Win32/SafeHandles/GssSafeHandles.cs → ...op/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;

diff --git a/...em/Net/Security/Unix/SafeDeleteContext.cs → ...Unix/Handles/SafeDeleteContext.netcore.cs b/...em/Net/Security/Unix/SafeDeleteContext.cs → ...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;

diff --git a/...et/Security/Unix/SafeDeleteNegoContext.cs → .../Handles/SafeDeleteNegoContext.netcore.cs b/...et/Security/Unix/SafeDeleteNegoContext.cs → .../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;

diff --git a/.../Net/Security/Unix/SafeFreeCredentials.cs → ...ix/Handles/SafeFreeCredentials.netcore.cs b/.../Net/Security/Unix/SafeFreeCredentials.cs → ...ix/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;

diff --git a/.../Security/Unix/SafeFreeNegoCredentials.cs → ...andles/SafeFreeNegoCredentials.netcore.cs b/.../Security/Unix/SafeFreeNegoCredentials.cs → ...andles/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;

diff --git a/.../Common/Interop/Unix/Interop.Libraries.cs → ...Interop/Unix/Interop.Libraries.netcore.cs b/.../Common/Interop/Unix/Interop.Libraries.cs → ...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
 {

diff --git a/...ecurity.Native/Interop.GssApiException.cs → ...Native/Interop.GssApiException.netcore.cs b/...ecurity.Native/Interop.GssApiException.cs → ...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;

diff --git a/....Net.Security.Native/Interop.GssBuffer.cs → ...urity.Native/Interop.GssBuffer.netcore.cs b/....Net.Security.Native/Interop.GssBuffer.cs → ...urity.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;

diff --git a/...urity.Native/Interop.NetSecurityNative.cs → ...tive/Interop.NetSecurityNative.netcore.cs b/...urity.Native/Interop.NetSecurityNative.cs → ...tive/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;

diff --git a/...p/Windows/Crypt32/Interop.certificates.cs → ...s/Crypt32/Interop.certificates.netcore.cs b/...p/Windows/Crypt32/Interop.certificates.cs → ...s/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;

diff --git a/...ows/Crypt32/Interop.certificates_types.cs → ...t32/Interop.certificates_types.netcore.cs b/...ows/Crypt32/Interop.certificates_types.cs → ...t32/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;

diff --git a/...ft/Win32/SafeHandles/SafeLibraryHandle.cs → ...dows/Handles/SafeLibraryHandle.netcore.cs b/...ft/Win32/SafeHandles/SafeLibraryHandle.cs → ...dows/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
diff --git a/...p/Windows/kernel32/Interop.CloseHandle.cs → ...s/Kernel32/Interop.CloseHandle.netcore.cs b/...p/Windows/kernel32/Interop.CloseHandle.cs → ...s/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;

diff --git a/...p/Windows/kernel32/Interop.FreeLibrary.cs → ...s/Kernel32/Interop.FreeLibrary.netcore.cs b/...p/Windows/kernel32/Interop.FreeLibrary.cs → ...s/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
diff --git a/...indows/kernel32/Interop.GetProcAddress.cs → ...ernel32/Interop.GetProcAddress.netcore.cs b/...indows/kernel32/Interop.GetProcAddress.cs → ...ernel32/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
diff --git a/...Windows/kernel32/Interop.LoadLibraryEx.cs → ...Kernel32/Interop.LoadLibraryEx.netcore.cs b/...Windows/kernel32/Interop.LoadLibraryEx.cs → ...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
diff --git a/...ndows/SChannel/Interop.SECURITY_STATUS.cs → ...hannel/Interop.SECURITY_STATUS.netcore.cs b/...ndows/SChannel/Interop.SECURITY_STATUS.cs → ...hannel/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
 {

diff --git a/...erop.SecPkgContext_ApplicationProtocol.cs → ...PkgContext_ApplicationProtocol.netcore.cs b/...erop.SecPkgContext_ApplicationProtocol.cs → ...PkgContext_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
diff --git a/.../SChannel/SecPkgContext_ConnectionInfo.cs → ...l/SecPkgContext_ConnectionInfo.netcore.cs b/.../SChannel/SecPkgContext_ConnectionInfo.cs → ...l/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;
 

diff --git a/...mon/Interop/Windows/sspicli/GlobalSSPI.cs → ...rop/Windows/SspiCli/GlobalSSPI.netcore.cs b/...mon/Interop/Windows/sspicli/GlobalSSPI.cs → ...rop/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
 {

diff --git a/...n/Interop/Windows/sspicli/Interop.SSPI.cs → ...p/Windows/SspiCli/Interop.SSPI.netcore.cs b/...n/Interop/Windows/sspicli/Interop.SSPI.cs → ...p/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;

diff --git a/...p/Windows/sspicli/NegotiationInfoClass.cs → ...s/SspiCli/NegotiationInfoClass.netcore.cs b/...p/Windows/sspicli/NegotiationInfoClass.cs → ...s/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;
 

diff --git a/...n/Interop/Windows/sspicli/SSPIAuthType.cs → ...p/Windows/SspiCli/SSPIAuthType.netcore.cs b/...n/Interop/Windows/sspicli/SSPIAuthType.cs → ...p/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;

diff --git a/.../Interop/Windows/sspicli/SSPIInterface.cs → .../Windows/SspiCli/SSPIInterface.netcore.cs b/.../Interop/Windows/sspicli/SSPIInterface.cs → .../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;

diff --git a/.../Windows/sspicli/SSPISecureChannelType.cs → .../SspiCli/SSPISecureChannelType.netcore.cs b/.../Windows/sspicli/SSPISecureChannelType.cs → .../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;

diff --git a/...on/Interop/Windows/sspicli/SSPIWrapper.cs → ...op/Windows/SspiCli/SSPIWrapper.netcore.cs b/...on/Interop/Windows/sspicli/SSPIWrapper.cs → ...op/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;

diff --git a/...erop/Windows/sspicli/SafeDeleteContext.cs → ...dows/SspiCli/SafeDeleteContext.netcore.cs b/...erop/Windows/sspicli/SafeDeleteContext.cs → ...dows/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;
 

diff --git a/...Windows/sspicli/SecPkgContext_Bindings.cs → ...SspiCli/SecPkgContext_Bindings.netcore.cs b/...Windows/sspicli/SecPkgContext_Bindings.cs → ...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;
 

diff --git a/...sspicli/SecPkgContext_NegotiationInfoW.cs → ...SecPkgContext_NegotiationInfoW.netcore.cs b/...sspicli/SecPkgContext_NegotiationInfoW.cs → ...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;
 

diff --git a/...op/Windows/sspicli/SecPkgContext_Sizes.cs → ...ws/SspiCli/SecPkgContext_Sizes.netcore.cs b/...op/Windows/sspicli/SecPkgContext_Sizes.cs → ...ws/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;
 

diff --git a/...dows/sspicli/SecPkgContext_StreamSizes.cs → ...iCli/SecPkgContext_StreamSizes.netcore.cs b/...dows/sspicli/SecPkgContext_StreamSizes.cs → ...iCli/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;
 

diff --git a/...op/Windows/sspicli/SecurityPackageInfo.cs → ...ws/SspiCli/SecurityPackageInfo.netcore.cs b/...op/Windows/sspicli/SecurityPackageInfo.cs → ...ws/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;
 

diff --git a/...ndows/sspicli/SecurityPackageInfoClass.cs → ...piCli/SecurityPackageInfoClass.netcore.cs b/...ndows/sspicli/SecurityPackageInfoClass.cs → ...piCli/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;

diff --git a/...op/Windows/sspicli/SecuritySafeHandles.cs → ...ws/SspiCli/SecuritySafeHandles.netcore.cs b/...op/Windows/sspicli/SecuritySafeHandles.cs → ...ws/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;