Skip to content

Cleanup | OS-independent build of non-SNI types #4207

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

Open
edwardneal wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Cleanup | OS-independent build of non-SNI types #4207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
876ef80
Remove conditional compilation from enums
edwardneal Apr 17, 2026
656d9bf
Remove conditional compilation from delegates
edwardneal Apr 17, 2026
218344c
Remove conditional compilation from SNI structs
edwardneal Apr 17, 2026
7d7db28
Remove conditional compilation from Kernel32 and SafeLibraryHandle
edwardneal Apr 17, 2026
38aab49
Remove now-unnecessary conditional compilation from using statements
edwardneal Apr 17, 2026
03e60f9
Remove conditional compilation from LocalAppContextSwitches
edwardneal Apr 18, 2026
4ffda0e
Merge LocalDB.netcore.cs between Unix and Windows
edwardneal Apr 18, 2026
6a94977
Merge branch 'main' into target-single-platforms/02-leaf-types-and-ap…
edwardneal May 13, 2026
f20e53a
Merge branch 'main' into target-single-platforms/02-leaf-types-and-ap…
edwardneal May 13, 2026
9df740c
Merge main
edwardneal Jun 5, 2026
210295d
Merge main
edwardneal Jun 27, 2026
26018a5
Merge branch 'main' into target-single-platforms/02-leaf-types-and-ap…
edwardneal Jul 3, 2026
b090cf3
Correct references to ADP.IsWindows
edwardneal Jul 3, 2026
5a89de3
Merge main
edwardneal Jul 15, 2026
2fb04a9
Remove unused using
edwardneal Jul 15, 2026
dec4f08
Code review: adjust comment
edwardneal Jul 17, 2026
f410f87
Place OsConstants.IsWindows check first
edwardneal Jul 17, 2026
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
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/src/Interop/Windows/Handles/SafeLibraryHandle.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 NET && _WINDOWS
#if NET

using Microsoft.Win32.SafeHandles;

Expand Down
11 changes: 3 additions & 8 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using Microsoft.Data.Common;
using Microsoft.Win32.SafeHandles;

#if !NETFRAMEWORK && _WINDOWS
#if NET
using Interop.Windows.Handles;
#endif

Expand All @@ -19,11 +19,6 @@ internal static class Kernel32
internal const ushort FILE_DEVICE_FILE_SYSTEM = 0x0009;
internal const uint SEM_FAILCRITICALERRORS = 1;

#if _WINDOWS && !NETFRAMEWORK
internal const int LOAD_LIBRARY_AS_DATAFILE = 0x00000002;
internal const int LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800;
#endif

private const string DllName = "kernel32.dll";

/// <summary><a href="https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/defining-i-o-control-codes">CTL_CODE</a> method.</summary>
Expand Down Expand Up @@ -54,7 +49,7 @@ internal static extern bool DeviceIoControl(
out uint cbBytesReturned,
IntPtr overlapped);

#if NET && _WINDOWS
#if NET
[DllImport(DllName, ExactSpelling = true, SetLastError = true)]
public static extern bool FreeLibrary([In] IntPtr hModule);
#endif
Expand All @@ -71,7 +66,7 @@ internal static extern int GetFullPathName(
IntPtr lpFilePartOrNull);
#endif

#if NET && _WINDOWS
#if NET
[DllImport(DllName, CharSet = CharSet.Ansi, BestFitMapping = false)]
public static extern IntPtr GetProcAddress(IntPtr hModule, string lpProcName);

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/Kernel32Safe.netfx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// 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 && _WINDOWS
#if NETFRAMEWORK

using System;
using System.Runtime.InteropServices;
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/AuthProviderInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

using System.Runtime.InteropServices;

namespace Interop.Windows.Sni
Expand All @@ -25,5 +23,3 @@ internal struct AuthProviderInfo
public string serverCertFileName;
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

using System;
using System.Runtime.InteropServices;

Expand All @@ -18,5 +16,3 @@ internal struct ConsumerInfo
internal IntPtr key;
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/ConsumerNumber.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

