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

Commit12614c8

Browse files
committed
Merge branch 'main' into dev/russellben/cleanup/sni
2 parentsa84d4ab +91f238c commit12614c8

File tree

69 files changed

+2493
-1095
lines changed

Some content is hidden

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

69 files changed

+2493
-1095
lines changed

‎azurepipelines-coverage.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Azure DevOps code coverage settings:
2+
#
3+
# https://learn.microsoft.com/en-us/azure/devops/pipelines/test/codecoverage-for-pullrequests?view=azure-devops#configuring-coverage-settings
4+
#
5+
coverage:
6+
# Code coverage status will be posted to pull requests based on targets
7+
# defined below.
8+
status:
9+
# Off by default. When on, details about coverage for each file changed will
10+
# be posted as a pull request comment.
11+
comments:on
12+
# Diff coverage is code coverage only for the lines changed in a pull
13+
# request.
14+
diff:
15+
# Set this to a desired %. Default is 70%.
16+
target:70%

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@
5353
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionOptions.Common.cs">
5454
<Link>Microsoft\Data\Common\DbConnectionOptions.Common.cs</Link>
5555
</Compile>
56-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionPoolKey.cs">
57-
<Link>Microsoft\Data\Common\DbConnectionPoolKey.cs</Link>
58-
</Compile>
5956
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionStringCommon.cs">
6057
<Link>Microsoft\Data\Common\DbConnectionStringCommon.cs</Link>
6158
</Compile>
@@ -71,38 +68,56 @@
7168
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\OperationAbortedException.cs">
7269
<Link>Microsoft\Data\OperationAbortedException.cs</Link>
7370
</Compile>
71+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
72+
<Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
73+
</Compile>
7474
<CompileInclude="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbConnectionClosed.cs">
7575
<Link>Microsoft\Data\ProviderBase\DbConnectionClosed.cs</Link>
7676
</Compile>
7777
<CompileInclude="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbConnectionFactory.cs">
7878
<Link>Microsoft\Data\ProviderBase\DbConnectionFactory.cs</Link>
7979
</Compile>
80-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPool.cs">
81-
<Link>Microsoft\Data\ProviderBase\DbConnectionPool.cs</Link>
80+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPool.cs">
81+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPool.cs</Link>
8282
</Compile>
83-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
84-
<Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
83+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs">
84+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs</Link>
85+
</Compile>
86+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs">
87+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs</Link>
88+
</Compile>
89+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs">
90+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs</Link>
8591
</Compile>
86-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs">
87-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs</Link>
92+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs">
93+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs</Link>
8894
</Compile>
89-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs">
90-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs</Link>
95+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs">
96+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs</Link>
9197
</Compile>
92-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolGroup.cs">
93-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroup.cs</Link>
98+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs">
99+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs</Link>
94100
</Compile>
95-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs">
96-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs</Link>
101+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs">
102+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs</Link>
97103
</Compile>
98-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs">
99-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs</Link>
104+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs">
105+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs</Link>
100106
</Compile>
101-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs">
102-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs</Link>
107+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs">
108+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs</Link>
103109
</Compile>
104-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs">
105-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs</Link>
110+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs">
111+
<Link>Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs</Link>
112+
</Compile>
113+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs">
114+
<Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs</Link>
115+
</Compile>
116+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs">
117+
<Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs</Link>
118+
</Compile>
119+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs">
120+
<Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs</Link>
106121
</Compile>
107122
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbMetaDataFactory.cs">
108123
<Link>Microsoft\Data\ProviderBase\DbMetaDataFactory.cs</Link>
@@ -155,6 +170,9 @@
155170
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs">
156171
<Link>Microsoft\Data\SqlClient\AzureAttestationBasedEnclaveProvider.cs</Link>
157172
</Compile>
173+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ClientInterface.cs">
174+
<Link>Microsoft\Data\SqlClient\ClientInterface.cs</Link>
175+
</Compile>
158176
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
159177
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
160178
</Compile>
@@ -416,15 +434,6 @@
416434
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs">
417435
<Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs</Link>
418436
</Compile>
419-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs">
420-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs</Link>
421-
</Compile>
422-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs">
423-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs</Link>
424-
</Compile>
425-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
426-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
427-
</Compile>
428437
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionString.cs">
429438
<Link>Microsoft\Data\SqlClient\SqlConnectionString.cs</Link>
430439
</Compile>
@@ -780,8 +789,8 @@
780789
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Windows.cs">
781790
<Link>Microsoft\Data\Common\AdapterUtil.Windows.cs</Link>
782791
</Compile>
783-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs">
784-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs</Link>
792+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
793+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
785794
</Compile>
786795
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs">
787796
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs</Link>
@@ -824,8 +833,8 @@
824833
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Unix.cs">
825834
<Link>Microsoft\Data\Common\AdapterUtil.Unix.cs</Link>
826835
</Compile>
827-
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs">
828-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs</Link>
836+
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs">
837+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs</Link>
829838
</Compile>
830839
<CompileInclude="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Unix.cs">
831840
<Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Unix.cs</Link>

0 commit comments

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