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

Change | Simplify Conditional File Inclusion #2425

Merged
merged 10 commits into from
Apr 18, 2024
Merged

Change | Simplify Conditional File Inclusion #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d1e0dd3
Wrap files in appropriate `#if` and simplify project file
benrr101 Mar 22, 2024
b19f567
Sorting file includes
benrr101 Mar 22, 2024
8bd6438
Pulling over changes from a different branch from before rebase
benrr101 Mar 22, 2024
72f1478
Merge branch 'main' into russellben/simplify-conditionals-inclusion
benrr101 Mar 29, 2024
314e664
Merge branch 'main' into russellben/simplify-conditionals-inclusion
benrr101 Apr 4, 2024
d6bb370
Merge changes that should've come in during merge ...
benrr101 Apr 4, 2024
50c389d
Add <IsTestProject>true</IsTestProject>
benrr101 Apr 4, 2024
80f2ab0
Merge branch 'russellben/is-test-project' into russellben/simplify-co…
benrr101 Apr 4, 2024
70e0fd9
Merge branch 'main' into russellben/simplify-conditionals-inclusion
benrr101 Apr 16, 2024
21ff396
Change that should've been brought in on merge :thinking:
benrr101 Apr 17, 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
4 changes: 4 additions & 0 deletions ....SqlClient/netcore/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.CloseHandle.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 !NET8_0_OR_GREATER

using System;
using System.Runtime.InteropServices;

Expand All @@ -13,3 +15,5 @@ internal partial class Kernel32
internal static extern bool CloseHandle(IntPtr handle);
}
}

#endif
4 changes: 4 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/Interop.Libraries.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 !NET8_0_OR_GREATER

internal static partial class Interop
{
internal static partial class Libraries
Expand All @@ -10,3 +12,5 @@ internal static partial class Libraries
internal const string NetSecurityNative = "System.Net.Security.Native";
}
}

#endif
6 changes: 5 additions & 1 deletion ...netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this part of the code System.Net.Security is not being used on Unix when using Net7+. The driver is using the newly added API from #2063. Basically this part of the code could be deleted when support for net6 is over.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to know. There is several files that have !NET8_0_OR_GREATER in this PR, so theoretically they can be removed once net6 support is over. As for now, they should stay, right?


using System;
using System.Runtime.InteropServices;
using Microsoft.Data;

internal static partial class Interop
{
Expand Down Expand Up @@ -56,3 +58,5 @@ private static string GetGssApiDisplayStatus(Status status, bool isMinor)
}
}
}

#endif
6 changes: 5 additions & 1 deletion ...lient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -74,3 +76,5 @@ static GssBuffer()
}
}
}

#endif
5 changes: 4 additions & 1 deletion ...tcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -126,3 +127,5 @@ static NetSecurityNative()
}
}
}

#endif
4 changes: 4 additions & 0 deletions ...oft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/Crypt32/Interop.certificates.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 !NET8_0_OR_GREATER

using System;
using System.Runtime.InteropServices;

Expand All @@ -24,3 +26,5 @@ internal static extern bool CertVerifyCertificateChainPolicy(
[In, Out] ref CERT_CHAIN_POLICY_STATUS pPolicyStatus);
}
}

#endif
4 changes: 4 additions & 0 deletions ...ta.SqlClient/netcore/src/Common/src/Interop/Windows/Crypt32/Interop.certificates_types.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 !NET8_0_OR_GREATER

using System;
using System.Runtime.InteropServices;

Expand Down Expand Up @@ -125,3 +127,5 @@ internal unsafe struct CERT_CHAIN_POLICY_STATUS
}
}
}

#endif
4 changes: 4 additions & 0 deletions ...Data.SqlClient/netcore/src/Common/src/Interop/Windows/SChannel/Interop.SECURITY_STATUS.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 !NET8_0_OR_GREATER

internal static partial class Interop
{
internal enum SECURITY_STATUS
Expand Down Expand Up @@ -358,3 +360,5 @@ internal static string MapSecurityStatus(uint statusCode)
}
#endif // TRACE_VERBOSE
}

#endif // !NET8_OR_GREATER
5 changes: 4 additions & 1 deletion ...SqlClient/netcore/src/Common/src/Interop/Windows/SChannel/SecPkgContext_ConnectionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -45,3 +46,5 @@ internal unsafe SecPkgContext_ConnectionInfo(byte[] nativeBuffer)
}
}
}

#endif
4 changes: 4 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/GlobalSSPI.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 !NET8_0_OR_GREATER

namespace System.Net
{
internal static class GlobalSSPI
Expand All @@ -10,3 +12,5 @@ internal static class GlobalSSPI
internal static readonly SSPIInterface SSPISecureChannel = new SSPISecureChannelType();
}
}

