Merge pull request #18732 from cheenamalhotra/sqlclient-212

Update ADO.NET documentations post release

Author: v-ccolin

docs/connect/ado-net/sql/azure-key-vault-enclave-example.md

@@ -2,24 +2,28 @@
 description: "Example demonstrating use of Azure Key Vault provider with Always Encrypted enabled with secure enclaves"
 title: "Example demonstrating use of Azure Key Vault provider with Always Encrypted enabled with secure enclaves | Microsoft Docs"
 ms.custom: ""
-ms.date: 11/17/2020
-ms.reviewer: v-daenge
+ms.date: 03/03/2021
 ms.prod: sql
 ms.prod_service: connectivity
 ms.technology: connectivity
 ms.tgt_pltfrm: ""
 ms.topic: tutorial
-author: karinazhou
-ms.author: v-jizho2
+author: David-Engel
+ms.author: v-daenge
+ms.reviewer: v-jizho2
 ---
 
 # Example demonstrating use of Azure Key Vault provider with Always Encrypted enabled with secure enclaves
 
 [!INCLUDE [sqlserver2019-windows-only-asdb](../../../includes/applies-to-version/sqlserver2019-windows-only-asdb.md)]
 
-[!INCLUDE [appliesto-netfx-netcore-xxxx-md](../../../includes/appliesto-netfx-netcore-netst-md.md)]
+[!INCLUDE [appliesto-netfx-netcore-netst-md](../../../includes/appliesto-netfx-netcore-netst-md.md)]
 
