diff --git a/CHANGELOG.md b/CHANGELOG.md index bad4582353..0d8052f809 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1254,7 +1254,7 @@ This update brings the below changes over the previous release: - Improved performance of Managed SNI by enhancing utilization of resources [#173](https://github.com/dotnet/SqlClient/pull/173) - Ported [dotnet/corefx#35363](https://github.com/dotnet/corefx/pull/35363) and [dotnet/corefx#40732](https://github.com/dotnet/corefx/pull/40732) - Improved performance of Managed SNI RPC Parameter Usage [#209](https://github.com/dotnet/SqlClient/pull/209) - Ported [dotnet/corefx#34049](https://github.com/dotnet/corefx/pull/34049) - Changed enclave key map to be lazy initialized [#372](https://github.com/dotnet/SqlClient/pull/372) -- Changed `Recieve()` and `ReceiveAsync()` implementation to receive null packets on failure [#350](https://github.com/dotnet/SqlClient/pull/350) +- Changed `Receive()` and `ReceiveAsync()` implementation to receive null packets on failure [#350](https://github.com/dotnet/SqlClient/pull/350) - Changed `EnclaveProviderBase` caching implementation to support Async Scenarios _(Introduces breaking changes)_ [#346](https://github.com/dotnet/SqlClient/pull/346) ## [Stable Release 1.1.0] - 2019-11-20 diff --git a/doc/samples/SqlBulkCopy_ColumnMapping.cs b/doc/samples/SqlBulkCopy_ColumnMapping.cs index 6908e2bbdd..af72a4803d 100644 --- a/doc/samples/SqlBulkCopy_ColumnMapping.cs +++ b/doc/samples/SqlBulkCopy_ColumnMapping.cs @@ -47,9 +47,9 @@ static void Main() new SqlBulkCopyColumnMapping("Name", "ProdName"); bulkCopy.ColumnMappings.Add(mapName); - SqlBulkCopyColumnMapping mapMumber = + SqlBulkCopyColumnMapping mapNumber = new SqlBulkCopyColumnMapping("ProductNumber", "ProdNum"); - bulkCopy.ColumnMappings.Add(mapMumber); + bulkCopy.ColumnMappings.Add(mapNumber); // Write from the source to the destination. try diff --git a/doc/samples/SqlBulkCopy_ColumnMappingRemoveAt.cs b/doc/samples/SqlBulkCopy_ColumnMappingRemoveAt.cs index 9d8091965d..948b3ed05d 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingRemoveAt.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingRemoveAt.cs @@ -116,7 +116,7 @@ static void Main() bulkCopy.DestinationTableName = "dbo.BulkCopyDemoOrderDetail"; // Rather than clearing mappings that are not necessary - // for the next bulk copyo peration, the unneeded mappings + // for the next bulk copy operation, the unneeded mappings // are removed with the RemoveAt method. bulkCopy.ColumnMappings.RemoveAt(2); bulkCopy.ColumnMappings.RemoveAt(1); diff --git a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml index b14f7d8ea6..7b0af6f6c9 100644 --- a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml +++ b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlDataRecord.xml @@ -828,7 +828,7 @@ The SQL Server type values of the column are copied into the array that is passed as a parameter. For null values, a Sql type instance is returned where the property is true. - The length of the array does not need to match the number of columns in the record. If the array length is greater than the number of columns, all the column values are copied into the array; if it is less, only the array length number of column values are copied into the array, starting at the column value with ordinal 0. + The length of the array does not need to match the number of columns in the record. If the array length is greater than the number of columns, all the column values are copied into the array; if it is less, only the array length number of column values are copied into the array, starting at the column value with ordinal 0. diff --git a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml index 7152fd1606..47b515b911 100644 --- a/doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml +++ b/doc/snippets/Microsoft.Data.SqlClient.Server/SqlMetaData.xml @@ -63,7 +63,7 @@ Only the following are allowed to be passed to this constructor as : , , , , , , , Numeric, , , , , , , . - The following are the default values assigned to , depending on the (the , , , and properties are set to ): + The following are the default values assigned to , depending on the (the , , , and properties are set to ): diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml index aa3b2de178..3fd55b6a24 100644 --- a/doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml +++ b/doc/snippets/Microsoft.Data.SqlClient/SqlBatchCommandCollection.xml @@ -52,10 +52,10 @@ - Searches for the specified within the and returns the zero-based index of the first occurence within the entire . + Searches for the specified within the and returns the zero-based index of the first occurrence within the entire . - Returns the zero-based index of the first occurence within the entire . + Returns the zero-based index of the first occurrence within the entire . @@ -87,7 +87,7 @@ - Removes the first occurence of a specific object from the collection. + Removes the first occurrence of a specific object from the collection. Returns if an item is successfully removed. Returns false if an item could not be removed or no item was not found. diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMapping.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMapping.xml index f49680d489..edef794199 100644 --- a/doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMapping.xml +++ b/doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMapping.xml @@ -74,9 +74,9 @@ new SqlBulkCopyColumnMapping("Name", "ProdName"); bulkCopy.ColumnMappings.Add(mapName); - SqlBulkCopyColumnMapping mapMumber = + SqlBulkCopyColumnMapping mapNumber = new SqlBulkCopyColumnMapping("ProductNumber", "ProdNum"); - bulkCopy.ColumnMappings.Add(mapMumber); + bulkCopy.ColumnMappings.Add(mapNumber); // Write from the source to the destination. try @@ -180,9 +180,9 @@ new SqlBulkCopyColumnMapping("Name", "ProdName"); bulkCopy.ColumnMappings.Add(mapName); - SqlBulkCopyColumnMapping mapMumber = + SqlBulkCopyColumnMapping mapNumber = new SqlBulkCopyColumnMapping("ProductNumber", "ProdNum"); - bulkCopy.ColumnMappings.Add(mapMumber); + bulkCopy.ColumnMappings.Add(mapNumber); // Write from the source to the destination. try @@ -630,9 +630,9 @@ new SqlBulkCopyColumnMapping("Name", "ProdName"); bulkCopy.ColumnMappings.Add(mapName); - SqlBulkCopyColumnMapping mapMumber = + SqlBulkCopyColumnMapping mapNumber = new SqlBulkCopyColumnMapping("ProductNumber", "ProdNum"); - bulkCopy.ColumnMappings.Add(mapMumber); + bulkCopy.ColumnMappings.Add(mapNumber); // Write from the source to the destination. try diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml index 8ba86611b0..3d867f3a24 100644 --- a/doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml +++ b/doc/snippets/Microsoft.Data.SqlClient/SqlBulkCopyColumnMappingCollection.xml @@ -182,9 +182,9 @@ new SqlBulkCopyColumnMapping("Name", "ProdName"); bulkCopy.ColumnMappings.Add(mapName); - SqlBulkCopyColumnMapping mapMumber = + SqlBulkCopyColumnMapping mapNumber = new SqlBulkCopyColumnMapping("ProductNumber", "ProdNum"); - bulkCopy.ColumnMappings.Add(mapMumber); + bulkCopy.ColumnMappings.Add(mapNumber); // Write from the source to the destination. try @@ -1252,7 +1252,7 @@ bulkCopy.DestinationTableName = "dbo.BulkCopyDemoOrderDetail"; // Rather than clearing mappings that are not necessary - // for the next bulk copyo peration, the unneeded mappings + // for the next bulk copy operation, the unneeded mappings // are removed with the RemoveAt method. bulkCopy.ColumnMappings.RemoveAt(2); bulkCopy.ColumnMappings.RemoveAt(1); diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlClientDiagnostic.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlClientDiagnostic.xml index 69d25c9b14..6306c624f4 100644 --- a/doc/snippets/Microsoft.Data.SqlClient/SqlClientDiagnostic.xml +++ b/doc/snippets/Microsoft.Data.SqlClient/SqlClientDiagnostic.xml @@ -488,7 +488,7 @@ - Contains diagnostic information emitted after a transaction roll back failes with an exception. + Contains diagnostic information emitted after a transaction roll back fails with an exception. diff --git a/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml b/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml index 18af6be796..5a319a119f 100644 --- a/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml +++ b/doc/snippets/Microsoft.Data.SqlClient/SqlCommand.xml @@ -866,7 +866,7 @@ The closed or dropped during a streaming operation. For more information about streaming, see SqlClient Streaming Support. - is set to true and a parameter with direction Output or InputOutput has been added to the collection. + is set to true and a parameter with direction Output or InputOutput has been added to the collection. @@ -1380,7 +1380,7 @@ The closed or dropped during a streaming operation. For more information about streaming, see SqlClient Streaming Support. - is set to true and a parameter with direction Output or InputOutput has been added to the collection. + is set to true and a parameter with direction Output or InputOutput has been added to the collection. @@ -2723,7 +2723,7 @@ Gets or sets a value indicating whether the command object should optimize parameter performance by disabling Output and InputOutput directions when submitting the command to the SQL Server.
This option is only used when the is otherwise it is ignored. - A value indicating whether the command object should optimize parameter performance by disabling Output and InputOuput parameter directions when submitting the command to the SQL Server. The default is . + A value indicating whether the command object should optimize parameter performance by disabling Output and InputOutput parameter directions when submitting the command to the SQL Server. The default is . diff --git a/release-notes/2.0/2.0.0-preview1.md b/release-notes/2.0/2.0.0-preview1.md index 5afdd97fb1..bb9918328d 100644 --- a/release-notes/2.0/2.0.0-preview1.md +++ b/release-notes/2.0/2.0.0-preview1.md @@ -22,7 +22,7 @@ This update brings the below changes over the previous release: - Improved performance of Managed SNI by enhancing utilization of resources [#173](https://github.com/dotnet/SqlClient/pull/173) - Ported [dotnet/corefx#35363](https://github.com/dotnet/corefx/pull/35363) and [dotnet/corefx#40732](https://github.com/dotnet/corefx/pull/40732) - Improved performance of Managed SNI RPC Parameter Usage [#209](https://github.com/dotnet/SqlClient/pull/209) - Ported [dotnet/corefx#34049](https://github.com/dotnet/corefx/pull/34049) - Changed enclave key map to be lazy initialized [#372](https://github.com/dotnet/SqlClient/pull/372) -- Changed `Recieve()` and `ReceiveAsync()` implementation to receive null packets on failure [#350](https://github.com/dotnet/SqlClient/pull/350) +- Changed `Receive()` and `ReceiveAsync()` implementation to receive null packets on failure [#350](https://github.com/dotnet/SqlClient/pull/350) - Changed `EnclaveProviderBase` caching implementation to support Async Scenarios _(Introduces breaking changes)_ [#346](https://github.com/dotnet/SqlClient/pull/346) ### Breaking Changes diff --git a/release-notes/2.0/2.0.0.md b/release-notes/2.0/2.0.0.md index 7059a015d0..e12b6583fd 100644 --- a/release-notes/2.0/2.0.0.md +++ b/release-notes/2.0/2.0.0.md @@ -81,7 +81,7 @@ All changes in Microsoft.Data.SqlClient v2.0 over v1.1: - Improved performance of Managed SNI by enhancing utilization of resources [#173](https://github.com/dotnet/SqlClient/pull/173) - Ported [dotnet/corefx#35363](https://github.com/dotnet/corefx/pull/35363) and [dotnet/corefx#40732](https://github.com/dotnet/corefx/pull/40732) - Improved performance of Managed SNI RPC Parameter Usage [#209](https://github.com/dotnet/SqlClient/pull/209) - Ported [dotnet/corefx#34049](https://github.com/dotnet/corefx/pull/34049) - Changed enclave key map to be lazy initialized [#372](https://github.com/dotnet/SqlClient/pull/372) -- Changed `Recieve()` and `ReceiveAsync()` implementation to receive null packets on failure [#350](https://github.com/dotnet/SqlClient/pull/350) +- Changed `Receive()` and `ReceiveAsync()` implementation to receive null packets on failure [#350](https://github.com/dotnet/SqlClient/pull/350) - Changed `EnclaveProviderBase` caching implementation to support Async Scenarios _(Introduces breaking changes)_ [#346](https://github.com/dotnet/SqlClient/pull/346) - Updated all driver assemblies to be CLS Compliant [#396](https://github.com/dotnet/SqlClient/pull/396) - Updated Bulk Copy error messages to also include Column, Row and non-encrypted Data information [#437](https://github.com/dotnet/SqlClient/pull/437) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIPacket.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIPacket.cs index d83682021b..fd542e542f 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIPacket.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNIPacket.cs @@ -92,7 +92,7 @@ public SNIPacket() public int DataLeft => (_dataLength - _dataOffset); /// - /// Indicates that the packet should be sent out of band bypassing the normal send-recieve lock + /// Indicates that the packet should be sent out of band bypassing the normal send-receive lock /// public bool IsOutOfBand { get; set; } @@ -181,7 +181,7 @@ public void AppendData(byte[] data, int size) } /// - /// Read data from the packet into the buffer at dataOffset for zize and then remove that data from the packet + /// Read data from the packet into the buffer at dataOffset for size and then remove that data from the packet /// /// Buffer /// Data offset to write data at diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs index 666c38fa75..5632e8ebfe 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs @@ -704,7 +704,7 @@ public override uint Send(SNIPacket packet) try { // is the packet is marked out out-of-band (attention packets only) it must be - // sent immediately even if a send of recieve operation is already in progress + // sent immediately even if a send or receive operation is already in progress // because out of band packets are used to cancel ongoing operations // so try to take the lock if possible but continue even if it can't be taken if (packet.IsOutOfBand) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SSRP.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SSRP.cs index 3cad605caa..085551c16e 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SSRP.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SSRP.cs @@ -18,8 +18,8 @@ internal sealed class SSRP { private const char SemicolonSeparator = ';'; private const int SqlServerBrowserPort = 1434; //port SQL Server Browser - private const int RecieveMAXTimeoutsForCLNT_BCAST_EX = 15000; //Default max time for response wait - private const int RecieveTimeoutsForCLNT_BCAST_EX = 1000; //subsequent wait time for response after intial wait + private const int ReceiveMAXTimeoutsForCLNT_BCAST_EX = 15000; //Default max time for response wait + private const int ReceiveTimeoutsForCLNT_BCAST_EX = 1000; //subsequent wait time for response after intial wait private const int ServerResponseHeaderSizeForCLNT_BCAST_EX = 3;//(SVR_RESP + RESP_SIZE) https://docs.microsoft.com/en-us/openspecs/windows_protocols/mc-sqlr/2e1560c9-5097-4023-9f5e-72b9ff1ec3b1 private const int ValidResponseSizeForCLNT_BCAST_EX = 4096; //valid reponse size should be less than 4096 private const int FirstTimeoutForCLNT_BCAST_EX = 5000;//wait for first response for 5 seconds @@ -383,11 +383,11 @@ private static SsrpResult SendUDPRequest(IPEndPoint endPoint, byte[] requestPack } /// - /// Sends request to server, and recieves response from server (SQLBrowser) on port 1434 by UDP + /// Sends request to server, and receives response from server (SQLBrowser) on port 1434 by UDP /// Request (https://docs.microsoft.com/en-us/openspecs/windows_protocols/mc-sqlr/a3035afa-c268-4699-b8fd-4f351e5c8e9e) /// Response (https://docs.microsoft.com/en-us/openspecs/windows_protocols/mc-sqlr/2e1560c9-5097-4023-9f5e-72b9ff1ec3b1) /// - /// string constaning list of SVR_RESP(just RESP_DATA) + /// string containing list of SVR_RESP(just RESP_DATA) internal static string SendBroadcastUDPRequest() { StringBuilder response = new StringBuilder(); @@ -407,9 +407,9 @@ internal static string SendBroadcastUDPRequest() sw.Start(); try { - while ((receiveTask = clientListener.ReceiveAsync()).Wait(currentTimeOut) && sw.ElapsedMilliseconds <= RecieveMAXTimeoutsForCLNT_BCAST_EX && receiveTask != null) + while ((receiveTask = clientListener.ReceiveAsync()).Wait(currentTimeOut) && sw.ElapsedMilliseconds <= ReceiveMAXTimeoutsForCLNT_BCAST_EX && receiveTask != null) { - currentTimeOut = RecieveTimeoutsForCLNT_BCAST_EX; + currentTimeOut = ReceiveTimeoutsForCLNT_BCAST_EX; SqlClientEventSource.Log.TrySNITraceEvent(nameof(SSRP), EventType.INFO, "Received instnace info from UDP Client."); if (receiveTask.Result.Buffer.Length < ValidResponseSizeForCLNT_BCAST_EX) //discard invalid response { diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SslOverTdsStream.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SslOverTdsStream.cs index e95c5a6cf9..e0f48a28d3 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SslOverTdsStream.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SslOverTdsStream.cs @@ -99,7 +99,7 @@ public override long Position public override bool CanWrite => _stream.CanWrite; /// - /// Check if stream can be seeked + /// Check if stream can seek /// public override bool CanSeek => false; diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs index 01e693ac50..e64d81da40 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlCommand.cs @@ -4566,7 +4566,7 @@ private void ReadDescribeEncryptionParameterResults(SqlDataReader ds, ReadOnlyDi Debug.Assert(rpc != null, "rpc should not be null here."); int userParamCount = rpc.userParams?.Count ?? 0; - int recievedMetadataCount = 0; + int receivedMetadataCount = 0; if (!enclaveMetadataExists || ds.NextResult()) { @@ -4591,7 +4591,7 @@ private void ReadDescribeEncryptionParameterResults(SqlDataReader ds, ReadOnlyDi { Debug.Assert(sqlParameter.CipherMetadata == null, "param.CipherMetadata should be null."); sqlParameter.HasReceivedMetadata = true; - recievedMetadataCount += 1; + receivedMetadataCount += 1; // Found the param, setup the encryption info. byte columnEncryptionType = ds.GetByte((int)DescribeParameterEncryptionResultSet2.ColumnEncryptionType); if ((byte)SqlClientEncryptionType.PlainText != columnEncryptionType) @@ -4633,7 +4633,7 @@ private void ReadDescribeEncryptionParameterResults(SqlDataReader ds, ReadOnlyDi // When the RPC object gets reused, the parameter array has more parameters that the valid params for the command. // Null is used to indicate the end of the valid part of the array. Refer to GetRPCObject(). - if (recievedMetadataCount != userParamCount) + if (receivedMetadataCount != userParamCount) { for (int index = 0; index < userParamCount; index++) { diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs index d976bb06fc..9d9bf49437 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs @@ -1916,7 +1916,7 @@ private void AttemptOneLogin( TimeoutTimer timeout, bool withFailover = false) { - SqlClientEventSource.Log.TryAdvancedTraceEvent(" {0}, timout={1}[msec], server={2}", ObjectID, timeout.MillisecondsRemaining, serverInfo.ExtendedServerName); + SqlClientEventSource.Log.TryAdvancedTraceEvent(" {0}, timeout={1}[msec], server={2}", ObjectID, timeout.MillisecondsRemaining, serverInfo.ExtendedServerName); RoutingInfo = null; // forget routing information _parser._physicalStateObj.SniContext = SniContext.Snix_Connect; diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs index 6745a0b56a..f39f91fcd4 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlCommand.cs @@ -4972,7 +4972,7 @@ private void ReadDescribeEncryptionParameterResults(SqlDataReader ds, ReadOnlyDi Debug.Assert(rpc != null, "rpc should not be null here."); int userParamCount = rpc.userParams?.Count ?? 0; - int recievedMetadataCount = 0; + int receivedMetadataCount = 0; if (!enclaveMetadataExists || ds.NextResult()) { @@ -4996,7 +4996,7 @@ private void ReadDescribeEncryptionParameterResults(SqlDataReader ds, ReadOnlyDi { Debug.Assert(sqlParameter.CipherMetadata == null, "param.CipherMetadata should be null."); sqlParameter.HasReceivedMetadata = true; - recievedMetadataCount += 1; + receivedMetadataCount += 1; // Found the param, setup the encryption info. byte columnEncryptionType = ds.GetByte((int)DescribeParameterEncryptionResultSet2.ColumnEncryptionType); if ((byte)SqlClientEncryptionType.PlainText != columnEncryptionType) @@ -5037,7 +5037,7 @@ private void ReadDescribeEncryptionParameterResults(SqlDataReader ds, ReadOnlyDi // When the RPC object gets reused, the parameter array has more parameters that the valid params for the command. // Null is used to indicate the end of the valid part of the array. Refer to GetRPCObject(). - if (recievedMetadataCount != userParamCount) + if (receivedMetadataCount != userParamCount) { for (int index = 0; index < userParamCount; index++) { diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs index cdb7ba2173..4c0a2d365b 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlInternalConnectionTds.cs @@ -2301,7 +2301,7 @@ private void ResolveExtendedServerName(ServerInfo serverInfo, bool aliasLookup, // Common code path for making one attempt to establish a connection and log in to server. private void AttemptOneLogin(ServerInfo serverInfo, string newPassword, SecureString newSecurePassword, TimeoutTimer timeout, bool withFailover = false, bool isFirstTransparentAttempt = true, bool disableTnir = false) { - SqlClientEventSource.Log.TryAdvancedTraceEvent(" {0}, timout={1}[msec], server={2}", ObjectID, timeout.MillisecondsRemaining, serverInfo.ExtendedServerName); + SqlClientEventSource.Log.TryAdvancedTraceEvent(" {0}, timeout={1}[msec], server={2}", ObjectID, timeout.MillisecondsRemaining, serverInfo.ExtendedServerName); _routingInfo = null; // forget routing information diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs index d540b73dc6..f1eb52c841 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/TdsParser.cs @@ -810,7 +810,7 @@ internal void Connect(ServerInfo serverInfo, if (_fMARS && marsCapable) { - // if user explictly disables mars or mars not supported, don't create the session pool + // if user explicitly disables mars or mars not supported, don't create the session pool _sessionPool = new TdsParserSessionPool(this); } else @@ -1955,7 +1955,7 @@ internal SqlError ProcessSNIError(TdsParserStateObject stateObj) len -= iColon; /* The error message should come back in the following format: "TCP Provider: MESSAGE TEXT" - Fix Bug 370686, if the message is recieved on a Win9x OS, the error message will not contain MESSAGE TEXT + Fix Bug 370686, if the message is received on a Win9x OS, the error message will not contain MESSAGE TEXT per Bug: 269574. If we get a errormessage with no message text, just return the entire message otherwise return just the message text. */ @@ -3129,7 +3129,7 @@ internal TdsOperationStatus TryRun(RunBehavior runBehavior, SqlCommand cmdHandle } } - // if we recieved an attention (but this thread didn't send it) then + // if we received an attention (but this thread didn't send it) then // we throw an Operation Cancelled error if (stateObj.HasReceivedAttention) { diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorManagedHelper.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorManagedHelper.cs index 43be666e0d..7bd2058419 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorManagedHelper.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorManagedHelper.cs @@ -33,7 +33,7 @@ private static DataTable ParseServerEnumString(string serverInstances) } string[] numOfServerInstances = serverInstances.Split(SqlDataSourceEnumeratorUtil.s_endOfServerInstanceDelimiter_Managed, System.StringSplitOptions.None); - SqlClientEventSource.Log.TryTraceEvent(" Number of recieved server instances are {2}", + SqlClientEventSource.Log.TryTraceEvent(" Number of received server instances are {2}", nameof(SqlDataSourceEnumeratorManagedHelper), nameof(ParseServerEnumString), numOfServerInstances.Length); foreach (string currentServerInstance in numOfServerInstances) diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.cs index a236d5645e..65a7898c68 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Sql/SqlDataSourceEnumeratorNativeHelper.cs @@ -114,7 +114,7 @@ private static DataTable ParseServerEnumString(string serverInstances) string isClustered = null; string version = null; string[] serverinstanceslist = serverInstances.Split(EndOfServerInstanceDelimiter_Native); - SqlClientEventSource.Log.TryTraceEvent(" Number of recieved server instances are {2}", + SqlClientEventSource.Log.TryTraceEvent(" Number of received server instances are {2}", nameof(SqlDataSourceEnumeratorNativeHelper), nameof(ParseServerEnumString), serverinstanceslist.Length); // Every row comes in the format "serverName\instanceName;Clustered:[Yes|No];Version:.." diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs index 5d35159d60..dafdd9e61a 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs @@ -107,7 +107,7 @@ public static bool SuppressInsecureTLSWarning /// /// In System.Data.SqlClient and Microsoft.Data.SqlClient prior to 3.0.0 a field with type Timestamp/RowVersion - /// would return an empty byte array. This switch contols whether to preserve that behaviour on newer versions + /// would return an empty byte array. This switch controls whether to preserve that behaviour on newer versions /// of Microsoft.Data.SqlClient, if this switch returns false an appropriate null value will be returned. /// This app context switch defaults to 'false'. /// diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Algorithm.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Algorithm.cs index d3a926b0da..1035d87062 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Algorithm.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlAeadAes256CbcHmac256Algorithm.cs @@ -91,7 +91,7 @@ internal class SqlAeadAes256CbcHmac256Algorithm : SqlClientEncryptionAlgorithm /// Root encryption key from which three other keys will be derived /// /// Encryption Type, accepted values are Deterministic and Randomized. - /// For Deterministic encryption, a synthetic IV will be genenrated during encryption + /// For Deterministic encryption, a synthetic IV will be generated during encryption /// For Randomized encryption, a random IV will be generated during encryption. /// /// diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs index de8319c526..b62d5b815b 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnectionStringBuilder.cs @@ -1521,7 +1521,7 @@ public int MaxPoolSize /// [DisplayName(DbConnectionStringKeywords.ConnectRetryCount)] - [ResCategory(StringsHelper.ResourceNames.DataCategory_ConnectionResilency)] + [ResCategory(StringsHelper.ResourceNames.DataCategory_ConnectionResiliency)] [ResDescription(StringsHelper.ResourceNames.DbConnectionString_ConnectRetryCount)] [RefreshProperties(RefreshProperties.All)] public int ConnectRetryCount @@ -1540,7 +1540,7 @@ public int ConnectRetryCount /// [DisplayName(DbConnectionStringKeywords.ConnectRetryInterval)] - [ResCategory(StringsHelper.ResourceNames.DataCategory_ConnectionResilency)] + [ResCategory(StringsHelper.ResourceNames.DataCategory_ConnectionResiliency)] [ResDescription(StringsHelper.ResourceNames.DbConnectionString_ConnectRetryInterval)] [RefreshProperties(RefreshProperties.All)] public int ConnectRetryInterval diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs index da214059a0..164989b88f 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlParameter.cs @@ -1001,7 +1001,7 @@ internal string GetPrefixedParameterName() } /// - /// Checks the parameter name for the @ prefix and appends it if it is missing, then apends the parameter name + /// Checks the parameter name for the @ prefix and appends it if it is missing, then appends the parameter name /// /// /// diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs index 8592fd7407..0f131974b2 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlUtil.cs @@ -2691,7 +2691,7 @@ internal static void EscapeIdentifier(StringBuilder builder, string name) } /// - /// Escape a string to be used inside TSQL literal, such as N'somename' or 'somename' + /// Escape a string to be used inside TSQL literal, such as N'some-name' or 'some-name' /// internal static string EscapeStringAsLiteral(string input) { diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs index 8ae65384ef..6cb1c70efc 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsEnums.cs @@ -1185,7 +1185,7 @@ public enum SqlAuthenticationMethod #endif } // This enum indicates the state of TransparentNetworkIPResolution - // The first attempt when TNIR is on should be sequential. If the first attempt failes next attempts should be parallel. + // The first attempt when TNIR is on should be sequential. If the first attempt fails next attempts should be parallel. internal enum TransparentNetworkResolutionState { DisabledMode = 0, diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs index b7e830ae80..10afc6c9d7 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/TdsParserStateObject.cs @@ -2208,7 +2208,7 @@ private bool OnTimeoutSync(bool asyncClose = false) } /// - /// attempts to change the timout state from the expected state to the target state and if it succeeds + /// attempts to change the timeout state from the expected state to the target state and if it succeeds /// will setup the the stateobject into the timeout expired state /// /// the state that is the expected current state, state will change only if this is correct diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx index c2dd68b867..e84dcef2a1 100644 --- a/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx +++ b/src/Microsoft.Data.SqlClient/src/Resources/Strings.resx @@ -411,7 +411,7 @@ Replication - + Connection Resiliency @@ -771,7 +771,7 @@ IsDataSet attribute is missing in input Schema. - + Cannot determine the DataSet Element. IsDataSet attribute exist more than once. @@ -813,10 +813,10 @@ Expected {0}, but actual token at the position {2} is {1}. - + Cannot convert from {0} to {1}. - + Cannot convert value '{0}' to Type: {1}. @@ -879,7 +879,7 @@ Cannot evaluate. Expression '{0}' is not an aggregate. - + Filter expression '{0}' does not evaluate to a Boolean term. @@ -1113,7 +1113,7 @@ SetAdded and SetModified can only be called on DataRows with Unchanged DataRowState. - + Ordinal '{0}' exceeds the maximum number. @@ -1464,7 +1464,7 @@ Mismatch columns in the PrimaryKey : <target>.{0} versus <source>.{1}. - + Relation {0} cannot be merged, because keys have mismatch columns. @@ -1650,7 +1650,7 @@ Collection was modified; enumeration operation might not execute. - + Simple type '{0}' has already be declared with different '{1}'. @@ -1710,7 +1710,7 @@ Cannot remove column since it is built in to this dataSet. - + Cannot remove relation since it is built in to this dataSet. @@ -1719,7 +1719,7 @@ Occurs whenever this collection's membership changes. - + Cannot get value because it is DBNull. @@ -1914,7 +1914,7 @@ Update requires the command clone to have a connection object. The Connection property of the command clone has not been initialized. - + Update requires a connection. @@ -3618,7 +3618,7 @@ field '{0}' is marked non-serialized - + The type of field '{0}' is marked as explicit layout which is not allowed in Native format @@ -3945,7 +3945,7 @@ A network-related or instance-specific error occurred while establishing a connection to SQL Server. The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. - + The client was unable to establish a connection because of an error during connection initialization process before login. Possible causes include the following: the client tried to connect to an unsupported version of SQL Server; the server was too busy to accept new connections; or there was a resource limitation (insufficient memory or maximum allowed connections) on the server. @@ -4425,7 +4425,7 @@ The server did not preserve SSL encryption during a recovery attempt, connection recovery is not possible. - + The server did not preserve the exact client TDS version requested during a recovery attempt, connection recovery is not possible. diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs index 8bda7696a6..439406dadb 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/AdapterTest/AdapterTest.cs @@ -596,7 +596,7 @@ public void ParameterTest_InOut() sqlAdapter.SelectCommand = cmd; sqlAdapter.Fill(dataSet); - // check our ouput and return value params + // check our output and return value params Assert.True(VerifyOutputParams(cmd.Parameters), "FAILED: InputOutput parameter test with returned rows and bound return value!"); Assert.True(1 == dataSet.Tables[0].Rows.Count, "FAILED: Expected 1 row to be loaded in the dataSet!"); @@ -613,7 +613,7 @@ public void ParameterTest_InOut() // now exec the same thing without a data set cmd.ExecuteNonQuery(); - // check our ouput and return value params + // check our output and return value params Assert.True(VerifyOutputParams(cmd.Parameters), "FAILED: InputOutput parameter test with no returned rows and bound return value!"); // now unbind the return value diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/GenerateSelfSignedCertificate.ps1 b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/GenerateSelfSignedCertificate.ps1 index 296fdd0735..11d2910d97 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/GenerateSelfSignedCertificate.ps1 +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectionTestWithSSLCert/GenerateSelfSignedCertificate.ps1 @@ -121,7 +121,7 @@ function Invoke-SqlServerCertificateCommand { $e = $e.InnerException $msg += "`n" + $e.Message } - Write-Host "Certificate generation was not successfull. $msg" + Write-Host "Certificate generation was not successful. $msg" } } diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/makepfxcert.ps1 b/src/Microsoft.Data.SqlClient/tests/ManualTests/makepfxcert.ps1 index 02d558d77b..78f55d7168 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/makepfxcert.ps1 +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/makepfxcert.ps1 @@ -149,7 +149,7 @@ function Invoke-SqlServerCertificateCommand { $msg += "`n" + $e.Message } - Write-Output "Certificate generation was not successfull. $msg" + Write-Output "Certificate generation was not successful. $msg" } Write-Output "Certificate generation task completed." diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/ITDSServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/ITDSServer.cs index 96c222e37b..052fd0a5e9 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/ITDSServer.cs +++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/ITDSServer.cs @@ -24,14 +24,14 @@ public interface ITDSServer /// /// It is called when pre-login request arrives /// - /// TDS message recieved + /// TDS message received /// TDS messages to be respond with TDSMessageCollection OnPreLoginRequest(ITDSServerSession session, TDSMessage message); /// /// It is called when login request arrives /// - /// TDS message recieved + /// TDS message received /// TDS message to respond with TDSMessageCollection OnLogin7Request(ITDSServerSession session, TDSMessage message); @@ -47,21 +47,21 @@ public interface ITDSServer /// /// It is called when SSPI payload arrives /// - /// TDS message recieved + /// TDS message received /// TDS message to respond with TDSMessageCollection OnSSPIRequest(ITDSServerSession session, TDSMessage message); /// /// It is called when SQL batch request arrives /// - /// TDS message recieved + /// TDS message received /// TDS message to respond with TDSMessageCollection OnSQLBatchRequest(ITDSServerSession session, TDSMessage message); /// /// It is called when attention arrives /// - /// TDS message recieved + /// TDS message received /// TDS message to respond with TDSMessageCollection OnAttention(ITDSServerSession session, TDSMessage message); } diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSClientParser.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSClientParser.cs index 458392e502..d4a75fa935 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSClientParser.cs +++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.EndPoint/TDSClientParser.cs @@ -202,7 +202,7 @@ private TDSMessage _ReadResponse() } // Log event - Log("Recieved a response to \"{0}\"", Client.State); + Log("received a response to \"{0}\"", Client.State); // Return what we inflated return responseMessage; diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTDSServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTDSServer.cs index e0c243dcc8..5d31aaf543 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTDSServer.cs +++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/GenericTDSServer.cs @@ -119,7 +119,7 @@ public virtual TDSMessageCollection OnPreLoginRequest(ITDSServerSession session, // Create TDS prelogin packet TDSPreLoginToken preLoginToken = new TDSPreLoginToken(Arguments.ServerVersion, serverResponse, false); // TDS server doesn't support MARS - // Cache the recieved Nonce into the session + // Cache the received Nonce into the session (session as GenericTDSServerSession).ClientNonce = preLoginRequest.Nonce; // Check if the server has been started up as requiring FedAuth when choosing between SSPI and FedAuth diff --git a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/RoutingTDSServer.cs b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/RoutingTDSServer.cs index 2380487fb1..57596b24ac 100644 --- a/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/RoutingTDSServer.cs +++ b/src/Microsoft.Data.SqlClient/tests/tools/TDS/TDS.Servers/RoutingTDSServer.cs @@ -128,7 +128,7 @@ public override TDSMessageCollection OnLogin7Request(ITDSServerSession session, /// /// It is called when SQL batch request arrives /// - /// TDS message recieved + /// TDS message received /// TDS message to respond with public override TDSMessageCollection OnSQLBatchRequest(ITDSServerSession session, TDSMessage request) {