namespace Interop.Windows.Sni
{
internal enum ConsumerNumber
Expand All @@ -14,5 +12,3 @@ internal enum ConsumerNumber
SNI_Consumer_Invalid,
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Delegates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

using System;
using System.Runtime.InteropServices;

Expand All @@ -14,5 +12,3 @@ namespace Interop.Windows.Sni

internal delegate IntPtr SqlClientCertificateDelegate(IntPtr pCallbackContext);
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/IoType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

namespace Interop.Windows.Sni
{
internal enum IoType
Expand All @@ -12,5 +10,3 @@ internal enum IoType
WRITE,
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Prefix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

namespace Interop.Windows.Sni
{
internal enum Prefix
Expand All @@ -16,5 +14,3 @@ internal enum Prefix
INVALID_PREFIX,
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/Provider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

namespace Interop.Windows.Sni
{
internal enum Provider
Expand All @@ -26,5 +24,3 @@ internal enum Provider
INVALID_PROV,
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/QueryType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

namespace Interop.Windows.Sni
{
internal enum QueryType
Expand Down Expand Up @@ -49,5 +47,3 @@ internal enum QueryType
#endif
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniClientConsumerInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

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

Expand Down Expand Up @@ -36,5 +34,3 @@ internal unsafe struct SniClientConsumerInfo
public SniDnsCacheInfo DNSCacheInfo;
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniConsumerInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

using System;
using System.Runtime.InteropServices;

Expand All @@ -23,5 +21,3 @@ internal struct SniConsumerInfo
public IntPtr NodeAffinity;
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniDnsCacheInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

using System.Runtime.InteropServices;

namespace Interop.Windows.Sni
Expand All @@ -21,5 +19,3 @@ internal struct SniDnsCacheInfo
public string wszCachedTcpPort;
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniError.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

using System.Runtime.InteropServices;

namespace Interop.Windows.Sni
Expand All @@ -23,5 +21,3 @@ internal struct SniError
internal uint lineNumber;
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/SniSslProtocols.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

namespace Interop.Windows.Sni
{
internal enum SniSslProtocols : uint
Expand Down Expand Up @@ -32,5 +30,3 @@ internal enum SniSslProtocols : uint
SP_PROT_TLS1_3 = SP_PROT_TLS1_3_SERVER | SP_PROT_TLS1_3_CLIENT,
}
}

#endif
2 changes: 1 addition & 1 deletion ...oft.Data.SqlClient/src/Interop/Windows/Sni/SqlDependencyProcessDispatcherStorage.netfx.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 NETFRAMEWORK && _WINDOWS
#if NETFRAMEWORK

using System;
using System.Diagnostics;
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Sni/TransparentNetworkResolutionMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

#if _WINDOWS

namespace Interop.Windows.Sni
{
internal enum TransparentNetworkResolutionMode : byte
Expand All @@ -13,5 +11,3 @@ internal enum TransparentNetworkResolutionMode : byte
ParallelMode
}
}

#endif
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,9 @@
<!-- This file does not support pre-processor directives, so it must be conditionally -->
<!-- included into the build. -->
<EmbeddedResource Include="Resources\ILLink.Substitutions.xml"
Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' != 'net462'" />
Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' != 'net462'">
<LogicalName>ILLink.Substitutions.xml</LogicalName>
</EmbeddedResource>

<!-- Used by SqlMetaDataFactory to construct its DataSet -->
<EmbeddedResource Include="Resources\Microsoft.Data.SqlClient.SqlMetaData.xml">
Expand Down
2 changes: 0 additions & 2 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.netfx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
using System.Text;
using System.Threading.Tasks;

#if _WINDOWS
using Interop.Windows.Kernel32;
#endif

namespace Microsoft.Data.Common
{
Expand Down
4 changes: 1 addition & 3 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Diagnostics/SqlClientMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Licensed to the .NET Foundation under one or more agreements.
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

Expand All @@ -9,9 +9,7 @@
#if NET
using System.Threading;
#else
#if _WINDOWS
using Interop.Windows.Kernel32;
#endif
using Microsoft.Data.Common;

using System.Diagnostics;
Expand Down
26 changes: 9 additions & 17 deletions src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ internal static class LocalAppContextSwitches
private const string UseOverallConnectTimeoutForPoolWaitString =
"Switch.Microsoft.Data.SqlClient.UseOverallConnectTimeoutForPoolWait";

#if NET && _WINDOWS
#if NET
/// <summary>
/// The name of the app context switch that controls whether to use the
/// managed SNI implementation instead of the native SNI implementation on
Expand Down Expand Up @@ -258,7 +258,7 @@ private enum SwitchValue : byte
/// </summary>
private static SwitchValue s_useOverallConnectTimeoutForPoolWait = SwitchValue.None;

#if NET && _WINDOWS
#if NET
/// <summary>
/// The cached value of the UseManagedNetworking switch.
/// </summary>
Expand Down Expand Up @@ -612,7 +612,7 @@ public static bool UseCompatibilityAsyncBehaviour
defaultValue: false,
ref s_useOverallConnectTimeoutForPoolWait);

#if NET && _WINDOWS
#if NET
/// <summary>
/// When set to true, .NET on Windows will use the managed SNI
/// implementation instead of the native SNI implementation.
Expand All @@ -621,24 +621,22 @@ public static bool UseCompatibilityAsyncBehaviour
/// trimmed away when the corresponding AppContext switch is set at compile
/// time. In such cases, this property will return a constant value, even if
/// the AppContext switch is set or reset at runtime. See the
/// ILLink.Substitutions.Windows.xml and ILLink.Substitutions.Unix.xml
/// resource files for details.
/// ILLink.Substitutions.xml resource file for details.
///
/// The default value of this switch is false.
/// The default value of this switch is false on Windows and true on non-Windows platforms.
/// </summary>
public static bool UseManagedNetworking
{
get
{
if (s_useManagedNetworking != SwitchValue.None)
if (!OsConstants.IsWindows)
{
return s_useManagedNetworking == SwitchValue.True;
return true;
}

if (!OsConstants.IsWindows)
if (s_useManagedNetworking != SwitchValue.None)
{
s_useManagedNetworking = SwitchValue.True;
return true;
return s_useManagedNetworking == SwitchValue.True;
}

if (AppContext.TryGetSwitch(UseManagedNetworkingOnWindowsString, out bool returnedValue) && returnedValue)
Expand All @@ -651,12 +649,6 @@ public static bool UseManagedNetworking
return false;
}
}
#elif NET
/// <summary>
/// .NET Core on Unix does not support native SNI, so this will always be
/// true.
/// </summary>
public static bool UseManagedNetworking => true;

@paulmedynski paulmedynski Jul 17, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is a tiny performance drop on Unix, since we're now going to hit the getter on line 631. I'm guessing the JIT will chew it up though, and it will be insignificant.

#else
/// <summary>
/// .NET Framework does not support the managed SNI, so this will always be
Expand Down
Loading
Loading