Skip to content

Merge | SqlInternalConnectionTds preparation #3323

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
merged 18 commits into from
May 16, 2025
Merged

Merge | SqlInternalConnectionTds preparation #3323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
58377f5
Align usings
edwardneal Apr 30, 2025
e069ce2
netfx: seal classes
edwardneal Apr 30, 2025
4746d35
netfx: sync variable data types: UInt32/Int32 to uint/int
edwardneal Apr 30, 2025
d7fc3ed
netfx: reorder accessibility modifiers
edwardneal Apr 30, 2025
cf1898f
netfx: reorder variables
edwardneal Apr 30, 2025
7b13a66
netfx, netcore: synced variable names
edwardneal Apr 30, 2025
8f7a50a
netcore, netfx: sync comments and whitespace
edwardneal Apr 30, 2025
9ac89d1
netfx: convert RoutingInfo to automatic property
edwardneal Apr 30, 2025
f8940d9
netfx: reformatted HashSet to align with netcore
edwardneal Apr 30, 2025
f09ea7f
netfx, netcore: formatting changes
edwardneal May 1, 2025
8557510
netcore: add CERs
edwardneal May 1, 2025
6e91f31
netcore: Apply mask to TdsParser.EncryptionOptions
edwardneal May 1, 2025
bf5328d
netfx: synced use of connectionOptions variable rather than local pro…
edwardneal May 1, 2025
a05742e
netcore: changed MultiSubnetFailover timeout logic to more closely al…
edwardneal May 1, 2025
5a9d2b4
netfx: align constructor parameter order with netcore
edwardneal May 1, 2025
37bcad5
netfx: reorder case statement for global transactions feature
edwardneal May 1, 2025
71b8cd7
Copy CAS to netcore
edwardneal May 1, 2025
9fda691
First round of code review
edwardneal May 6, 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
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlConnectionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ override protected DbConnectionInternal CreateConnection(DbConnectionOptions opt
opt = new SqlConnectionString(opt, instanceName, userInstance: false, setEnlistValue: null);
poolGroupProviderInfo = null; // null so we do not pass to constructor below...
}
return new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling: applyTransientFaultHandling, key.AccessToken, pool, key.AccessTokenCallback);
return new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling, key.AccessToken, pool, key.AccessTokenCallback);
}

protected override DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous)
Expand Down
Loading
Loading