Skip to content

Commit dc1298a

Browse files
authored
Merge | SqlInternalConnectionTds preparation (#3323)
* Align usings * netfx: seal classes * netfx: sync variable data types: UInt32/Int32 to uint/int * netfx: reorder accessibility modifiers * netfx: reorder variables * netfx, netcore: synced variable names * netcore, netfx: sync comments and whitespace * netfx: convert RoutingInfo to automatic property * netfx: reformatted HashSet to align with netcore * netfx, netcore: formatting changes * netcore: add CERs * netcore: Apply mask to TdsParser.EncryptionOptions * netfx: synced use of connectionOptions variable rather than local property. netcore: synced explicit variable type in declaration. * netcore: changed MultiSubnetFailover timeout logic to more closely align with netfx * netfx: align constructor parameter order with netcore * netfx: reorder case statement for global transactions feature * Copy CAS to netcore * First round of code review
1 parent 75d5277 commit dc1298a

File tree

5 files changed

+405
-322
lines changed

5 files changed

+405
-322
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ override protected DbConnectionInternal CreateConnection(DbConnectionOptions opt
136136
opt = new SqlConnectionString(opt, instanceName, userInstance: false, setEnlistValue: null);
137137
poolGroupProviderInfo = null; // null so we do not pass to constructor below...
138138
}
139-
return new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling: applyTransientFaultHandling, key.AccessToken, pool, key.AccessTokenCallback);
139+
return new SqlInternalConnectionTds(identity, opt, key.Credential, poolGroupProviderInfo, "", null, redirectedUserInstance, userOpt, recoverySessionData, applyTransientFaultHandling, key.AccessToken, pool, key.AccessTokenCallback);
140140
}
141141

142142
protected override DbConnectionOptions CreateConnectionOptions(string connectionString, DbConnectionOptions previous)

0 commit comments

Comments
 (0)