Changed accessibility modifiers and names of merged classes

Author: edwardneal

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

@@ -2458,16 +2458,16 @@ private Assembly ResolveTypeAssembly(AssemblyName asmRef, bool throwOnError)
 
         internal void CheckGetExtendedUDTInfo(SqlMetaDataPriv metaData, bool fThrow)
         {
-            if (metaData.udt?._type == null)
+            if (metaData.Udt?.Type == null)
             { // If null, we have not obtained extended info.
-                Debug.Assert(!string.IsNullOrEmpty(metaData.udt?._assemblyQualifiedName), "Unexpected state on GetUDTInfo");
+                Debug.Assert(!string.IsNullOrEmpty(metaData.Udt?.AssemblyQualifiedName), "Unexpected state on GetUDTInfo");
                 // Parameter throwOnError determines whether exception from Assembly.Load is thrown.
-                metaData.udt._type =
-                    Type.GetType(typeName: metaData.udt._assemblyQualifiedName, assemblyResolver: asmRef => ResolveTypeAssembly(asmRef, fThrow), typeResolver: null, throwOnError: fThrow);
+                metaData.Udt.Type =
+                    Type.GetType(typeName: metaData.Udt.AssemblyQualifiedName, assemblyResolver: asmRef => ResolveTypeAssembly(asmRef, fThrow), typeResolver: null, throwOnError: fThrow);
 
-                if (fThrow && metaData.udt._type == null)
+                if (fThrow && metaData.Udt.Type == null)
                 {
-                    throw SQL.UDTUnexpectedResult(metaData.udt._assemblyQualifiedName);
+                    throw SQL.UDTUnexpectedResult(metaData.Udt.AssemblyQualifiedName);
                 }
             }
         }
@@ -2484,7 +2484,7 @@ internal object GetUdtValue(object value, SqlMetaDataPriv metaData, bool returnD
             // Since the serializer doesn't handle nulls...
             if (ADP.IsNull(value))
             {
-                Type t = metaData.udt?._type;
+                Type t = metaData.Udt?.Type;
                 Debug.Assert(t != null, "Unexpected null of udtType on GetUdtValue!");
                 o = t.InvokeMember("Null", BindingFlags.Public | BindingFlags.GetProperty | BindingFlags.Static, null, null, Array.Empty<object>(), CultureInfo.InvariantCulture);
                 Debug.Assert(o != null);
@@ -2495,7 +2495,7 @@ internal object GetUdtValue(object value, SqlMetaDataPriv metaData, bool returnD
 
                 MemoryStream stm = new MemoryStream((byte[])value);
 
-                o = Server.SerializationHelperSql9.Deserialize(stm, metaData.udt?._type);
+                o = Server.SerializationHelperSql9.Deserialize(stm, metaData.Udt?.Type);
 
                 Debug.Assert(o != null, "object could NOT be created");
                 return o;

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

@@ -21,19 +21,19 @@ internal SqlDbColumn(_SqlMetaData md)
         private void Populate()
         {
             AllowDBNull = _metadata.IsNullable;
-            BaseCatalogName = _metadata.catalogName;
-            BaseColumnName = _metadata._baseColumn;
-            BaseSchemaName = _metadata.schemaName;
-            BaseServerName = _metadata.serverName;
-            BaseTableName = _metadata.tableName;
-            ColumnName = _metadata._column;
-            ColumnOrdinal = _metadata._ordinal;
-            ColumnSize = (_metadata._metaType.IsSizeInCharacters && (_metadata._length != 0x7fffffff)) ? (_metadata._length / 2) : _metadata._length;
+            BaseCatalogName = _metadata.CatalogName;
+            BaseColumnName = _metadata.BaseColumn;
+            BaseSchemaName = _metadata.SchemaName;
+            BaseServerName = _metadata.ServerName;
+            BaseTableName = _metadata.TableName;
+            ColumnName = _metadata.Column;
+            ColumnOrdinal = _metadata.Ordinal;
+            ColumnSize = (_metadata.MetaType.IsSizeInCharacters && (_metadata.Length != 0x7fffffff)) ? (_metadata.Length / 2) : _metadata.Length;
             IsAutoIncrement = _metadata.IsIdentity;
             IsIdentity = _metadata.IsIdentity;
-            IsLong = _metadata._metaType.IsLong;
+            IsLong = _metadata.MetaType.IsLong;
 
-            if (SqlDbType.Timestamp == _metadata._type)
+            if (SqlDbType.Timestamp == _metadata.Type)
             {
                 IsUnique = true;
             }
@@ -42,18 +42,18 @@ private void Populate()
                 IsUnique = false;
             }
 
-            if (TdsEnums.UNKNOWN_PRECISION_SCALE != _metadata._precision)
+            if (TdsEnums.UNKNOWN_PRECISION_SCALE != _metadata.Precision)
             {
-                NumericPrecision = _metadata._precision;
+                NumericPrecision = _metadata.Precision;
             }
             else
             {
-                NumericPrecision = _metadata._metaType.Precision;
+                NumericPrecision = _metadata.MetaType.Precision;
             }
 
             IsReadOnly = _metadata.IsReadOnly;
 
-            UdtAssemblyQualifiedName = _metadata.udt?._assemblyQualifiedName;
+            UdtAssemblyQualifiedName = _metadata.Udt?.AssemblyQualifiedName;
 
         }
 

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

@@ -698,8 +698,8 @@ public override string ServerVersion
         {
             get
             {
-                return (string.Format("{0:00}.{1:00}.{2:0000}", _loginAck._majorVersion,
-                       (short)_loginAck._minorVersion, _loginAck._buildNum));
+                return (string.Format("{0:00}.{1:00}.{2:0000}", _loginAck.MajorVersion,
+                       (short)_loginAck.MinorVersion, _loginAck.BuildNum));
             }
         }
 
@@ -722,7 +722,7 @@ protected override bool UnbindOnTransactionCompletion
         /// <summary>
         /// Validates if federated authentication is used, Access Token used by this connection is active for the value of 'accessTokenExpirationBufferTime'.
         /// </summary>
-        internal override bool IsAccessTokenExpired => _federatedAuthenticationInfoRequested && DateTime.FromFileTimeUtc(_fedAuthToken._expirationFileTime) < DateTime.UtcNow.AddSeconds(accessTokenExpirationBufferTime);
+        internal override bool IsAccessTokenExpired => _federatedAuthenticationInfoRequested && DateTime.FromFileTimeUtc(_fedAuthToken.ExpirationFileTime) < DateTime.UtcNow.AddSeconds(accessTokenExpirationBufferTime);
 
         ////////////////////////////////////////////////////////////////////////////////////////
         // GENERAL METHODS
@@ -1278,37 +1278,37 @@ private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword,
                 }
             }
 
