Skip to content

Cleanup | Preparation for OS-independent builds #3844

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 6 commits into
base: main
Choose a base branch
from
+80 −341
Open

Cleanup | Preparation for OS-independent builds #3844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
032f173
Implement early infrastructure for OS-independent builds.
edwardneal Dec 12, 2025
20b8b98
SqlFileStream
edwardneal Dec 12, 2025
102ac3e
SqlColumnEncryptionCngProvider
edwardneal Dec 12, 2025
a2b5eeb
SqlColumnEncryptionCspProvider
edwardneal Dec 12, 2025
37fa1e6
Manually inline ThrowOnNonWindowsPlatform
edwardneal Dec 12, 2025
a063609
Correct preprocessor directive indentation
edwardneal Dec 15, 2025
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
21 changes: 6 additions & 15 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,17 +722,11 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.unix.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.netcore.unix.cs</Link>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.unix.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.netcore.unix.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs</Link>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs</Link>
Expand Down Expand Up @@ -1004,11 +998,8 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
<Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.netcore.unix.cs">
<Link>Microsoft\Data\SqlTypes\SqlFileStream.netcore.unix.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.windows.cs">
<Link>Microsoft\Data\SqlTypes\SqlFileStream.windows.cs</Link>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.cs">
<Link>Microsoft\Data\SqlTypes\SqlFileStream.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlJson.cs">
<Link>Microsoft\Data\SqlTypes\SqlJson.cs</Link>
Expand Down
12 changes: 6 additions & 6 deletions src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,11 +717,11 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCertificateStoreProvider.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.windows.cs</Link>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCngProvider.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.windows.cs</Link>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionCspProvider.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionEnclaveProvider.cs</Link>
Expand Down Expand Up @@ -981,8 +981,8 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlDbTypeExtensions.cs">
<Link>Microsoft\Data\SqlDbTypeExtensions.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.windows.cs">
<Link>Microsoft\Data\SqlTypes\SqlFileStream.windows.cs</Link>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlFileStream.cs">
<Link>Microsoft\Data\SqlTypes\SqlFileStream.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlTypes\SqlJson.cs">
<Link>Microsoft\Data\SqlTypes\SqlJson.cs</Link>
Expand Down
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/FileTypes.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.Kernel32
{
internal class FileTypes
Expand All @@ -14,5 +12,3 @@ internal class FileTypes
internal const int FILE_TYPE_PIPE = 0x0003;
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlCodeAccess.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;

namespace Interop.Windows.Kernel32
Expand Down Expand Up @@ -33,5 +31,3 @@ public enum IoControlCodeAccess
FILE_WRITE_DATA = 0x02
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/Kernel32/IoControlTransferType.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.Kernel32
{
/// <summary>
Expand Down Expand Up @@ -37,5 +35,3 @@ public enum IoControlTransferType
METHOD_NEITHER
}
}

#endif
16 changes: 4 additions & 12 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 @@ -2,16 +2,14 @@
// 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;
using System.Runtime.Versioning;
using System.Text;
using Microsoft.Data.Common;
using Microsoft.Win32.SafeHandles;

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

Expand All @@ -22,7 +20,7 @@ internal static class Kernel32
internal const ushort FILE_DEVICE_FILE_SYSTEM = 0x0009;
internal const uint SEM_FAILCRITICALERRORS = 1;

#if !NETFRAMEWORK
#if _WINDOWS && !NETFRAMEWORK
internal const int LOAD_LIBRARY_AS_DATAFILE = 0x00000002;
internal const int LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800;
#endif
Expand Down Expand Up @@ -57,7 +55,7 @@ internal static extern bool DeviceIoControl(
out uint cbBytesReturned,
IntPtr overlapped);

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

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

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

#if NET
[DllImport(DllName, ExactSpelling = true, CharSet = CharSet.Unicode, SetLastError = true)]
public static extern SafeLibraryHandle LoadLibraryExW([In] string lpwLibFileName, [In] IntPtr hFile, [In] uint dwFlags);
#endif
Expand All @@ -94,5 +88,3 @@ internal static extern int GetFullPathName(
internal static extern bool SetThreadErrorMode(uint dwNewMode, out uint lpOldMode);
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateDisposition.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.NtDll
{
/// <summary>
Expand Down Expand Up @@ -56,5 +54,3 @@ internal enum CreateDisposition : uint
FILE_OVERWRITE_IF = 5
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/CreateOptions.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;

namespace Interop.Windows.NtDll
Expand Down Expand Up @@ -198,5 +196,3 @@ internal enum CreateOptions : uint
// FILE_OPEN_FOR_FREE_SPACE_QUERY = 0x00800000
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/DesiredAccess.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;

namespace Interop.Windows.NtDll
Expand Down Expand Up @@ -190,5 +188,3 @@ internal enum DesiredAccess : uint
FILE_GENERIC_EXECUTE = 0x20000000 // GENERIC_EXECUTE
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/FileFullEaInformation.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.NtDll
Expand Down Expand Up @@ -37,5 +35,3 @@ internal struct FileFullEaInformation

}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ImpersonationLevel.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.NtDll
{
/// <summary>
Expand Down Expand Up @@ -41,5 +39,3 @@ internal enum ImpersonationLevel
SecurityDelegation = 3,
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/IoStatusBlock.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 Down Expand Up @@ -44,5 +42,3 @@ public struct IoStatus
}
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/NtDll.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.IO;
using System.Runtime.InteropServices;
Expand Down Expand Up @@ -120,5 +118,3 @@ private static extern unsafe int NtCreateFile(
uint EaLength);
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributeFlags.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;

namespace Interop.Windows.NtDll
Expand Down Expand Up @@ -54,5 +52,3 @@ internal enum ObjectAttributeFlags : uint
// OBJ_VALID_ATTRIBUTES = 0x000001F2
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/ObjectAttributes.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;

namespace Interop.Windows.NtDll
Expand Down Expand Up @@ -60,5 +58,3 @@ public ObjectAttributes(
}
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/NtDll/SecurityQualityOfService.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.NtDll
Expand Down Expand Up @@ -50,5 +48,3 @@ public SecurityQualityOfService(
public bool IsEffectiveOnly { get; set; }
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/SystemErrors.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
{
// https://msdn.microsoft.com/en-us/library/windows/desktop/ms681382.aspx
Expand All @@ -22,5 +20,3 @@ internal class SystemErrors
internal const int ERROR_MR_MID_NOT_FOUND = 317;
}
}

#endif
4 changes: 0 additions & 4 deletions src/Microsoft.Data.SqlClient/src/Interop/Windows/UnicodeString.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
Expand Down Expand Up @@ -36,5 +34,3 @@ public UnicodeString(char* buffer, int length)
}
}
}

#endif
Loading
Loading