#endif
4 changes: 4 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/Interop.SSPI.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 !NET8_0_OR_GREATER

using System;
using System.Net.Security;
using System.Runtime.InteropServices;
Expand Down Expand Up @@ -388,3 +390,5 @@ internal static extern unsafe SECURITY_STATUS SspiEncodeStringsAsAuthIdentity(
[Out] out SafeSspiAuthDataHandle authData);
}
}

#endif
4 changes: 4 additions & 0 deletions ...oft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/NegotiationInfoClass.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 !NET8_0_OR_GREATER

using System.Runtime.InteropServices;

namespace System.Net
Expand Down Expand Up @@ -59,3 +61,5 @@ internal NegotiationInfoClass(SafeHandle safeHandle, int negotiationState)
}
}
}

#endif
4 changes: 4 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIAuthType.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 !NET8_0_OR_GREATER

using System.Net.Security;
using System.Runtime.InteropServices;
using Microsoft.Data;
Expand Down Expand Up @@ -199,3 +201,5 @@ public int ApplyControlToken(ref SafeDeleteContext refContext, SecurityBuffer[]
}
}
}

#endif
4 changes: 4 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIInterface.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 !NET8_0_OR_GREATER

using System.Net.Security;
using System.Runtime.InteropServices;

Expand Down Expand Up @@ -30,3 +32,5 @@ internal interface SSPIInterface
int ApplyControlToken(ref SafeDeleteContext refContext, SecurityBuffer[] inputBuffers);
}
}

#endif
4 changes: 4 additions & 0 deletions ...ft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPISecureChannelType.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 !NET8_0_OR_GREATER

using System.Net.Security;
using System.Runtime.InteropServices;
using Microsoft.Data;
Expand Down Expand Up @@ -155,3 +157,5 @@ public int ApplyControlToken(ref SafeDeleteContext refContext, SecurityBuffer[]
}
}
}

#endif
4 changes: 4 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SSPIWrapper.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 !NET8_0_OR_GREATER

using System.ComponentModel;
using System.Globalization;
using System.Net.Security;
Expand Down Expand Up @@ -595,3 +597,5 @@ public static string ErrorDescription(int errorCode)
}
} // class SSPIWrapper
}

#endif
6 changes: 3 additions & 3 deletions ...rosoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SafeDeleteContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -53,3 +51,5 @@ public override string ToString()
#endif
}
}

#endif
4 changes: 4 additions & 0 deletions ...t.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecPkgContext_Bindings.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 !NET8_0_OR_GREATER

using System.Runtime.InteropServices;

namespace System.Net
Expand All @@ -14,3 +16,5 @@ internal struct SecPkgContext_Bindings
internal IntPtr Bindings;
}
}

#endif
4 changes: 4 additions & 0 deletions ...qlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecPkgContext_NegotiationInfoW.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 !NET8_0_OR_GREATER

using System.Runtime.InteropServices;

namespace System.Net
Expand All @@ -14,3 +16,5 @@ internal struct SecPkgContext_NegotiationInfoW
internal uint NegotiationState;
}
}

#endif
5 changes: 4 additions & 1 deletion ...soft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecPkgContext_Sizes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -40,3 +41,5 @@ internal unsafe SecPkgContext_Sizes(byte[] memory)
public static readonly int SizeOf = Marshal.SizeOf<SecPkgContext_Sizes>();
}
}

#endif
5 changes: 4 additions & 1 deletion ...ata.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecPkgContext_StreamSizes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -42,3 +43,5 @@ internal unsafe SecPkgContext_StreamSizes(byte[] memory)
public static readonly int SizeOf = Marshal.SizeOf<SecPkgContext_StreamSizes>();
}
}

#endif
4 changes: 4 additions & 0 deletions ...soft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfo.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 !NET8_0_OR_GREATER

using System.Runtime.InteropServices;

namespace System.Net
Expand All @@ -18,3 +20,5 @@ internal struct SecurityPackageInfo
internal IntPtr Comment;
}
}

#endif
4 changes: 4 additions & 0 deletions ...Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecurityPackageInfoClass.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 !NET8_0_OR_GREATER

using System.Globalization;
using System.Runtime.InteropServices;

Expand Down Expand Up @@ -76,3 +78,5 @@ public override string ToString()
}
}
}

#endif
5 changes: 4 additions & 1 deletion ...soft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/SecuritySafeHandles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -1279,3 +1280,5 @@ protected override bool ReleaseHandle()
}
}
}

#endif // !NET8_OR_GREATER
4 changes: 4 additions & 0 deletions ...osoft.Data.SqlClient/netcore/src/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.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 !NET8_0_OR_GREATER

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
Expand Down Expand Up @@ -135,3 +137,5 @@ protected override bool ReleaseHandle()
}
}
}

#endif
Loading
Loading