-            login._authentication = ConnectionOptions.Authentication;
-            login._timeout = timeoutInSeconds;
-            login._userInstance = ConnectionOptions.UserInstance;
-            login._hostName = ConnectionOptions.ObtainWorkstationId();
-            login._userName = ConnectionOptions.UserID;
-            login._password = ConnectionOptions.Password;
-            login._applicationName = ConnectionOptions.ApplicationName;
+            login.Authentication = ConnectionOptions.Authentication;
+            login.Timeout = timeoutInSeconds;
+            login.UserInstance = ConnectionOptions.UserInstance;
+            login.HostName = ConnectionOptions.ObtainWorkstationId();
+            login.UserName = ConnectionOptions.UserID;
+            login.Password = ConnectionOptions.Password;
+            login.ApplicationName = ConnectionOptions.ApplicationName;
 
-            login._language = _currentLanguage;
-            if (!login._userInstance)
+            login.Language = _currentLanguage;
+            if (!login.UserInstance)
             {
                 // Do not send attachdbfilename or database to SSE primary instance
-                login._database = CurrentDatabase;
-                login._attachDBFilename = ConnectionOptions.AttachDBFilename;
+                login.Database = CurrentDatabase;
+                login.AttachDbFilename = ConnectionOptions.AttachDBFilename;
             }
 
             // VSTS#795621 - Ensure ServerName is Sent During TdsLogin To Enable Sql Azure Connectivity.
             // Using server.UserServerName (versus ConnectionOptions.DataSource) since TdsLogin requires
             // serverName to always be non-null.
-            login._serverName = server.UserServerName;
+            login.ServerName = server.UserServerName;
 
-            login._useReplication = ConnectionOptions.Replication;
-            login._useSSPI = ConnectionOptions.IntegratedSecurity  // Treat AD Integrated like Windows integrated when against a non-FedAuth endpoint
+            login.UseReplication = ConnectionOptions.Replication;
+            login.UseSspi = ConnectionOptions.IntegratedSecurity  // Treat AD Integrated like Windows integrated when against a non-FedAuth endpoint
                                      || (ConnectionOptions.Authentication == SqlAuthenticationMethod.ActiveDirectoryIntegrated && !_fedAuthRequired);
