Merge branch 'dotnet:main' into Task-28274-Update-API-Documentation

DavoudEshtehari · Feb 15, 2024 · 0ec519b · 0ec519b
2 parents 94b4384 + e3cf59d
commit 0ec519b
Show file tree

Hide file tree

Showing 39 changed files with 124 additions and 43 deletions.
diff --git a/release-notes/5.0/5.0.0-preview1.md b/release-notes/5.0/5.0.0-preview1.md
@@ -4,6 +4,11 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [EngRajabi](https://github.com/EngRajabi)
+
 ### Added
 
 - Added SqlDataSourceEnumerator. [#1430](https://github.com/dotnet/SqlClient/pull/1430), [Read more](#sql-data-source-enumerator-support)

diff --git a/release-notes/5.0/5.0.0-preview2.md b/release-notes/5.0/5.0.0-preview2.md
@@ -4,6 +4,11 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [ErikEJ](https://github.com/ErikEJ)
+
 ### Breaking changes over preview release v5.0.0-preview1
 
 - Dropped support for .NET Framework 4.6.1 [#1574](https://github.com/dotnet/SqlClient/pull/1574)

diff --git a/release-notes/5.0/5.0.0-preview3.md b/release-notes/5.0/5.0.0-preview3.md
@@ -4,6 +4,13 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [EngRajabi](https://github.com/EngRajabi)
+- [tf-micwil](https://github.com/tf-micwil)
+- [swh-cb](https://github.com/swh-cb)
+
 ### Breaking changes over preview release v5.0.0-preview2
 
 - Added a dependency on the [Microsoft.SqlServer.Server](https://github.com/dotnet/SqlClient/tree/main/src/Microsoft.SqlServer.Server) package. This new dependency may cause namespace conflicts if your application references that namespace and still has package references (direct or indirect) to System.Data.SqlClient from .NET Core.

diff --git a/release-notes/5.0/5.0.0.md b/release-notes/5.0/5.0.0.md
@@ -4,6 +4,14 @@
 
 This update includes the following changes over the 4.1 release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [ErikEJ](https://github.com/ErikEJ)
+- [EngRajabi](https://github.com/EngRajabi)
+- [tf-micwil](https://github.com/tf-micwil)
+- [swh-cb](https://github.com/swh-cb)
+
 ### Breaking changes
 
 - As part of the [`TDS 8` feature](#tds-8-enhanced-security), the `SqlConnectionStringBuilder.Encrypt` property has changed from a `bool` to a `SqlConnectionEncryptOption`. `SqlConnectionEncryptOption` has implicit conversion rules to convert to/from a `bool` so that existing code remains backwards compatible, however this is a binary-breaking change and a recompile is required against this version.

diff --git a/release-notes/5.0/5.0.1.md b/release-notes/5.0/5.0.1.md
@@ -4,6 +4,9 @@
 
 This update includes the following changes over the 5.0.0 release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+
 ### Fixed
 
 - Fixed missing `HostNameInCertificate` connection string property in .NET Framework. [#1782](https://github.com/dotnet/SqlClient/pull/1782)

diff --git a/release-notes/5.0/5.0.2.md b/release-notes/5.0/5.0.2.md
@@ -4,6 +4,10 @@
 
 This update includes the following changes over the 5.0.1 release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+
 ### Fixed
 
 - Fixed memory leak regression from [#1785](https://github.com/dotnet/SqlClient/pull/1785) using a `DisposableTemporaryOnStack` struct. [#1980](https://github.com/dotnet/SqlClient/pull/1980)

diff --git a/release-notes/5.1/5.1.0-preview1.md b/release-notes/5.1/5.1.0-preview1.md
@@ -4,6 +4,11 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [sorensenmatias](https://github.com/sorensenmatias)
+
 ### Fixed
 
 - Fixed `ReadAsync()` behavior to register Cancellation token action before streaming results. [#1781](https://github.com/dotnet/SqlClient/pull/1781)

diff --git a/release-notes/5.1/5.1.0-preview2.md b/release-notes/5.1/5.1.0-preview2.md
@@ -4,6 +4,12 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [ErikEJ](https://github.com/ErikEJ)
+- [panoskj](https://github.com/panoskj)
+
 ### Breaking changes over preview release v5.1.0-preview1
 
 - Add support for .NET 6.0 and Dropped support for .NET Core 3.1. [#1704](https://github.com/dotnet/SqlClient/pull/1704) [#1823](https://github.com/dotnet/SqlClient/pull/1823)

diff --git a/release-notes/5.1/5.1.0.md b/release-notes/5.1/5.1.0.md
@@ -4,6 +4,15 @@
 
 This update includes the following changes over the 5.0 release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [ErikEJ](https://github.com/ErikEJ)
+- [roji](https://github.com/roji)
+- [panoskj](https://github.com/panoskj)
+- [teo-tsirpanis](https://github.com/teo-tsirpanis)
+- [sorensenmatias](https://github.com/sorensenmatias)
+
 ### Breaking changes
 
 - Dropped support for .NET Core 3.1. [#1704](https://github.com/dotnet/SqlClient/pull/1704) [#1823](https://github.com/dotnet/SqlClient/pull/1823)

diff --git a/release-notes/5.1/5.1.1.md b/release-notes/5.1/5.1.1.md
@@ -4,6 +4,9 @@
 
 This update includes the following changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+
 ### Fixed
 
 - Fixed an incorrect exception when a symmetric key fails to decrypt a column using Always Encrypted. [#1968](https://github.com/dotnet/SqlClient/pull/1968)

diff --git a/release-notes/5.1/5.1.2.md b/release-notes/5.1/5.1.2.md
@@ -4,6 +4,10 @@
 
 This update includes the following changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [emidah](https://github.com/emidah)
+
 ### Fixed
 
 - Fixed access violation when using SQL Express user instance. [#2101](https://github.com/dotnet/SqlClient/pull/2101)

diff --git a/release-notes/5.1/5.1.3.md b/release-notes/5.1/5.1.3.md
@@ -4,6 +4,9 @@
 
 This update includes the following changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+
 ### Fixed
 
 - Fixed encryption downgrade issue. [CVE-2024-0056](https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-0056)

diff --git a/release-notes/5.1/5.1.4.md b/release-notes/5.1/5.1.4.md
@@ -4,6 +4,9 @@
 
 This update includes the following changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+
 ### Fixed
 
 - Fixed a deadlock problem for distributed transactions when on .NET.

diff --git a/release-notes/5.1/5.1.5.md b/release-notes/5.1/5.1.5.md
@@ -4,6 +4,10 @@
 
 This update includes the following changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [ErikEJ](https://github.com/ErikEJ)
+
 ### Fixed
 
 - Fixed connection to unsubscribe from transaction completion events before returning it to the connection pool [#2321](https://github.com/dotnet/SqlClient/pull/2321)

diff --git a/release-notes/5.2/5.2.0-preview1.md b/release-notes/5.2/5.2.0-preview1.md
@@ -4,6 +4,13 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [ErikEJ](https://github.com/ErikEJ)
+- [kant2002](https://github.com/kant2002)
+- [mattjohnsonpint](https://github.com/mattjohnsonpint)
+
 ### Added
 
 - Added support of `SqlDiagnosticListener` on **.NET Standard**. [#1931](https://github.com/dotnet/SqlClient/pull/1931)

diff --git a/release-notes/5.2/5.2.0-preview2.md b/release-notes/5.2/5.2.0-preview2.md
@@ -4,6 +4,12 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [azerios](https://github.com/azerios)
+- [jinek](https://github.com/jinek)
+
 ### Added
 
 - Added new property `RowsCopied64` to `SqlBulkCopy`. [#2004](https://github.com/dotnet/SqlClient/pull/2004) [Read more](#added-new-property-rowscopied64-to-sqlbulkcopy)

diff --git a/release-notes/5.2/5.2.0-preview3.md b/release-notes/5.2/5.2.0-preview3.md
@@ -4,6 +4,11 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [kant2002](https://github.com/kant2002)
+- [christothes](https://github.com/christothes)
+
 ### Added
 
 - Added a new `AccessTokenCallBack` API to `SqlConnection`. [#1260](https://github.com/dotnet/SqlClient/pull/1260)

diff --git a/release-notes/5.2/5.2.0-preview4.md b/release-notes/5.2/5.2.0-preview4.md
@@ -4,6 +4,17 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [Wraith2](https://github.com/Wraith2)
+- [ErikEJ](https://github.com/ErikEJ)
+- [panoskj](https://github.com/panoskj)
+- [saitama951](https://github.com/saitama951)
+- [danielmarbach](https://github.com/danielmarbach)
+- [wsugarman](https://github.com/wsugarman)
+- [ViktorHofer](https://github.com/ViktorHofer)
+- [emidah](https://github.com/emidah)
+
 ### Added
 
 - Added `SqlBatch` support on .NET 6+[#1825](https://github.com/dotnet/SqlClient/pull/1825), [#2223](https://github.com/dotnet/SqlClient/pull/2223)

diff --git a/release-notes/5.2/5.2.0-preview5.md b/release-notes/5.2/5.2.0-preview5.md
@@ -4,6 +4,10 @@
 
 This update brings the below changes over the previous release:
 
+### Contributors
+Thanks to the following public contributors. Their efforts toward this project are very much appreciated.
+- [ErikEJ](https://github.com/ErikEJ)
+
 ### Added
 
 - Added .NET 8 support [#2230](https://github.com/dotnet/SqlClient/pull/2230)

diff --git a/...tcore/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.Windows.cs b/...tcore/src/Microsoft/Data/SqlClient/SqlColumnEncryptionCertificateStoreProvider.Windows.cs
@@ -81,13 +81,7 @@ public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string e
             X509Certificate2 certificate = GetCertificateByPath(masterKeyPath, isSystemOp: true);
 
             RSA RSAPublicKey = certificate.GetRSAPublicKey();
-            int keySizeInBytes;
-#if NETCOREAPP || NETSTANDARD2_1
-            DSA DSAPublicKey = certificate.GetDSAPublicKey();
-            keySizeInBytes = RSAPublicKey is not null ? RSAPublicKey.KeySize / 8 : DSAPublicKey.KeySize / 8;
-#else
-            keySizeInBytes= RSAPublicKey.KeySize / 8;
-#endif
+            int keySizeInBytes= RSAPublicKey.KeySize / 8;
 
             // Validate and decrypt the EncryptedColumnEncryptionKey
             // Format is 
@@ -182,13 +176,7 @@ public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string e
             X509Certificate2 certificate = GetCertificateByPath(masterKeyPath, isSystemOp: false);
 
             RSA RSAPublicKey = certificate.GetRSAPublicKey();
-            int keySizeInBytes;
-#if NETCOREAPP || NETSTANDARD2_1
-            DSA DSAPublicKey = certificate.GetDSAPublicKey();
-            keySizeInBytes = RSAPublicKey is not null ? RSAPublicKey.KeySize / 8 : DSAPublicKey.KeySize / 8;
-#else
-            keySizeInBytes= RSAPublicKey.KeySize / 8;
-#endif
+            int keySizeInBytes= RSAPublicKey.KeySize / 8;
 
             // Construct the encryptedColumnEncryptionKey
             // Format is 

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.de.resx
@@ -4465,7 +4465,7 @@
     <value>Das Ausführungstimeout ist abgelaufen. Der Timeoutzeitraum wurde überschritten, bevor der Vorgang beendet wurde, oder der Server antwortet nicht.</value>
   </data>
   <data name="AttestationTokenSignatureValidationFailed" xml:space="preserve">
-    <value>Fehler bei der Überprüfung eines Nachweistokens. Die Tokensignatur stimmt nicht mit der Signatur überein, die anhand eines öffentlichen Schlüssels berechnet wurde, der vom Endpunkt für öffentliche Nachweisschlüssel unter „{0}“ abgerufen wurde. Überprüfen Sie die DNS-Zuordnung für den Endpunkt – Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=2157649. Wenn diese korrekt ist, wenden Sie sich an den Kundensupport.</value>
+    <value>The validation of an attestation token failed. The token signature does not match the computed signature using a public key retrieved from the attestation public key endpoint at '{0}'. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If correct, contact Customer Support Services.</value>
   </data>
   <data name="EnclaveRetrySleepInSecondsValueException" xml:space="preserve">
     <value>Interner Fehler beim erneuten Download des HGS-Stammzertifikats, nachdem bei der ersten Anforderung ein Fehler aufgetreten ist. Wenden Sie sich an den Kundensupport.</value>

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.es.resx
@@ -4465,7 +4465,7 @@
     <value>Se agotó el tiempo de espera de ejecución. El período de tiempo de espera transcurrió antes de la finalización de la operación o el servidor no responde.</value>
   </data>
   <data name="AttestationTokenSignatureValidationFailed" xml:space="preserve">
-    <value>Error en la validación de un token de atestación. La firma del token no coincide con la firma calculada mediante una clave pública recuperada del punto de conexión de clave pública de atestación en "{0}". Compruebe la asignación de DNS del punto de conexión. Vea https://go.microsoft.com/fwlink/?linkid=2157649 para obtener más detalles. Si es correcta, póngase en contacto con el servicio de atención al cliente.</value>
+    <value>The validation of an attestation token failed. The token signature does not match the computed signature using a public key retrieved from the attestation public key endpoint at '{0}'. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If correct, contact Customer Support Services.</value>
   </data>
   <data name="EnclaveRetrySleepInSecondsValueException" xml:space="preserve">
     <value>Se ha producido un error interno al reintentar la descarga del certificado raíz de HGS después de un error en la solicitud inicial. Póngase en contacto con el servicio de atención al cliente.</value>

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.fr.resx
@@ -4465,7 +4465,7 @@
     <value>Le délai d'exécution a expiré. Le délai d'attente s'est écoulé avant la fin de l'opération ou le serveur ne répond pas.</value>
   </data>
   <data name="AttestationTokenSignatureValidationFailed" xml:space="preserve">
-    <value>La validation d'un jeton d'attestation a échoué. La signature du jeton ne correspond pas à la signature calculée à l'aide d'une clé publique récupérée sur le point de terminaison de clé publique d'attestation dans « {0} ». Vérifiez le mappage DNS pour le point de terminaison - consultez https://go.microsoft.com/fwlink/?linkid=2157649 pour plus d’informations. S'il est correct, contactez le service client.</value>
+    <value>The validation of an attestation token failed. The token signature does not match the computed signature using a public key retrieved from the attestation public key endpoint at '{0}'. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If correct, contact Customer Support Services.</value>
   </data>
   <data name="EnclaveRetrySleepInSecondsValueException" xml:space="preserve">
     <value>Une erreur interne s'est produite pendant la nouvelle tentative de téléchargement du certificat racine SGH après l'échec de la demande initiale. Contactez le service client.</value>

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.it.resx
@@ -4465,7 +4465,7 @@
     <value>Il timeout di esecuzione è scaduto. Il periodo di timeout è scaduto prima del completamento dell'operazione oppure il server non risponde.</value>
   </data>
   <data name="AttestationTokenSignatureValidationFailed" xml:space="preserve">
-    <value>La convalida di un token di attestazione non è riuscita. La firma del token non corrisponde alla firma calcolata usando una chiave pubblica recuperata dall'endpoint della chiave pubblica di attestazione in '{0}'. Verificare il mapping DNS per l'endpoint - vedere https://go.microsoft.com/fwlink/?linkid=2157649 per altri dettagli. Se è corretto, contattare il Servizio Supporto Tecnico Clienti.</value>
+    <value>The validation of an attestation token failed. The token signature does not match the computed signature using a public key retrieved from the attestation public key endpoint at '{0}'. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If correct, contact Customer Support Services.</value>
   </data>
   <data name="EnclaveRetrySleepInSecondsValueException" xml:space="preserve">
     <value>Si è verificato un errore interno durante il tentativo di eseguire il download del certificato radice HGS dopo che la richiesta iniziale non è riuscita. Contattare il Servizio Supporto Tecnico Clienti.</value>

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ja.resx
@@ -4465,7 +4465,7 @@
     <value>実行タイムアウトの期限が切れました。操作完了前にタイムアウト期間が過ぎたか、サーバーが応答していません。</value>
   </data>
   <data name="AttestationTokenSignatureValidationFailed" xml:space="preserve">
-    <value>構成証明トークンの検証に失敗しました。トークンの署名が、'{0}' の構成証明の公開キー エンドポイントから取得した公開キーを使用して計算された署名と一致しません。エンドポイントの DNS マッピングをご確認ください。詳細については、https://go.microsoft.com/fwlink/?linkid=2157649 を参照してください。適切である場合、カスタマー サポート サービスにお問い合わせください。</value>
+    <value>The validation of an attestation token failed. The token signature does not match the computed signature using a public key retrieved from the attestation public key endpoint at '{0}'. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If correct, contact Customer Support Services.</value>
   </data>
   <data name="EnclaveRetrySleepInSecondsValueException" xml:space="preserve">
     <value>最初の要求が失敗した後に、HGS ルート証明書のダウンロードを再試行しているときに内部エラーが発生しました。カスタマー サポート サービスにお問い合わせください。</value>

diff --git a/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx b/src/Microsoft.Data.SqlClient/src/Resources/Strings.ko.resx
@@ -4465,7 +4465,7 @@
     <value>실행 제한 시간을 초과했습니다. 작업이 완료되기 전에 실행 제한 시간이 지났거나 서버가 응답하지 않습니다.</value>
   </data>
   <data name="AttestationTokenSignatureValidationFailed" xml:space="preserve">
-    <value>증명 토큰의 유효성을 검사하지 못했습니다. 토큰 서명이 '{0}'의 증명 공개 키 엔드포인트에서 검색된 공개 키를 사용하여 계산된 서명과 일치하지 않습니다. 엔드포인트에 대한 DNS 매핑을 확인하세요. 자세한 내용은 https://go.microsoft.com/fwlink/?linkid=2157649 을 확인 하세요. 올바른 경우 고객 지원 서비스에 문의하세요.</value>
+    <value>The validation of an attestation token failed. The token signature does not match the computed signature using a public key retrieved from the attestation public key endpoint at '{0}'. Verify the DNS mapping for the endpoint - see https://go.microsoft.com/fwlink/?linkid=2157649 for more details. If correct, contact Customer Support Services.</value>
   </data>
   <data name="EnclaveRetrySleepInSecondsValueException" xml:space="preserve">
     <value>초기 요청이 실패한 후 HGS 루트 인증서 다운로드를 다시 시도하는 동안 내부 오류가 발생했습니다. 고객 지원 서비스에 문의하세요.</value>