Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+182 −88
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
27e6af8
Move crypt32 libraries
benrr101 Oct 17, 2024
aed17d2
Move the rest of kernel32 interop
benrr101 Oct 17, 2024
855ba86
Move SChannel interop
benrr101 Oct 17, 2024
8bf0b14
Move SSPI interop
benrr101 Oct 17, 2024
f7a7960
Move unix interop
benrr101 Oct 17, 2024
1290944
Moving handle classes into common project
benrr101 Oct 18, 2024
090b751
Move debug handles back out to common folder
Oct 29, 2024
066fd7b
Moving Unix handles to common project
Oct 29, 2024
a973190
Sweep of `!NETFRAMEWORK` to `NET`
Oct 29, 2024
5ebd728
Moving the logical location of the interop files in netcore project t…
Oct 29, 2024
a5d0657
Merge branch 'main' into interop/therestofthefiles
benrr101 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 130 additions & 56 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...t/DebugCriticalHandleMinusOneIsInvalid.cs → ...riticalHandleMinusOneIsInvalid.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...gCriticalHandleZeroOrMinusOneIsInvalid.cs → ...lHandleZeroOrMinusOneIsInvalid.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion .../src/Common/System/Net/DebugSafeHandle.cs → ...Common/Handles/DebugSafeHandle.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...osoft/Win32/SafeHandles/GssSafeHandles.cs → ...op/Unix/Handles/GssSafeHandles.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...em/Net/Security/Unix/SafeDeleteContext.cs → ...Unix/Handles/SafeDeleteContext.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...et/Security/Unix/SafeDeleteNegoContext.cs → .../Handles/SafeDeleteNegoContext.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../Net/Security/Unix/SafeFreeCredentials.cs → ...ix/Handles/SafeFreeCredentials.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../Security/Unix/SafeFreeNegoCredentials.cs → ...andles/SafeFreeNegoCredentials.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../Common/Interop/Unix/Interop.Libraries.cs → ...Interop/Unix/Interop.Libraries.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...ecurity.Native/Interop.GssApiException.cs → ...Native/Interop.GssApiException.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ....Net.Security.Native/Interop.GssBuffer.cs → ...urity.Native/Interop.GssBuffer.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...urity.Native/Interop.NetSecurityNative.cs → ...tive/Interop.NetSecurityNative.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...p/Windows/Crypt32/Interop.certificates.cs → ...s/Crypt32/Interop.certificates.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ows/Crypt32/Interop.certificates_types.cs → ...t32/Interop.certificates_types.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions ...ft/Win32/SafeHandles/SafeLibraryHandle.cs → ...dows/Handles/SafeLibraryHandle.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,5 @@ override protected bool ReleaseHandle()
}
}
}

#endif
2 changes: 1 addition & 1 deletion ...p/Windows/kernel32/Interop.CloseHandle.cs → ...s/Kernel32/Interop.CloseHandle.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions ...p/Windows/kernel32/Interop.FreeLibrary.cs → ...s/Kernel32/Interop.FreeLibrary.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
mdaigle marked this conversation as resolved.
Show resolved Hide resolved

using System;
using System.Runtime.InteropServices;

Expand All @@ -15,3 +17,5 @@ internal partial class Kernel32
public static extern unsafe bool FreeLibrary([In] IntPtr hModule);
}
}

#endif
4 changes: 4 additions & 0 deletions ...indows/kernel32/Interop.GetProcAddress.cs → ...ernel32/Interop.GetProcAddress.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -18,3 +20,5 @@ internal partial class Kernel32
public static extern IntPtr GetProcAddress(IntPtr hModule, string lpProcName);
}
}

#endif
4 changes: 4 additions & 0 deletions ...Windows/kernel32/Interop.LoadLibraryEx.cs → ...Kernel32/Interop.LoadLibraryEx.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -18,3 +20,5 @@ internal partial class Kernel32
public static extern SafeLibraryHandle LoadLibraryExW([In] string lpwLibFileName, [In] IntPtr hFile, [In] uint dwFlags);
}
}

#endif
2 changes: 1 addition & 1 deletion ...ndows/SChannel/Interop.SECURITY_STATUS.cs → ...hannel/Interop.SECURITY_STATUS.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 4 additions & 0 deletions ...erop.SecPkgContext_ApplicationProtocol.cs → ...PkgContext_ApplicationProtocol.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -40,3 +42,5 @@ public byte[] Protocol
}
}
}

#endif
2 changes: 1 addition & 1 deletion .../SChannel/SecPkgContext_ConnectionInfo.cs → ...l/SecPkgContext_ConnectionInfo.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...mon/Interop/Windows/sspicli/GlobalSSPI.cs → ...rop/Windows/SspiCli/GlobalSSPI.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion ...n/Interop/Windows/sspicli/Interop.SSPI.cs → ...p/Windows/SspiCli/Interop.SSPI.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...p/Windows/sspicli/NegotiationInfoClass.cs → ...s/SspiCli/NegotiationInfoClass.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...n/Interop/Windows/sspicli/SSPIAuthType.cs → ...p/Windows/SspiCli/SSPIAuthType.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../Interop/Windows/sspicli/SSPIInterface.cs → .../Windows/SspiCli/SSPIInterface.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../Windows/sspicli/SSPISecureChannelType.cs → .../SspiCli/SSPISecureChannelType.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...on/Interop/Windows/sspicli/SSPIWrapper.cs → ...op/Windows/SspiCli/SSPIWrapper.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...erop/Windows/sspicli/SafeDeleteContext.cs → ...dows/SspiCli/SafeDeleteContext.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...Windows/sspicli/SecPkgContext_Bindings.cs → ...SspiCli/SecPkgContext_Bindings.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...sspicli/SecPkgContext_NegotiationInfoW.cs → ...SecPkgContext_NegotiationInfoW.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...op/Windows/sspicli/SecPkgContext_Sizes.cs → ...ws/SspiCli/SecPkgContext_Sizes.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...dows/sspicli/SecPkgContext_StreamSizes.cs → ...iCli/SecPkgContext_StreamSizes.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...op/Windows/sspicli/SecurityPackageInfo.cs → ...ws/SspiCli/SecurityPackageInfo.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...ndows/sspicli/SecurityPackageInfoClass.cs → ...piCli/SecurityPackageInfoClass.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...op/Windows/sspicli/SecuritySafeHandles.cs → ...ws/SspiCli/SecuritySafeHandles.netcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down