From 66f98574091e96ccb2fed0aec9234cf6e1502d2d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 8 Sep 2021 19:55:18 +0000
Subject: [PATCH] [release/6.0] Make DataProtection warnings mention
 aka.ms/dataprotectionwarning (#36292)

---
 .../DataProtection/src/Resources.resx         | 46 +++++++++----------
 .../Extensions/src/Resources.resx             |  8 ++--
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/DataProtection/DataProtection/src/Resources.resx b/src/DataProtection/DataProtection/src/Resources.resx
index 9540aa54faa..f1f2345696b 100644
--- a/src/DataProtection/DataProtection/src/Resources.resx
+++ b/src/DataProtection/DataProtection/src/Resources.resx
@@ -118,34 +118,34 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="CryptCommon_GenericError" xml:space="preserve">
-    <value>An error occurred during a cryptographic operation.</value>
+    <value>An error occurred during a cryptographic operation. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="Common_BufferIncorrectlySized" xml:space="preserve">
-    <value>The provided buffer is of length {0} byte(s). It must instead be exactly {1} byte(s) in length.</value>
+    <value>The provided buffer is of length {0} byte(s). It must instead be exactly {1} byte(s) in length. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="CryptCommon_PayloadInvalid" xml:space="preserve">
-    <value>The payload was invalid.</value>
+    <value>The payload was invalid. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="Common_PropertyCannotBeNullOrEmpty" xml:space="preserve">
     <value>Property {0} cannot be null or empty.</value>
   </data>
   <data name="Common_DecryptionFailed" xml:space="preserve">
-    <value>The provided payload could not be decrypted. Refer to the inner exception for more information.</value>
+    <value>The provided payload could not be decrypted. Refer to the inner exception for more information. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="Common_EncryptionFailed" xml:space="preserve">
-    <value>An error occurred while trying to encrypt the provided data. Refer to the inner exception for more information.</value>
+    <value>An error occurred while trying to encrypt the provided data. Refer to the inner exception for more information. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="Common_KeyNotFound" xml:space="preserve">
-    <value>The key {0:B} was not found in the key ring.</value>
+    <value>The key {0:B} was not found in the key ring. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="Common_KeyRevoked" xml:space="preserve">
-    <value>The key {0:B} has been revoked.</value>
+    <value>The key {0:B} has been revoked. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="ProtectionProvider_BadMagicHeader" xml:space="preserve">
-    <value>The provided payload cannot be decrypted because it was not protected with this protection provider.</value>
+    <value>The provided payload cannot be decrypted because it was not protected with this protection provider. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="ProtectionProvider_BadVersion" xml:space="preserve">
-    <value>The provided payload cannot be decrypted because it was protected with a newer version of the protection provider.</value>
+    <value>The provided payload cannot be decrypted because it was protected with a newer version of the protection provider. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="Common_ValueMustBeNonNegative" xml:space="preserve">
     <value>Value must be non-negative.</value>
@@ -154,45 +154,45 @@
     <value>The type '{1}' is not assignable to '{0}'.</value>
   </data>
   <data name="KeyManagementOptions_MinNewKeyLifetimeViolated" xml:space="preserve">
-    <value>The new key lifetime must be at least one week.</value>
+    <value>The new key lifetime must be at least one week. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="XmlKeyManager_DuplicateKey" xml:space="preserve">
-    <value>The key {0:B} already exists in the keyring.</value>
+    <value>The key {0:B} already exists in the keyring. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="Common_ArgumentCannotBeNullOrEmpty" xml:space="preserve">
     <value>Argument cannot be null or empty.</value>
   </data>
   <data name="Common_PropertyMustBeNonNegative" xml:space="preserve">
-    <value>Property {0} must have a non-negative value.</value>
+    <value>Property {0} must have a non-negative value. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="Platform_WindowsRequiredForGcm" xml:space="preserve">
-    <value>GCM algorithms require the Windows platform.</value>
+    <value>GCM algorithms require the Windows platform. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="CertificateXmlEncryptor_CertificateNotFound" xml:space="preserve">
-    <value>A certificate with the thumbprint '{0}' could not be found.</value>
+    <value>A certificate with the thumbprint '{0}' could not be found. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="EncryptedXmlDecryptor_DoesNotWorkOnCoreClr" xml:space="preserve">
-    <value>Decrypting EncryptedXml-encapsulated payloads is not yet supported on Core CLR.</value>
+    <value>Decrypting EncryptedXml-encapsulated payloads is not yet supported on Core CLR. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="AlgorithmAssert_BadBlockSize" xml:space="preserve">
-    <value>The symmetric algorithm block size of {0} bits is invalid. The block size must be between 64 and 2048 bits, inclusive, and it must be a multiple of 8 bits.</value>
+    <value>The symmetric algorithm block size of {0} bits is invalid. The block size must be between 64 and 2048 bits, inclusive, and it must be a multiple of 8 bits. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="AlgorithmAssert_BadDigestSize" xml:space="preserve">
-    <value>The validation algorithm digest size of {0} bits is invalid. The digest size must be between 128 and 2048 bits, inclusive, and it must be a multiple of 8 bits.</value>
+    <value>The validation algorithm digest size of {0} bits is invalid. The digest size must be between 128 and 2048 bits, inclusive, and it must be a multiple of 8 bits. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="AlgorithmAssert_BadKeySize" xml:space="preserve">
-    <value>The symmetric algorithm key size of {0} bits is invalid. The key size must be between 128 and 2048 bits, inclusive, and it must be a multiple of 8 bits.</value>
+    <value>The symmetric algorithm key size of {0} bits is invalid. The key size must be between 128 and 2048 bits, inclusive, and it must be a multiple of 8 bits. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="KeyRingProvider_NoDefaultKey_AutoGenerateDisabled" xml:space="preserve">
-    <value>The key ring does not contain a valid default protection key. The data protection system cannot create a new key because auto-generation of keys is disabled.</value>
+    <value>The key ring does not contain a valid default protection key. The data protection system cannot create a new key because auto-generation of keys is disabled. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="LifetimeMustNotBeNegative" xml:space="preserve">
-    <value>{0} must not be negative</value>
+    <value>{0} must not be negative. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="XmlKeyManager_IXmlRepositoryNotFound" xml:space="preserve">
-    <value>The '{0}' instance could not be found. When an '{1}' instance is set, a corresponding '{0}' instance must also be set.</value>
+    <value>The '{0}' instance could not be found. When an '{1}' instance is set, a corresponding '{0}' instance must also be set. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="FileSystem_EphemeralKeysLocationInContainer" xml:space="preserve">
-    <value>Storing keys in a directory '{path}' that may not be persisted outside of the container. Protected data will be unavailable when container is destroyed.</value>
+    <value>Storing keys in a directory '{path}' that may not be persisted outside of the container. Protected data will be unavailable when container is destroyed. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/DataProtection/Extensions/src/Resources.resx b/src/DataProtection/Extensions/src/Resources.resx
index b53d26e3211..cb991bcf7e5 100644
--- a/src/DataProtection/Extensions/src/Resources.resx
+++ b/src/DataProtection/Extensions/src/Resources.resx
@@ -118,12 +118,12 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="CryptCommon_GenericError" xml:space="preserve">
-    <value>An error occurred during a cryptographic operation.</value>
+    <value>An error occurred during a cryptographic operation. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="TimeLimitedDataProtector_PayloadExpired" xml:space="preserve">
-    <value>The payload expired at {0}.</value>
+    <value>The payload expired at {0}. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
   <data name="TimeLimitedDataProtector_PayloadInvalid" xml:space="preserve">
-    <value>The payload is invalid.</value>
+    <value>The payload is invalid. For more information go to http://aka.ms/dataprotectionwarning</value>
   </data>
-</root>
\ No newline at end of file
+</root>
-- 
GitLab