-            login._packetSize = _currentPacketSize;
-            login._newPassword = newPassword;
-            login._readOnlyIntent = ConnectionOptions.ApplicationIntent == ApplicationIntent.ReadOnly;
-            login._credential = _credential;
+            login.PacketSize = _currentPacketSize;
+            login.NewPassword = newPassword;
+            login.ReadOnlyIntent = ConnectionOptions.ApplicationIntent == ApplicationIntent.ReadOnly;
+            login.Credential = _credential;
             if (newSecurePassword != null)
             {
-                login._newSecurePassword = newSecurePassword;
+                login.NewSecurePassword = newSecurePassword;
             }
 
             TdsEnums.FeatureExtension requestedFeatures = TdsEnums.FeatureExtension.None;
@@ -1338,9 +1338,9 @@ private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword,
                 _fedAuthFeatureExtensionData =
                     new FederatedAuthenticationFeatureExtensionData
                     {
-                        _libraryType = TdsEnums.FedAuthLibrary.MSAL,
-                        _authentication = ConnectionOptions.Authentication,
-                        _fedAuthRequiredPreLoginResponse = _fedAuthRequired
+                        LibraryType = TdsEnums.FedAuthLibrary.MSAL,
+                        Authentication = ConnectionOptions.Authentication,
+                        FedAuthRequiredPreLoginResponse = _fedAuthRequired
                     };
             }
 
@@ -1349,9 +1349,9 @@ private void Login(ServerInfo server, TimeoutTimer timeout, string newPassword,
                 requestedFeatures |= TdsEnums.FeatureExtension.FedAuth;
                 _fedAuthFeatureExtensionData = new FederatedAuthenticationFeatureExtensionData
                 {
-                    _libraryType = TdsEnums.FedAuthLibrary.SecurityToken,
-                    _fedAuthRequiredPreLoginResponse = _fedAuthRequired,
-                    _accessToken = _accessTokenInBytes
+                    LibraryType = TdsEnums.FedAuthLibrary.SecurityToken,
+                    FedAuthRequiredPreLoginResponse = _fedAuthRequired,
+                    AccessToken = _accessTokenInBytes
                 };
                 // No need any further info from the server for token based authentication. So set _federatedAuthenticationRequested to true
                 _federatedAuthenticationRequested = true;
@@ -2134,14 +2134,14 @@ internal void OnLoginAck(SqlLoginAck rec)
             _loginAck = rec;
             if (_recoverySessionData != null)
             {
-                if (_recoverySessionData._tdsVersion != rec._tdsVersion)
+                if (_recoverySessionData._tdsVersion != rec.TdsVersion)
                 {
                     throw SQL.CR_TDSVersionNotPreserved(this);
                 }
             }
             if (_currentSessionData != null)
             {
-                _currentSessionData._tdsVersion = rec._tdsVersion;
+                _currentSessionData._tdsVersion = rec.TdsVersion;
             }
         }
 
@@ -2179,7 +2179,7 @@ internal void OnFedAuthInfo(SqlFedAuthInfo fedAuthInfo)
                 Debug.Assert(_dbConnectionPool.AuthenticationContexts != null);
 
                 // Construct the dbAuthenticationContextKey with information from FedAuthInfo and store for later use, when inserting in to the token cache.
-                _dbConnectionPoolAuthenticationContextKey = new DbConnectionPoolAuthenticationContextKey(fedAuthInfo._stsurl, fedAuthInfo._spn);
+                _dbConnectionPoolAuthenticationContextKey = new DbConnectionPoolAuthenticationContextKey(fedAuthInfo.StsUrl, fedAuthInfo.Spn);
 
                 // Try to retrieve the authentication context from the pool, if one does exist for this key.
                 if (_dbConnectionPool.AuthenticationContexts.TryGetValue(_dbConnectionPoolAuthenticationContextKey, out dbConnectionPoolAuthenticationContext))
@@ -2272,11 +2272,11 @@ internal void OnFedAuthInfo(SqlFedAuthInfo fedAuthInfo)
 
                 // If the code flow is here, then we are re-using the context from the cache for this connection attempt and not
                 // generating a new access token on this thread.
-                _fedAuthToken._accessToken = dbConnectionPoolAuthenticationContext.AccessToken;
-                _fedAuthToken._expirationFileTime = dbConnectionPoolAuthenticationContext.ExpirationTime.ToFileTime();
+                _fedAuthToken.AccessToken = dbConnectionPoolAuthenticationContext.AccessToken;
+                _fedAuthToken.ExpirationFileTime = dbConnectionPoolAuthenticationContext.ExpirationTime.ToFileTime();
             }
 
