From b3539e318886c99cba70730e68fb840e3d1c243e Mon Sep 17 00:00:00 2001 From: Maher Jendoubi Date: Fri, 24 Jan 2020 21:21:57 +0100 Subject: [PATCH] Contributing: fix typos --- .../netcore/src/Resources/SR.Designer.cs | 6 +++--- .../netcore/src/Resources/SR.resx | 6 +++--- .../SqlClient/SqlConnectionTimeoutErrorInternal.cs | 2 +- .../Microsoft/Data/SqlClient/TdsParserStateObject.cs | 8 ++++---- .../netfx/src/Microsoft/Data/SqlTypes/SqlFileStream.cs | 2 +- .../netfx/src/Resources/Strings.Designer.cs | 10 +++++----- .../netfx/src/Resources/Strings.resx | 10 +++++----- .../tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.Designer.cs b/src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.Designer.cs index f7d8a6286b..e039abf6fe 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.Designer.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.Designer.cs @@ -4084,7 +4084,7 @@ internal static string TCE_AttestationInfoNotReturnedFromSQLServer { } /// - /// Looks up a localized string similar to Error occured when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations.. + /// Looks up a localized string similar to Error occurred when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations.. /// internal static string TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage { get { @@ -4840,7 +4840,7 @@ internal static string TCE_MultipleRowsReturnedForAttestationInfo { } /// - /// Looks up a localized string similar to Error occured when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'.. + /// Looks up a localized string similar to Error occurred when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'.. /// internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage { get { @@ -4849,7 +4849,7 @@ internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGenerati } /// - /// Looks up a localized string similar to Error occured when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'.. + /// Looks up a localized string similar to Error occurred when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'.. /// internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe { get { diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.resx b/src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.resx index 78dd164819..e38fd1c865 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.resx +++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/SR.resx @@ -1690,10 +1690,10 @@ Internal Error. The given key id '{0}' is not valid. Error occurred when converting the key id to unsigned short. Error Message: {1} - Error occured when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'. + Error occurred when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'. - Error occured when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'. + Error occurred when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'. {0} instance in use does not support column encryption. @@ -1849,7 +1849,7 @@ Failed to initialize connection. The attestation protocol '{0}' does not support the enclave type '{1}'. - Error occured when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations. + Error occurred when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations. UDT size must be less than {1}, size: {0} diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs index 1bae5ccff6..992ba2f45d 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnectionTimeoutErrorInternal.cs @@ -196,7 +196,7 @@ internal string GetErrorMessage() // In all other cases, it will default to the original error message. if ((currentPhase != SqlConnectionTimeoutErrorPhase.Undefined) && (currentPhase != SqlConnectionTimeoutErrorPhase.Complete)) { - // NOTE: In case of a failover scenario, add a string that this failure occured as part of the primary or secondary server + // NOTE: In case of a failover scenario, add a string that this failure occurred as part of the primary or secondary server if (isFailoverScenario) { errorBuilder.Append(" "); diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs index b10acfd1e5..85e5e5dd4c 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs @@ -104,7 +104,7 @@ internal int ObjectID internal volatile bool _attentionSent = false; // true if we sent an Attention to the server internal bool _attentionReceived = false; // NOTE: Received is not volatile as it is only ever accessed\modified by TryRun its callees (i.e. single threaded access) internal volatile bool _attentionSending = false; - internal bool _internalTimeout = false; // an internal timeout occured + internal bool _internalTimeout = false; // an internal timeout occurred private readonly LastIOTimer _lastSuccessfulIOTimer; // secure password information to be stored @@ -206,7 +206,7 @@ internal int ObjectID internal object _errorAndWarningsLock = new object(); private bool _hasErrorOrWarning = false; - // local exceptions to cache warnings and errors that occured prior to sending attention + // local exceptions to cache warnings and errors that occurred prior to sending attention internal SqlErrorCollection _preAttentionErrors; internal SqlErrorCollection _preAttentionWarnings; @@ -3549,7 +3549,7 @@ private Task WriteSni(bool canAccumulate) Debug.Assert(Parser.Connection._parserLock.ThreadMayHaveLock(), "Thread is writing without taking the connection lock"); Task task = SNIWritePacket(Handle, packet, out sniError, canAccumulate, callerHasConnectionLock: true); - // Check to see if the timeout has occured. This time out code is special case code to allow BCP writes to timeout to fix bug 350558, eventually we should make all writes timeout. + // Check to see if the timeout has occurred. This time out code is special case code to allow BCP writes to timeout to fix bug 350558, eventually we should make all writes timeout. if (_bulkCopyOpperationInProgress && 0 == GetTimeoutRemaining()) { _parser.Connection.ThreadHasParserLockForClose = true; @@ -3895,7 +3895,7 @@ internal SqlErrorCollection GetFullErrorAndWarningCollection(out bool broken) _errors = null; _warnings = null; - // We also process the pre-attention error lists here since, if we are here and they are populated, then an error occured while sending attention so we should show the errors now (otherwise they'd be lost) + // We also process the pre-attention error lists here since, if we are here and they are populated, then an error occurred while sending attention so we should show the errors now (otherwise they'd be lost) AddErrorsToCollection(_preAttentionErrors, ref allErrors, ref broken); AddErrorsToCollection(_preAttentionWarnings, ref allErrors, ref broken); _preAttentionErrors = null; diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlTypes/SqlFileStream.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlTypes/SqlFileStream.cs index 5571633e5c..982927ca66 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlTypes/SqlFileStream.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlTypes/SqlFileStream.cs @@ -618,7 +618,7 @@ Int64 allocationSize //----------------------------------------------------------------- // normalize the provided path - // * compress path to remove any occurences of '.' or '..' + // * compress path to remove any occurrences of '.' or '..' // * trim whitespace from the beginning and end of the path // * ensure that the path starts with '\\' // * ensure that the path does not start with '\\.\' diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs index 7013e800c6..2373ccc32f 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs @@ -8776,7 +8776,7 @@ internal static string Snix_PreLoginBeforeSuccessfullWrite { } /// - /// Looks up a localized string similar to A transport-level error has occured during SSPI handshake.. + /// Looks up a localized string similar to A transport-level error has occurred during SSPI handshake.. /// internal static string Snix_ProcessSspi { get { @@ -10072,7 +10072,7 @@ internal static string SQL_Timeout_Execution { } /// - /// Looks up a localized string similar to This failure occured while attempting to connect to the {0} server.. + /// Looks up a localized string similar to This failure occurred while attempting to connect to the {0} server.. /// internal static string SQL_Timeout_FailoverInfo { get { @@ -11665,7 +11665,7 @@ internal static string TCE_AttestationInfoNotReturnedFromSQLServer { } /// - /// Looks up a localized string similar to Error occured when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations.. + /// Looks up a localized string similar to Error occurred when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations.. /// internal static string TCE_AttestationProtocolNotSpecifiedForGeneratingEnclavePackage { get { @@ -12439,7 +12439,7 @@ internal static string TCE_MultipleRowsReturnedForAttestationInfo { } /// - /// Looks up a localized string similar to Error occured when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'. . + /// Looks up a localized string similar to Error occurred when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'. . /// internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGeneratingEnclavePackage { get { @@ -12448,7 +12448,7 @@ internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQueryGenerati } /// - /// Looks up a localized string similar to Error occured when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'. . + /// Looks up a localized string similar to Error occurred when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'. . /// internal static string TCE_NoAttestationUrlSpecifiedForEnclaveBasedQuerySpDescribe { get { diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx index 4d75d55da3..51ad3d8df1 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx +++ b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx @@ -2722,7 +2722,7 @@ Connection Timeout Expired. The timeout period elapsed during the post-login phase. The connection could have timed out while waiting for server to complete the login process and respond; Or it could have timed out while attempting to create multiple active connections. - This failure occured while attempting to connect to the {0} server. + This failure occurred while attempting to connect to the {0} server. This failure occurred while attempting to connect to the routing destination. The duration spent while attempting to connect to the original server was - [Pre-Login] initialization={0}; handshake={1}; [Login] initialization={2}; authentication={3}; [Post-Login] complete={4}; @@ -3964,7 +3964,7 @@ A transport-level error has occurred while sending information to the server. - A transport-level error has occured during SSPI handshake. + A transport-level error has occurred during SSPI handshake. Local Database Runtime: Cannot create named instance. @@ -4309,10 +4309,10 @@ Internal Error. SqlColumnEncryptionEnclaveProviderName cannot be null or empty. - Error occured when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'. + Error occurred when reading '{0}' resultset. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{1}'. - Error occured when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'. + Error occurred when generating enclave package. Attestation URL has not been specified in the connection string, but the query requires enclave computations. Enclave type is '{0}'. Internal Error. Enclave type received from SQL Server is null or empty when executing a query requiring enclave computations. @@ -4516,6 +4516,6 @@ Failed to initialize connection. The attestation protocol '{0}' does not support the enclave type '{1}'. - Error occured when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations. + Error occurred when generating enclave package. Attestation Protocol has not been specified in the connection string, but the query requires enclave computations. diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs index 550cbe33ff..e81139c63a 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs +++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSServerEndPoint.cs @@ -109,7 +109,7 @@ public void Start() } catch (Exception e) { - Log($"{GetType().Name} {EndpointName} Error occured while testing server endpoint {e.Message}"); + Log($"{GetType().Name} {EndpointName} Error occurred while testing server endpoint {e.Message}"); throw; } }