-This example demonstrates use of Azure Key Vault Provider when accessing encrypted columns.
+## AzureKeyVaultProvider v2.0+
+
+[!code-csharp [Azure Key Vault Provider 2.0 with Enclave Example#1](~/../sqlclient/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample_2_0.cs#1)]
+
+## AzureKeyVaultProvider v1.x
 
 [!code-csharp [Azure Key Vault Provider with Enclave Example#1](~/../sqlclient/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample.cs#1)]
 

docs/connect/ado-net/sql/azure-key-vault-example.md

@@ -2,26 +2,32 @@
 description: "Example demonstrating use of Azure Key Vault provider with Always Encrypted"
 title: "Example demonstrating use of Azure Key Vault provider with Always Encrypted | Microsoft Docs"
 ms.custom: ""
-ms.date: 11/17/2020
-ms.reviewer: v-daenge
+ms.date: 03/03/2021
 ms.prod: sql
 ms.prod_service: connectivity
 ms.technology: connectivity
 ms.tgt_pltfrm: ""
 ms.topic: tutorial
-author: karinazhou
-ms.author: v-jizho2
+author: David-Engel
+ms.author: v-daenge
+ms.reviewer: v-jizho2
 ---
 
 # Example demonstrating use of Azure Key Vault provider with Always Encrypted
 
 [!INCLUDE [sqlserver2019-windows-only](../../../includes/applies-to-version/sqlserver2019-windows-only.md)]
 
-[!INCLUDE [appliesto-netfx-netcore-xxxx-md](../../../includes/appliesto-netfx-netcore-netst-md.md)]
+[!INCLUDE [appliesto-netfx-netcore-netst-md](../../../includes/appliesto-netfx-netcore-netst-md.md)]
 
 This example demonstrates use of Azure Key Vault Provider when accessing encrypted columns.
 
-[!code-csharp [AKVProvider Example#1](~/../sqlclient/doc/samples/AzureKeyVaultProviderExample.cs#1)]
+## AzureKeyVaultProvider v2.0+
+
+[!code-csharp [Azure Key Vault Provider 2.0 Example#1](~/../sqlclient/doc/samples/AzureKeyVaultProviderExample_2_0.cs#1)]
+
+## AzureKeyVaultProvider v1.x
+
+[!code-csharp [Azure Key Vault Provider Example#1](~/../sqlclient/doc/samples/AzureKeyVaultProviderExample.cs#1)]
 
 > [!NOTE]
 >

docs/connect/ado-net/sql/sqlclient-support-always-encrypted.md

@@ -1,15 +1,15 @@
 ---
 title: "Using Always Encrypted with SqlClient"
 description: "Learn how to develop applications using Microsoft.Data.SqlClient and Always Encrypted to keep your data secure."
-ms.date: 11/16/2020
+ms.date: 03/03/2021
 ms.assetid: 
 ms.prod: sql
 ms.prod_service: connectivity
 ms.technology: connectivity
 ms.topic: conceptual
-author: cheenamalhotra
-ms.author: v-chmalh
-ms.reviewer: v-daenge
+author: David-Engel
+ms.author: v-daenge
+ms.reviewer: v-jizho2
 ---
 
 # Using Always Encrypted with the Microsoft .NET Data Provider for SQL Server
@@ -324,6 +324,18 @@ Azure Key Vault is a convenient option to store and manage column master keys fo
 |:---|:---|:---|:---|
 |[SqlColumnEncryptionAzureKeyVaultProvider Class](/dotnet/api/microsoft.data.sqlclient.alwaysencrypted.azurekeyvaultprovider.sqlcolumnencryptionazurekeyvaultprovider) | Provider for Azure Key Vault. | AZURE_KEY_VAULT | Windows, Linux, macOS |
 
+#### .NET Supportability
+
+| Version | Microsoft.Data.SqlClient version | .NET platforms | 
+| ------- | ----------- | ------- |
+| 2.0.0 | 1.1.3+ <br/> 2.1.0+ | .NET Framework 4.6.1+, .NET Core 2.1+ <br/>.NET Standard 2.0+ |
+| 1.2.0 | 1.0.19269.1+ <br/> 2.1.0+ | .NET Framework 4.6+, .NET Core 2.1+ <br/>.NET Standard 2.0+ |
+| 1.1.0 | 1.0.19269.1+ | .NET Framework 4.6+, .NET Core 2.1+ |
+| 1.0.0 | 1.0.19269.1+ | .NET Framework 4.6+, .NET Core 2.1+ |
+|||
+
+Starting with **v2.0.0**, the `Microsoft.Data.SqLClient.AlwaysEncrypted.AzureKeyVaultProvider` supports the new Azure.Core and Azure.Identity APIs to perform authentication with Azure Key Vault. An instance of [`TokenCredential`](/dotnet/api/azure.core.tokencredential) implementation can now be passed to [`SqlColumnEncryptionAzureKeyVaultProvider`](/dotnet/api/microsoft.data.sqlclient.alwaysencrypted.azurekeyvaultprovider.sqlcolumnencryptionazurekeyvaultprovider) constructors to initialize Azure Key Vault provider object.
+
 For examples demonstrating performing encryption/decryption with Azure Key Vault, see [Azure Key Vault working with Always Encrypted](azure-key-vault-example.md) and [Azure Key Vault working with Always Encrypted with secure enclaves](azure-key-vault-enclave-example.md).
 
 ### Implementing a custom column master key store provider

docs/connect/ado-net/sqlclient-driver-support-lifecycle.md

@@ -1,7 +1,7 @@
 ---
 title: "SqlClient driver support lifecycle"
 description: "Page that contains product support lifecycle information."
-ms.date: "02/26/2021"
+ms.date: "03/03/2021"
 dev_langs:
   - "csharp"
   - "vb"
@@ -30,7 +30,7 @@ New stable (GA) releases are published every six months on a regular cadence beg
 
 | Version | Official Release Date | Latest Patch Version | Patch Release Date | Support Level  | End of Support |
 | -- | -- | -- | -- | -- | -- |
-| 2.1 | November 19, 2020 | 2.1.1 | December 18, 2020 | LTS | November 20, 2023 |
+| 2.1 | November 19, 2020 | 2.1.2 | March 3, 2021 | LTS | November 20, 2023 |
 | 1.1 | November 20, 2019 | 1.1.3 | May 15, 2020 | LTS | November 21, 2022 |
 
 ### Out of support releases
@@ -40,14 +40,28 @@ New stable (GA) releases are published every six months on a regular cadence beg
 | 2.0 | June 16, 2020 | 2.0.1 | August 25, 2020 |
 | 1.0 | September 26, 2019 | 1.0.19269.1 | February 20, 2020 |
 
-### Long Term Support (LTS) releases
+
+## Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider release cadence
+
+New stable (GA) releases are published on demand when new features are added. Long Term Support (LTS) releases will be chosen by stakeholders and maintainers based on a few qualifications and customer response.
+
+### Actively supported releases
+
+| Version | Official Release Date | Latest Patch Version | Patch Release Date | Support Level  | End of Support |
+| -- | -- | -- | -- | -- | -- |
+| 2.x | March 3, 2021 | 2.0.0 | March 3, 2021 | LTS | March 4, 2024 |
+| 1.x | November 19, 2019 | 1.2.0 | December 01, 2020 | LTS | November 21, 2022 |
+
+
+## Long Term Support (LTS) releases
 
 LTS releases are supported for three years after the initial release.
 
-### Current releases
+## Current releases
 
 Current releases are supported for three months after a subsequent Current or LTS release.
 
+
 ## SQL version compatibility with Microsoft.Data.SqlClient
 
 |Database version&nbsp;&#8594;<br />&#8595; Driver Version|Azure SQL Database|Azure Synapse Analytics|Azure SQL Managed Instance|SQL Server 2019|SQL Server 2017|SQL Server 2016|SQL Server 2014|SQL Server 2012|

docs/connect/ado-net/sqlclient-troubleshooting-guide.md

@@ -1,7 +1,7 @@
 ---
 title: "SqlClient troubleshooting guide"
 description: "Page that provides resolutions to commonly observed problems."
-ms.date: "11/27/2020"
+ms.date: "03/03/2021"
 dev_langs:
   - "csharp"
   - "vb"
@@ -167,6 +167,13 @@ at Microsoft.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception
 
   **Recommended Solution:** Generate a new TLS/SSL Certificate for the server whose hash is signed with at-least the SHA-256 hashing algorithm.
 
+- Tightly restricted cipher suites on Linux with .NET 5+
+
+  .NET 5 introduced a breaking change for Linux clients, where a tightly restricted list of permitted cipher suites is used by default. You may need to expand the default cipher suite list to accept legacy clients (or to contact legacy servers) by either specify a `CipherSuitePolicy` value or changing the _OpenSSL_ configuration file.
+  
+  Read more on [Default TLS cipher suites for .NET on Linux
+](/dotnet/core/compatibility/cryptography/5.0/default-cipher-suites-for-tls-on-linux) for recommended action.
+
 ### Connection Pool exhaustion errors
 
 Stacktrace observed: