From 1d91cd2dd5c2b4af824d042315204eefbb817e55 Mon Sep 17 00:00:00 2001
From: GitHubPang <61439577+GitHubPang@users.noreply.github.com>
Date: Tue, 20 Jul 2021 08:03:53 +0800
Subject: [PATCH 1/2] Fix typo in string resources
---
.../netcore/src/Resources/Strings.Designer.cs | 2 +-
.../netcore/src/Resources/Strings.resx | 2 +-
.../netfx/src/Resources/Strings.Designer.cs | 4 ++--
src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx | 4 ++--
.../tests/FunctionalTests/SqlConnectionTest.cs | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
index 5f81a9cbcc..3863f8f18d 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
@@ -331,7 +331,7 @@ internal static string ADP_InvalidConnectionOptionValue {
}
///
- /// Looks up a localized string similar to The value's length for key '{0}' exceeds it's limit of '{1}'..
+ /// Looks up a localized string similar to The value's length for key '{0}' exceeds its limit of '{1}'..
///
internal static string ADP_InvalidConnectionOptionValueLength {
get {
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx
index 4dff81e444..637a85b34c 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx
@@ -241,7 +241,7 @@
Use of key '{0}' requires the key '{1}' to be present.
- The value's length for key '{0}' exceeds it's limit of '{1}'.
+ The value's length for key '{0}' exceeds its limit of '{1}'.
Keyword not supported: '{0}'.
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 adfca21fb3..1ee357c97f 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
@@ -673,7 +673,7 @@ internal static string ADP_InternalProviderError {
}
///
- /// Looks up a localized string similar to The length of argument '{0}' exceeds it's limit of '{1}'..
+ /// Looks up a localized string similar to The length of argument '{0}' exceeds its limit of '{1}'..
///
internal static string ADP_InvalidArgumentLength {
get {
@@ -718,7 +718,7 @@ internal static string ADP_InvalidConnectionOptionValue {
}
///
- /// Looks up a localized string similar to The value's length for key '{0}' exceeds it's limit of '{1}'..
+ /// Looks up a localized string similar to The value's length for key '{0}' exceeds its limit of '{1}'..
///
internal static string ADP_InvalidConnectionOptionValueLength {
get {
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
index 5246f97349..f0ef6f3214 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
@@ -1771,7 +1771,7 @@
Specified QuotePrefix and QuoteSuffix values do not match.
- The length of argument '{0}' exceeds it's limit of '{1}'.
+ The length of argument '{0}' exceeds its limit of '{1}'.
Expecting argument of type {1}, but received type {0}.
@@ -1783,7 +1783,7 @@
Use of key '{0}' requires the key '{1}' to be present.
- The value's length for key '{0}' exceeds it's limit of '{1}'.
+ The value's length for key '{0}' exceeds its limit of '{1}'.
Keyword not supported: '{0}'.
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
index 844a72caf3..155a896f8a 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/SqlConnectionTest.cs
@@ -208,7 +208,7 @@ public void ChangePassword_NewPassword_ExceedMaxLength()
{
ArgumentException ex = Assert.Throws(() => SqlConnection.ChangePassword("server=SQLSRV", new string('d', 129)));
// The length of argument 'newPassword' exceeds
- // it's limit of '128'
+ // its limit of '128'
Assert.Null(ex.InnerException);
Assert.NotNull(ex.Message);
Assert.True(ex.Message.IndexOf("'newPassword'") != -1);
From 26e1e111eff1e4c1a56a2dc7a692b8dbcfa6151d Mon Sep 17 00:00:00 2001
From: GitHubPang <61439577+GitHubPang@users.noreply.github.com>
Date: Wed, 21 Jul 2021 07:59:29 +0800
Subject: [PATCH 2/2] Fix typo in string resources
---
.../netcore/src/Resources/Strings.Designer.cs | 2 +-
src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx | 2 +-
.../netfx/src/Resources/Strings.Designer.cs | 2 +-
src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
index 3863f8f18d..291bead3d3 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
@@ -4981,7 +4981,7 @@ internal static string TCE_InvalidKeyIdUnableToCastToUnsignedShort {
}
///
- /// Looks up a localized string similar to The column encryption key has been successfully decrypted but it's length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database..
+ /// Looks up a localized string similar to The column encryption key has been successfully decrypted but its length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database..
///
internal static string TCE_InvalidKeySize {
get {
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx
index 637a85b34c..2ae63630be 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.resx
@@ -1546,7 +1546,7 @@
Internal error. Invalid key encryption algorithm specified: '{0}'. Expected value: '{1}'.
- The column encryption key has been successfully decrypted but it's length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database.
+ The column encryption key has been successfully decrypted but its length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database.
Invalid key store provider name: '{0}'. A key store provider name must denote either a system key store provider or a registered custom key store provider. Valid system key store provider names are: {1}. Valid (currently registered) custom key store provider names are: {2}. Please verify key store provider information in column master key definitions in the database, and verify all custom key store providers used in your application are registered properly.
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 1ee357c97f..2644b0a713 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs
@@ -12610,7 +12610,7 @@ internal static string TCE_InvalidKeyIdUnableToCastToUnsignedShort {
}
///
- /// Looks up a localized string similar to The column encryption key has been successfully decrypted but it's length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database..
+ /// Looks up a localized string similar to The column encryption key has been successfully decrypted but its length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database..
///
internal static string TCE_InvalidKeySize {
get {
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
index f0ef6f3214..893c22f01c 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.resx
@@ -4162,7 +4162,7 @@
Internal error. Column encryption key cannot be null.
- The column encryption key has been successfully decrypted but it's length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database.
+ The column encryption key has been successfully decrypted but its length: {1} does not match the length: {2} for algorithm '{0}'. Verify the encrypted value of the column encryption key in the database.
Encryption type '{1}' specified for the column in the database is either invalid or corrupted. Valid encryption types for algorithm '{0}' are: {2}.