Skip to content

Commit 91f238c

Browse files
mdaiglemdaigle
authored
Refactor for modular connection pool (#3199)
1 parent 55ca37c commit 91f238c

33 files changed

+301
-277
lines changed

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

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@
5353
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionOptions.Common.cs">
5454
<Link>Microsoft\Data\Common\DbConnectionOptions.Common.cs</Link>
5555
</Compile>
56-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionPoolKey.cs">
57-
<Link>Microsoft\Data\Common\DbConnectionPoolKey.cs</Link>
58-
</Compile>
5956
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionStringCommon.cs">
6057
<Link>Microsoft\Data\Common\DbConnectionStringCommon.cs</Link>
6158
</Compile>
@@ -71,38 +68,56 @@
7168
<Compile Include="$(CommonSourceRoot)Microsoft\Data\OperationAbortedException.cs">
7269
<Link>Microsoft\Data\OperationAbortedException.cs</Link>
7370
</Compile>
71+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
72+
<Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
73+
</Compile>
7474
<Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbConnectionClosed.cs">
7575
<Link>Microsoft\Data\ProviderBase\DbConnectionClosed.cs</Link>
7676
</Compile>
7777
<Compile Include="$(CommonSourceRoot)\Microsoft\Data\ProviderBase\DbConnectionFactory.cs">
7878
<Link>Microsoft\Data\ProviderBase\DbConnectionFactory.cs</Link>
7979
</Compile>
80-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPool.cs">
81-
<Link>Microsoft\Data\ProviderBase\DbConnectionPool.cs</Link>
80+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPool.cs">
81+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPool.cs</Link>
8282
</Compile>
83-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
84-
<Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
83+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs">
84+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs</Link>
85+
</Compile>
86+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs">
87+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs</Link>
8588
</Compile>
86-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs">
87-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs</Link>
89+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs">
90+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs</Link>
8891
</Compile>
89-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs">
90-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs</Link>
92+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs">
93+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs</Link>
9194
</Compile>
92-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolGroup.cs">
93-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroup.cs</Link>
95+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs">
96+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs</Link>
9497
</Compile>
95-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs">
96-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs</Link>
98+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs">
99+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs</Link>
97100
</Compile>
98-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs">
99-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs</Link>
101+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs">
102+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs</Link>
100103
</Compile>
101-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs">
102-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs</Link>
104+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs">
105+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs</Link>
103106
</Compile>
104-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs">
105-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs</Link>
107+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs">
108+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs</Link>
109+
</Compile>
110+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs">
111+
<Link>Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs</Link>
112+
</Compile>
113+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs">
114+
<Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs</Link>
115+
</Compile>
116+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs">
117+
<Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs</Link>
118+
</Compile>
119+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs">
120+
<Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs</Link>
106121
</Compile>
107122
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbMetaDataFactory.cs">
108123
<Link>Microsoft\Data\ProviderBase\DbMetaDataFactory.cs</Link>
@@ -419,15 +434,6 @@
419434
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs">
420435
<Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs</Link>
421436
</Compile>
422-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs">
423-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs</Link>
424-
</Compile>
425-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs">
426-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs</Link>
427-
</Compile>
428-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
429-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
430-
</Compile>
431437
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionString.cs">
432438
<Link>Microsoft\Data\SqlClient\SqlConnectionString.cs</Link>
433439
</Compile>
@@ -783,8 +789,8 @@
783789
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Windows.cs">
784790
<Link>Microsoft\Data\Common\AdapterUtil.Windows.cs</Link>
785791
</Compile>
786-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs">
787-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs</Link>
792+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
793+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
788794
</Compile>
789795
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs">
790796
<Link>Microsoft\Data\Sql\SqlDataSourceEnumeratorNativeHelper.cs</Link>
@@ -827,8 +833,8 @@
827833
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\AdapterUtil.Unix.cs">
828834
<Link>Microsoft\Data\Common\AdapterUtil.Unix.cs</Link>
829835
</Compile>
830-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs">
831-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Unix.cs</Link>
836+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs">
837+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Unix.cs</Link>
832838
</Compile>
833839
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Unix.cs">
834840
<Link>Microsoft\Data\SqlClient\LocalDb\LocalDbApi.Unix.cs</Link>

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using System.Threading.Tasks;
2020
using Microsoft.Data.Common;
2121
using Microsoft.Data.ProviderBase;
22+
using Microsoft.Data.SqlClient.ConnectionPool;
2223
using Microsoft.Data.SqlClient.Diagnostics;
2324
using Microsoft.SqlServer.Server;
2425

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using System.IO;
99
using Microsoft.Data.Common;
1010
using Microsoft.Data.ProviderBase;
11+
using Microsoft.Data.SqlClient.ConnectionPool;
1112

1213
namespace Microsoft.Data.SqlClient
1314
{

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Transactions;
1111
using Microsoft.Data.Common;
1212
using Microsoft.Data.ProviderBase;
13+
using Microsoft.Data.SqlClient.ConnectionPool;
1314

1415

1516
namespace Microsoft.Data.SqlClient

‎src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using System.Transactions;
1818
using Microsoft.Data.Common;
1919
using Microsoft.Data.ProviderBase;
20+
using Microsoft.Data.SqlClient.ConnectionPool;
2021
using Microsoft.Identity.Client;
2122

2223
namespace Microsoft.Data.SqlClient

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

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@
241241
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionOptions.Common.cs">
242242
<Link>Microsoft\Data\Common\DbConnectionOptions.Common.cs</Link>
243243
</Compile>
244-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\DbConnectionPoolKey.cs">
245-
<Link>Microsoft\Data\Common\DbConnectionPoolKey.cs</Link>
246-
</Compile>
247244
<Compile Include="$(CommonSourceRoot)Microsoft\Data\Common\MultipartIdentifier.cs">
248245
<Link>Microsoft\Data\Common\MultipartIdentifier.cs</Link>
249246
</Compile>
@@ -265,35 +262,53 @@
265262
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
266263
<Link>Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
267264
</Compile>
268-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPool.cs">
269-
<Link>Microsoft\Data\ProviderBase\DbConnectionPool.cs</Link>
265+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPool.cs">
266+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPool.cs</Link>
267+
</Compile>
268+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs">
269+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContext.cs</Link>
270+
</Compile>
271+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs">
272+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolAuthenticationContextKey.cs</Link>
273+
</Compile>
274+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolCounters.netfx.cs">
275+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolCounters.netfx.cs</Link>
276+
</Compile>
277+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs">
278+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroup.cs</Link>
279+
</Compile>
280+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs">
281+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolGroupProviderInfo.cs</Link>
270282
</Compile>
271-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs">
272-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContext.cs</Link>
283+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs">
284+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.cs</Link>
273285
</Compile>
274-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs">
275-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolAuthenticationContextKey.cs</Link>
286+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs">
287+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolIdentity.Windows.cs</Link>
276288
</Compile>
277-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolCounters.netfx.cs">
278-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolCounters.netfx.cs</Link>
289+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs">
290+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolKey.cs</Link>
279291
</Compile>
280-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolGroup.cs">
281-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroup.cs</Link>
292+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs">
293+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolOptions.cs</Link>
282294
</Compile>
283-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs">
284-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolGroupProviderInfo.cs</Link>
295+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs">
296+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolProviderInfo.cs</Link>
285297
</Compile>
286-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs">
287-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.cs</Link>
298+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs">
299+
<Link>Microsoft\Data\SqlClient\ConnectionPool\DbConnectionPoolState.cs</Link>
288300
</Compile>
289-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs">
290-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs</Link>
301+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs">
302+
<Link>Microsoft\Data\SqlClient\ConnectionPool\WaitHandleDbConnectionPool.cs</Link>
291303
</Compile>
292-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs">
293-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolOptions.cs</Link>
304+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs">
305+
<Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolGroupProviderInfo.cs</Link>
294306
</Compile>
295-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs">
296-
<Link>Microsoft\Data\ProviderBase\DbConnectionPoolProviderInfo.cs</Link>
307+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolKey.cs">
308+
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs</Link>
309+
</Compile>
310+
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs">
311+
<Link>Microsoft\Data\SqlClient\ConnectionPool\SqlConnectionPoolProviderInfo.cs</Link>
297312
</Compile>
298313
<Compile Include="$(CommonSourceRoot)Microsoft\Data\ProviderBase\DbMetaDataFactory.cs">
299314
<Link>Microsoft\Data\ProviderBase\DbMetaDataFactory.cs</Link>
@@ -658,15 +673,6 @@
658673
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs">
659674
<Link>Microsoft\Data\SqlClient\SqlConnectionEncryptOptionConverter.cs</Link>
660675
</Compile>
661-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs">
662-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs</Link>
663-
</Compile>
664-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs">
665-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs</Link>
666-
</Compile>
667-
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
668-
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
669-
</Compile>
670676
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlConnectionString.cs">
671677
<Link>Microsoft\Data\SqlClient\SqlConnectionString.cs</Link>
672678
</Compile>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
using System.Threading;
2626
using System.Threading.Tasks;
2727
using Microsoft.Data.ProviderBase;
28+
using Microsoft.Data.SqlClient.ConnectionPool;
2829
using Microsoft.SqlServer.Server;
2930

3031
[assembly: InternalsVisibleTo("System.Data.DataSetExtensions, PublicKey=" + Microsoft.Data.SqlClient.AssemblyRef.EcmaPublicKeyFull)] // DevDiv Bugs 92166

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using System.Runtime.Versioning;
1212
using Microsoft.Data.Common;
1313
using Microsoft.Data.ProviderBase;
14+
using Microsoft.Data.SqlClient.ConnectionPool;
1415
using Microsoft.Data.SqlClient.Server;
1516

1617
namespace Microsoft.Data.SqlClient

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionHelper.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ namespace Microsoft.Data.SqlClient
1010
using System.Diagnostics;
1111
using System.Runtime.ConstrainedExecution;
1212
using System.Threading;
13+
using System.Transactions;
1314
using Microsoft.Data.Common;
1415
using Microsoft.Data.ProviderBase;
15-
using System.Transactions;
16+
using Microsoft.Data.SqlClient.ConnectionPool;
1617

1718
public sealed partial class SqlConnection : DbConnection
1819
{
@@ -79,7 +80,7 @@ internal DbConnectionOptions ConnectionOptions
7980
{
8081
get
8182
{
82-
Microsoft.Data.ProviderBase.DbConnectionPoolGroup poolGroup = PoolGroup;
83+
DbConnectionPoolGroup poolGroup = PoolGroup;
8384
return poolGroup != null ? poolGroup.ConnectionOptions : null;
8485
}
8586
}
@@ -102,7 +103,7 @@ private void ConnectionString_Set(string value)
102103
private void ConnectionString_Set(DbConnectionPoolKey key)
103104
{
104105
DbConnectionOptions connectionOptions = null;
105-
Microsoft.Data.ProviderBase.DbConnectionPoolGroup poolGroup = ConnectionFactory.GetConnectionPoolGroup(key, null, ref connectionOptions);
106+
DbConnectionPoolGroup poolGroup = ConnectionFactory.GetConnectionPoolGroup(key, null, ref connectionOptions);
106107
DbConnectionInternal connectionInternal = InnerConnection;
107108
bool flag = connectionInternal.AllowSetConnectionString;
108109
if (flag)
@@ -144,7 +145,7 @@ internal DbConnectionInternal InnerConnection
144145
}
145146
}
146147

147-
internal Microsoft.Data.ProviderBase.DbConnectionPoolGroup PoolGroup
148+
internal DbConnectionPoolGroup PoolGroup
148149
{
149150
get
150151
{
@@ -341,7 +342,7 @@ internal void PermissionDemand()
341342
{
342343
Debug.Assert(DbConnectionClosedConnecting.SingletonInstance == _innerConnection, "not connecting");
343344

344-
Microsoft.Data.ProviderBase.DbConnectionPoolGroup poolGroup = PoolGroup;
345+
DbConnectionPoolGroup poolGroup = PoolGroup;
345346
DbConnectionOptions connectionOptions = poolGroup != null ? poolGroup.ConnectionOptions : null;
346347
if (connectionOptions == null || connectionOptions.IsEmpty)
347348
{

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using System.Threading.Tasks;
1818
using Microsoft.Data.Common;
1919
using Microsoft.Data.ProviderBase;
20+
using Microsoft.Data.SqlClient.ConnectionPool;
2021
using Microsoft.Identity.Client;
2122
using System.Transactions;
2223

0 commit comments

Comments
 (0)