Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit68d35bb

Browse files
authored
Change | Simplify Conditional File Inclusion (#2425)
* Wrap files in appropriate `#if` and simplify project file* Sorting file includes* Pulling over changes from a different branch from before rebase* Merge changes that should've come in during merge ...* Add <IsTestProject>true</IsTestProject>* Change that should've been brought in on merge 🤔
1 parentea7ad53 commit68d35bb

File tree

78 files changed

+578
-340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+578
-340
lines changed

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/CoreLib/Interop/Windows/Kernel32/Interop.CloseHandle.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if!NET8_0_OR_GREATER
6+
57
usingSystem;
68
usingSystem.Runtime.InteropServices;
79

@@ -13,3 +15,5 @@ internal partial class Kernel32
1315
internalstaticexternboolCloseHandle(IntPtrhandle);
1416
}
1517
}
18+
19+
#endif

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/Interop.Libraries.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if!NET8_0_OR_GREATER
6+
57
internalstaticpartialclassInterop
68
{
79
internalstaticpartialclassLibraries
@@ -10,3 +12,5 @@ internal static partial class Libraries
1012
internalconststringNetSecurityNative="System.Net.Security.Native";
1113
}
1214
}
15+
16+
#endif

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssApiException.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
usingMicrosoft.Data;
5+
#if!NET8_0_OR_GREATER
6+
67
usingSystem;
78
usingSystem.Runtime.InteropServices;
9+
usingMicrosoft.Data;
810

911
internalstaticpartialclassInterop
1012
{
@@ -56,3 +58,5 @@ private static string GetGssApiDisplayStatus(Status status, bool isMinor)
5658
}
5759
}
5860
}
61+
62+
#endif

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
usingMicrosoft.Data;
5+
#if!NET8_0_OR_GREATER
6+
67
usingSystem;
78
usingSystem.Diagnostics;
89
usingSystem.Runtime.InteropServices;
10+
usingMicrosoft.Data;
911

1012
internalstaticpartialclassInterop
1113
{
@@ -74,3 +76,5 @@ static GssBuffer()
7476
}
7577
}
7678
}
79+
80+
#endif

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if!NET8_0_OR_GREATER
6+
57
usingSystem;
6-
usingSystem.Diagnostics;
78
usingSystem.Runtime.InteropServices;
89
usingMicrosoft.Win32.SafeHandles;
910

@@ -126,3 +127,5 @@ static NetSecurityNative()
126127
}
127128
}
128129
}
130+
131+
#endif

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/Crypt32/Interop.certificates.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if!NET8_0_OR_GREATER
6+
57
usingSystem;
68
usingSystem.Runtime.InteropServices;
79

@@ -24,3 +26,5 @@ internal static extern bool CertVerifyCertificateChainPolicy(
2426
[In,Out]refCERT_CHAIN_POLICY_STATUSpPolicyStatus);
2527
}
2628
}
29+
30+
#endif

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/Crypt32/Interop.certificates_types.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if!NET8_0_OR_GREATER
6+
57
usingSystem;
68
usingSystem.Runtime.InteropServices;
79

@@ -125,3 +127,5 @@ internal unsafe struct CERT_CHAIN_POLICY_STATUS
125127
}
126128
}
127129
}
130+
131+
#endif

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/SChannel/Interop.SECURITY_STATUS.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if!NET8_0_OR_GREATER
6+
57
internalstaticpartialclassInterop
68
{
79
internalenumSECURITY_STATUS
@@ -358,3 +360,5 @@ internal static string MapSecurityStatus(uint statusCode)
358360
}
359361
#endif// TRACE_VERBOSE
360362
}
363+
364+
#endif// !NET8_OR_GREATER

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/SChannel/SecPkgContext_ConnectionInfo.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
usingSystem.Diagnostics;
5+
#if!NET8_0_OR_GREATER
6+
67
usingSystem.Runtime.InteropServices;
78

89
namespaceSystem.Net
@@ -45,3 +46,5 @@ internal unsafe SecPkgContext_ConnectionInfo(byte[] nativeBuffer)
4546
}
4647
}
4748
}
49+
50+
#endif

‎src/Microsoft.Data.SqlClient/netcore/src/Common/src/Interop/Windows/sspicli/GlobalSSPI.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if!NET8_0_OR_GREATER
6+
57
namespaceSystem.Net
68
{
79
internalstaticclassGlobalSSPI
@@ -10,3 +12,5 @@ internal static class GlobalSSPI
1012
internalstaticreadonlySSPIInterfaceSSPISecureChannel=newSSPISecureChannelType();
1113
}
1214
}
15+
16+
#endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp