Skip to content

Merge | SqlInternalConnectionTds #3760

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

Merged
benrr101 merged 56 commits into from
Nov 14, 2025
Merged

Merge | SqlInternalConnectionTds #3760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
67c3819
Introduce partial for SqlInternalConnectionTds
benrr101 Oct 27, 2025
b7df614
Merge MaxNumberOfRedirectRoute, MsalHttpRetryStatusCode, _accessToken…
benrr101 Oct 27, 2025
67848e4
Merge accessTokenExpirationBufferTime
benrr101 Oct 27, 2025
da2c73f
Merge _dnsCachingBeforeRedirect, _SQLDNSRetryEnabled, IsSqlDnsCaching…
benrr101 Oct 27, 2025
161f254
Merging _forceMsalRetry, _forceExpiryLocked, _forceExpiryUnLocked, Is…
benrr101 Oct 27, 2025
1ea8e58
Merge _dbAuthenticationContextLockedRefreshTimeSpan, _dbAuthenticatio…
benrr101 Oct 28, 2025
73d8cb2
Merge _asyncCommandCount, _fConnectionOpen, _currentLanguage, _curren…
benrr101 Oct 28, 2025
93debea
Merge _clientConnectionId, _originalClientConnectionId, _routingDesti…
benrr101 Oct 28, 2025
d46aee8
Merge AvailableInternalTransaction, ClientConnectionid, CurrentTransa…
benrr101 Oct 28, 2025
8581a51
Merge ServerVersion (rewrite using string interpolation), InstanceNam…
benrr101 Oct 28, 2025
5d74b87
Merge IsAccesTokenExpired, UnbindOnTransactionCompletion
benrr101 Oct 29, 2025
144a9cd
Merge IgnoreEnvChange, ThreadHasParserLockForClose
benrr101 Oct 29, 2025
282ecee
Merge ChangeDatabaseInternal
benrr101 Oct 29, 2025
8f9dab8
Merge Dispose
benrr101 Oct 29, 2025
3e0649a
Merge ValidateConnectionForExecute
benrr101 Oct 29, 2025
89fa5ea
Merge CheckEnlistedTransactionBinding
benrr101 Oct 29, 2025
7deca1b
Merge IsConnectionAlive, Activate
benrr101 Oct 29, 2025
ae0f909
Merge InternalDeactivate
benrr101 Oct 29, 2025
8cec5c7
Merge ResetConnection
benrr101 Oct 29, 2025
0e089f0
Merge DecrementAsyncCount, DisconnectTransaction, IncrementAsyncCount
benrr101 Oct 29, 2025
f809dce
Merge ExecuteTransaction, Remove unused ExecuteTransaction overload
benrr101 Oct 29, 2025
5f9143c
Merge ExecuteTransaction2005
benrr101 Oct 29, 2025
5a73c92
Merge GetDTCAddress, PropagateTransactionCookie; Remove DelegateTrans…
benrr101 Oct 29, 2025
05baf5c
Merge CompleteLogin
benrr101 Oct 29, 2025
cea5a8b
Merge Login
benrr101 Oct 29, 2025
d94c9f2
Merge LoginFailure
benrr101 Oct 29, 2025
842d13e
Merge OpenLoginEnlist
benrr101 Oct 29, 2025
3aeebc3
Merge IsDoNotRetryConnectError
benrr101 Nov 7, 2025
26d4599
Merge LoginNoFailure
benrr101 Nov 7, 2025
8e8f760
Merge ShouldDisableTnir from netframework
benrr101 Nov 7, 2025
9bb5b82
Merge AttemptRetryADAuthWithTimeoutError
benrr101 Nov 7, 2025
73b41ce
Merge LoginWithFailover
benrr101 Nov 7, 2025
a01200a
Merge ResolveExtendedServerName
benrr101 Nov 7, 2025
bfb58e5
Merge AttemptOneLogin (resolve conflicts), FailoverPermissionDemand (…
benrr101 Nov 7, 2025
d5987c3
Merge ObtainAdditionalLocksForClose, ReleaseAdditionalLocksForClose
benrr101 Nov 7, 2025
ed706b8
Merge GetSessionAndReconnectIfNeeded
benrr101 Nov 7, 2025
901b0f6
Merge BreakConnection
benrr101 Nov 7, 2025
faaf384
Merge OnEnvChange
benrr101 Nov 8, 2025
a948fb3
Merge OnLoginAck
benrr101 Nov 8, 2025
3d3744e
Merge OnFedAuthInfo
benrr101 Nov 8, 2025
a2e5e42
Merge TryGetFedAuthTokenLocked
benrr101 Nov 8, 2025
40edcfb
Introduce SqlException overload for single error scenarios (ie, the m…
benrr101 Nov 8, 2025
80053e1
Merge GetFedAuthToken
benrr101 Nov 8, 2025
ee8f95e
Merge OnFeatureExtAck
benrr101 Nov 11, 2025
484e96f
Merge constructor and TryReplaceConnection
benrr101 Nov 11, 2025
07e4ece
Start merging the SyncAsyncLock
benrr101 Nov 11, 2025
55aeb40
Merge SyncAsyncLock._semaphor, SyncAsyncLock.CanBeReleasedFromAnyThre…
benrr101 Nov 11, 2025
ff352f0
Merge SyncAsyncLock.Release, SyncAsyncLock.Wait
benrr101 Nov 11, 2025
7d887d6
Finishing merge of SqlInternalConnectionTds.cs, removing stub
benrr101 Nov 11, 2025
11f9839
Move SessionStateRecord into new Connection namespace
benrr101 Nov 11, 2025
8ac4724
Introduce partial for SessionData in Connection folder
benrr101 Nov 11, 2025
11e1b71
Merge the SessionData class
benrr101 Nov 12, 2025
ef412fc
Merge ServerInfo class
benrr101 Nov 12, 2025
3f49af6
Remove (now empty) SqlInternalConnectionTds files
benrr101 Nov 12, 2025
bef6043
Put the little classes in the connection namespace
benrr101 Nov 12, 2025
d40e98e
Address comments:
benrr101 Nov 13, 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
14 changes: 12 additions & 2 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 @@ -210,6 +210,15 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\ServerInfo.cs">
<Link>Microsoft\Data\SqlClient\Connection\ServerInfo.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionData.cs">
<Link>Microsoft\Data\SqlClient\Connection\SessionData.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs">
<Link>Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
<Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
</Compile>
Expand Down Expand Up @@ -693,6 +702,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnection.cs">
<Link>Microsoft\Data\SqlClient\SqlInternalConnection.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs">
<Link>Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
<Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
</Compile>
Expand Down Expand Up @@ -849,8 +861,6 @@
<Compile Include="$(CommonSourceRoot)System\Diagnostics\CodeAnalysis.cs">
<Link>System\Diagnostics\CodeAnalysis.cs</Link>
</Compile>

<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft.Data.SqlClient.TypeForwards.cs" />
</ItemGroup>

Expand Down
3,166 changes: 0 additions & 3,166 deletions ...Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs
View file
Open in desktop

This file was deleted.

14 changes: 12 additions & 2 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 @@ -479,6 +479,15 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\ServerInfo.cs">
<Link>Microsoft\Data\SqlClient\Connection\ServerInfo.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionData.cs">
<Link>Microsoft\Data\SqlClient\Connection\SessionData.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs">
<Link>Microsoft\Data\SqlClient\Connection\SessionStateRecord.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
<Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
</Compile>
Expand Down Expand Up @@ -857,6 +866,9 @@
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnection.cs">
<Link>Microsoft\Data\SqlClient\SqlInternalConnection.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs">
<Link>Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs</Link>
</Compile>
<Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlInternalTransaction.cs">
<Link>Microsoft\Data\SqlClient\SqlInternalTransaction.cs</Link>
</Compile>
Expand Down Expand Up @@ -1019,8 +1031,6 @@
<Compile Include="$(CommonSourceRoot)System\Runtime\CompilerServices\IsExternalInit.netfx.cs">
<Link>System\Runtime\CompilerServices\IsExternalInit.netfx.cs</Link>
</Compile>

<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
</ItemGroup>
<!-- Resources -->
<ItemGroup>
Expand Down
Loading
Loading