Commit 9bce6ad
Merge | OS Flags (#3810)
* Add pre-processor constants for target OS
* Add #if _WINDOWS to the Interop/Windows files
* Split out the netfx methods and junk from AdapterUtil
* Split netcore junk from AdapterUtil into a separate file. Oh wait, two methods that had separate implementations were identical...
* Merge the unix and windows version of AdapterUtil back into the main partial.
This file is too big to come up with a consistent way to split all this stuff up.
* Consolidate windows/unix versions of SqlDataSourceEnumerator into one file
* Merging DbConnectionPoolIdentity os-specific versions into the generic class.
Cleaned up some code (removed redundant parentheses, split some long lines, removed always-false variables)
* Add os #if wrappers to LocalDbApi
* Apply #if wrappers to LocalDB files
* Merge the SslOverTdsStream files together
* Split PacketHandle.Windows into PacketHandle.netcore.windows and PacketHandle.netfx.
* Wrap PacketHandle.netcore.unix in _UNIX
* Split Sessionhandle.Windows into SessionHandle.netcore.Windows and SessionHandle.netfx. This really makes these classes easier to read.
* Wrap SessionHandle.netcore.unix in _UNIX flag
* Wrap SqlColumnEncryptionCngProvider in _UNIX and _WINDOWS
* Wrap SqlColumnEncryptionCspProvider in _UNIX and _WINDOWS
* Wrap TdsParserSafeHandles.windows in _WINDOWS
* Add _UNIX wrapper to TdsParserStateObjectFactory.unix.cs
* Wrap TdsParseStateObject[Managed.netcore|Native.windows] in their respective #if's
* Wrap SqlFileStream files in appropriate #if
* Remove ILLink.Substitutions.Unix.xml and embed it in LocalAppContextSwitches
* Conditionally include ILLink.Substitutions.xml for windows *sigh*
* Make CodeAnalysis be a netfx-only file, remove unused attributes, and add comment explaining why this file exists.
* Rename SqlBatchCommand.Net8OrGreater.cs to SqlBatchCommand.netcore.cs
* Wrap SqlDataSourceEnumeratorNativeHelper.cs in windows and rename to indicate that it only applies to Windows.
* Bring in all files for the netcore project, re-sort them, make sure logical paths match the actual path
* Netcore project embedded resources
* Get rid of TargetsWindows/TargetsUnix
* Bring in all files for the netcore project, re-sort them, make sure logical paths match the actual path
* Resource files in netfx project
* Sort a few of the netfx properties to match netcore 🤷
* First round of PR comments
* Fix file inclusion
* Fix "unreachable code detected" issue in unix build
* Addressing comments from @paulmedynski
* Add OS constants to test common project, wrap app context switches that are platform specific in
Fix case-sensitivity issues in netfx project
* Reinstate _WINDOWS check on windows-only netfx files, force _WINDOWS on netfx project, remove explicit NETFRAMEWORK definition in netfx b/c the sdk does it.
---------
Co-authored-by: Ben Russell <ben@holycrapitsbenrussell>1 parent 5e14b56 commit 9bce6ad
File tree
91 files changed
+1712
-1434
lines changed- src/Microsoft.Data.SqlClient
- netcore/src
- netfx/src
- src
- Interop/Windows
- Handles
- Kernel32
- NtDll
- Sni
- Microsoft/Data
- Common
- SqlClient
- ConnectionPool
- LocalDb
- ManagedSni
- SSPI
- SqlTypes
- Sql
- Resources
- System/Diagnostics
- tests/Common
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
91 files changed
+1712
-1434
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
153 | 153 | | |
154 | 154 | | |
155 | 155 | | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
156 | 163 | | |
157 | 164 | | |
158 | 165 | | |
| |||
Lines changed: 302 additions & 316 deletions
Large diffs are not rendered by default.
Lines changed: 239 additions & 223 deletions
Large diffs are not rendered by default.
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | | - | |
| 7 | + | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
12 | 14 | | |
13 | 15 | | |
14 | 16 | | |
| 17 | + | |
| 18 | + | |
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
31 | 33 | | |
32 | 34 | | |
33 | 35 | | |
| 36 | + | |
| 37 | + | |
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
35 | 37 | | |
36 | 38 | | |
37 | 39 | | |
| 40 | + | |
| 41 | + | |
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
92 | 94 | | |
93 | 95 | | |
94 | 96 | | |
| 97 | + | |
| 98 | + | |
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
5 | 7 | | |
6 | 8 | | |
7 | 9 | | |
| |||
54 | 56 | | |
55 | 57 | | |
56 | 58 | | |
| 59 | + | |
| 60 | + | |
0 commit comments