-            Debug.Assert(_fedAuthToken != null && _fedAuthToken._accessToken != null, "fedAuthToken and fedAuthToken.accessToken cannot be null.");
+            Debug.Assert(_fedAuthToken != null && _fedAuthToken.AccessToken != null, "fedAuthToken and fedAuthToken.accessToken cannot be null.");
             _parser.SendFedAuthToken(_fedAuthToken);
         }
 
@@ -2374,8 +2374,8 @@ internal SqlFedAuthToken GetFedAuthToken(SqlFedAuthInfo fedAuthInfo)
                 {
                     var authParamsBuilder = new SqlAuthenticationParameters.Builder(
                             authenticationMethod: ConnectionOptions.Authentication,
-                            resource: fedAuthInfo._spn,
-                            authority: fedAuthInfo._stsurl,
+                            resource: fedAuthInfo.Spn,
+                            authority: fedAuthInfo.StsUrl,
                             serverName: ConnectionOptions.DataSource,
                             databaseName: ConnectionOptions.InitialCatalog)
                         .WithConnectionId(_clientConnectionId)
@@ -2482,7 +2482,7 @@ internal SqlFedAuthToken GetFedAuthToken(SqlFedAuthInfo fedAuthInfo)
                             break;
                     }
 
-                    Debug.Assert(_fedAuthToken._accessToken != null, "AccessToken should not be null.");
+                    Debug.Assert(_fedAuthToken.AccessToken != null, "AccessToken should not be null.");
 #if DEBUG
                     if (_forceMsalRetry)
                     {
@@ -2569,13 +2569,13 @@ internal SqlFedAuthToken GetFedAuthToken(SqlFedAuthInfo fedAuthInfo)
             }
 
             Debug.Assert(_fedAuthToken != null, "fedAuthToken should not be null.");
-            Debug.Assert(_fedAuthToken._accessToken != null && _fedAuthToken._accessToken.Length > 0, "fedAuthToken.accessToken should not be null or empty.");
+            Debug.Assert(_fedAuthToken.AccessToken != null && _fedAuthToken.AccessToken.Length > 0, "fedAuthToken.accessToken should not be null or empty.");
 
             // Store the newly generated token in _newDbConnectionPoolAuthenticationContext, only if using pooling.
             if (_dbConnectionPool != null)
             {
-                DateTime expirationTime = DateTime.FromFileTimeUtc(_fedAuthToken._expirationFileTime);
-                _newDbConnectionPoolAuthenticationContext = new DbConnectionPoolAuthenticationContext(_fedAuthToken._accessToken, expirationTime);
+                DateTime expirationTime = DateTime.FromFileTimeUtc(_fedAuthToken.ExpirationFileTime);
+                _newDbConnectionPoolAuthenticationContext = new DbConnectionPoolAuthenticationContext(_fedAuthToken.AccessToken, expirationTime);
             }
             SqlClientEventSource.Log.TryTraceEvent("<sc.SqlInternalConnectionTds.GetFedAuthToken> {0}, Finished generating federated authentication token.", ObjectID);
             return _fedAuthToken;
@@ -2667,7 +2667,7 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
 
                         Debug.Assert(_fedAuthFeatureExtensionData != null, "_fedAuthFeatureExtensionData must not be null when _federatedAuthenticationRequested == true");
 
-                        switch (_fedAuthFeatureExtensionData._libraryType)
+                        switch (_fedAuthFeatureExtensionData.LibraryType)
                         {
                             case TdsEnums.FedAuthLibrary.MSAL:
                             case TdsEnums.FedAuthLibrary.SecurityToken:
@@ -2682,7 +2682,7 @@ internal void OnFeatureExtAck(int featureId, byte[] data)
                             default:
                                 Debug.Fail("Unknown _fedAuthLibrary type");
                                 SqlClientEventSource.Log.TryTraceEvent("<sc.SqlInternalConnectionTds.OnFeatureExtAck|ERR> {0}, Attempting to use unknown federated authentication library", ObjectID);
-                                throw SQL.ParsingErrorLibraryType(ParsingErrorState.FedAuthFeatureAckUnknownLibraryType, (int)_fedAuthFeatureExtensionData._libraryType);
+                                throw SQL.ParsingErrorLibraryType(ParsingErrorState.FedAuthFeatureAckUnknownLibraryType, (int)_fedAuthFeatureExtensionData.LibraryType);
                         }
                         _federatedAuthenticationAcknowledged = true;