Syncing with main. Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into work-webrtc-mar24

Heidilohr · Heidilohr · commit 73a9da6ca69e · 2024-03-25T09:07:13.000-07:00
diff --git a/articles/automation/automation-use-azure-ad.md b/articles/automation/automation-use-azure-ad.md
@@ -24,7 +24,7 @@ You can enable Microsoft Entra ID through the following PowerShell modules:
 >[!NOTE]
 >PowerShell Core does not support the MSOnline module. To use the module cmdlets, you must run them from Windows PowerShell. You're encouraged to use the newer Azure Active Directory PowerShell for Graph modules instead of the MSOnline module.
 
-[!INCLUDE [Azure AD PowerShell deprecation note](~/articles/reusable-content/msgraph-powershell/includes/aad-powershell-deprecation-note.md)]
+[!INCLUDE [Azure AD PowerShell deprecation note](~/reusable-content/msgraph-powershell/includes/aad-powershell-deprecation-note.md)]
 
 ### Preinstallation
 
diff --git a/articles/cosmos-db/mongodb/how-to-dotnet-get-started.md b/articles/cosmos-db/mongodb/how-to-dotnet-get-started.md
@@ -27,7 +27,7 @@ This article shows you how to connect to Azure Cosmos DB for MongoDB using .NET
 - An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
 - [.NET 6.0](https://dotnet.microsoft.com/download)
 - [Azure Command-Line Interface (CLI)](/cli/azure/) or [Azure PowerShell](/powershell/azure/)
-- [Azure Cosmos DB for MongoDB resource](quickstart-dotnet.md#create-an-azure-cosmos-db-account)
+- [Azure Cosmos DB for MongoDB resource](../nosql/how-to-dotnet-create-database.md)
 
 ## Create a new .NET Core app
 
diff --git a/articles/cosmos-db/mongodb/quickstart-dotnet.md b/articles/cosmos-db/mongodb/quickstart-dotnet.md
@@ -9,96 +9,63 @@ ms.devlang: csharp
 ms.topic: quickstart
 ms.date: 07/06/2022
 ms.custom: devx-track-csharp, mode-api, devguide-csharp, cosmos-db-dev-journey, devx-track-azurecli, devx-track-dotnet
+zone_pivot_groups: azure-cosmos-db-quickstart-env
 ---
 
 # Quickstart: Azure Cosmos DB for MongoDB for .NET with the MongoDB driver
 
 [!INCLUDE[MongoDB](../includes/appliesto-mongodb.md)]
 
-> [!div class="op_single_selector"]
->
-> * [.NET](quickstart-dotnet.md)
-> * [Python](quickstart-python.md)
-> * [Java](quickstart-java.md)
-> * [Node.js](quickstart-nodejs.md)
-> * [Go](quickstart-go.md)
->
-
-Get started with MongoDB to create databases, collections, and docs within your Azure Cosmos DB resource. Follow these steps to  install the package and try out example code for basic tasks.
-
-> [!NOTE]
-> The [example code snippets](https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples) are available on GitHub as a .NET project.
+Get started with MongoDB to create databases, collections, and docs within your Azure Cosmos DB resource. Follow these steps to deploy a minimal solution to your environment using the Azure Developer CLI.
 
 [API for MongoDB reference documentation](https://www.mongodb.com/docs/drivers/csharp) | [MongoDB Package (NuGet)](https://www.nuget.org/packages/MongoDB.Driver)
+packages/Microsoft.Azure.Cosmos) | [Azure Developer CLI](/azure/developer/azure-developer-cli/overview)
 
 ## Prerequisites
 
-- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free).
-- [.NET 6.0](https://dotnet.microsoft.com/download)
-- [Azure Command-Line Interface (CLI)](/cli/azure/install-azure-cli) or [Azure PowerShell](/powershell/azure/install-azure-powershell)
-
-### Prerequisite check
-
-- In a terminal or command window, run ``dotnet --list-sdks`` to check that .NET 6.x is one of the available versions.
-- Run ``az --version`` (Azure CLI) or ``Get-Module -ListAvailable AzureRM`` (Azure PowerShell) to check that you have the appropriate Azure command-line tools installed.
+[!INCLUDE [Developer Quickstart prerequisites](../nosql/includes/quickstart/dev-prereqs.md)]
 
 ## Setting up
 
-This section walks you through creating an Azure Cosmos DB account and setting up a project that uses the MongoDB NuGet packages.
-
-### Create an Azure Cosmos DB account
-
-This quickstart will create a single Azure Cosmos DB account using the API for MongoDB.
-
-#### [Azure CLI](#tab/azure-cli)
-
-[!INCLUDE [Azure CLI - create resources](./includes/azure-cli-create-resource-group-and-resource.md)]
+Deploy this project's development container to your environment. Then, use the Azure Developer CLI (`azd`) to create an Azure Cosmos DB for MongoDB account and deploy a containerized sample application. The sample application uses the client library to manage, create, read, and query sample data.
 
-#### [PowerShell](#tab/azure-powershell)
+::: zone pivot="devcontainer-codespace"
 
-[!INCLUDE [Powershell - create resource group and resources](./includes/powershell-create-resource-group-and-resource.md)]
+[![Open in GitHub Codespaces](https://img.shields.io/static/v1?style=for-the-badge&label=GitHub+Codespaces&message=Open&color=brightgreen&logo=github)](https://codespaces.new/azure-samples/cosmos-db-mongodb-dotnet-quickstart?template=false&quickstart=1&azure-portal=true)
 
-#### [Portal](#tab/azure-portal)
+::: zone-end
 
-[!INCLUDE [Portal - create resource](./includes/portal-create-resource.md)]
+::: zone pivot="devcontainer-vscode"
 
----
-
-### Get MongoDB connection string
-
-#### [Azure CLI](#tab/azure-cli)
-
-[!INCLUDE [Azure CLI - get connection string](./includes/azure-cli-get-connection-string.md)]
+[![Open in Dev Container](https://img.shields.io/static/v1?style=for-the-badge&label=Dev+Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/azure-samples/cosmos-db-mongodb-dotnet-quickstart)
 
-#### [PowerShell](#tab/azure-powershell)
+::: zone-end
 
-[!INCLUDE [Powershell - get connection string](./includes/powershell-get-connection-string.md)]
-
-#### [Portal](#tab/azure-portal)
-
-[!INCLUDE [Portal - get connection string](./includes/portal-get-connection-string-from-resource.md)]
+[!INCLUDE [dev-setup](../nosql/includes/quickstart/dev-setup.md)]
 
 ---
 
-### Create a new .NET app
+### Install the client library
 
-Create a new .NET application in an empty folder using your preferred terminal. Use the [``dotnet new console``](/dotnet/core/tools/dotnet-new) to create a new console app.
+The client library is available through NuGet, as the `Microsoft.Azure.Cosmos` package.
 
-```console
-dotnet new console -o <app-name>
-```
+1. Open a terminal and navigate to the `/src/web` folder.
 
-### Install the NuGet package
+    ```bash
+    cd ./src/web
+    ```
 
-Add the [MongoDB.Driver](https://www.nuget.org/packages/MongoDB.Driver) NuGet package to the new .NET project. Use the [``dotnet add package``](/dotnet/core/tools/dotnet-add-package) command specifying the name of the NuGet package.
+1. If not already installed, install the `MongoDb.Driver` package using `dotnet add package`.
 
-```console
-dotnet add package MongoDb.Driver
-```
+    ```bash
+    dotnet add package MongoDb.Driver
+    ```
 
-### Configure environment variables
+1. Also, install the `Azure.Identity` package if not already installed.
 
-[!INCLUDE [Multi-tab](./includes/environment-variables-connection-string.md)]
+    ```bash
+    dotnet add package Azure.Identity
+    ```
 
 ## Object model
 
@@ -199,7 +166,7 @@ Sand Surfboard
 
 ## Clean up resources
 
-When you no longer need the Azure Cosmos DB for NoSQL account, you can delete the corresponding resource group.
+When you no longer need the Azure Cosmos DB for MongoDB account, you can delete the corresponding resource group.
 
 ### [Azure CLI / Resource Manager template](#tab/azure-cli)
 
diff --git a/articles/cosmos-db/nosql/includes/quickstart/dev-setup.md b/articles/cosmos-db/nosql/includes/quickstart/dev-setup.md
@@ -37,9 +37,9 @@ zone_pivot_groups: azure-cosmos-db-quickstart-env
 1. During initialization, configure a unique environment name.
 
     > [!TIP]
-    > The environment name will also be used as the target resource group name. For this quickstart, consider using `msdocs-cosmos-db-nosql`.
+    > The environment name will also be used as the target resource group name. For this quickstart, consider using `msdocs-cosmos-db-`.
 
-1. Deploy the Azure Cosmos DB for NoSQL account using `azd up`. The Bicep templates also deploy a sample web application.
+1. Deploy the Azure Cosmos DB account using `azd up`. The Bicep templates also deploy a sample web application.
 
     ```azurecli
     azd up
diff --git a/articles/hdinsight/domain-joined/apache-domain-joined-architecture.md b/articles/hdinsight/domain-joined/apache-domain-joined-architecture.md
@@ -57,7 +57,7 @@ If you're using federation with Active Directory Federation Services (AD FS), yo
 
 Using on-premises Active Directory or Active Directory on IaaS VMs alone, without Microsoft Entra ID and Microsoft Entra Domain Services, isn't a supported configuration for HDInsight clusters with ESP.
 
-[!INCLUDE [Azure AD PowerShell deprecation note](~/articles/reusable-content/msgraph-powershell/includes/aad-powershell-deprecation-note.md)]
+[!INCLUDE [Azure AD PowerShell deprecation note](~/reusable-content/msgraph-powershell/includes/aad-powershell-deprecation-note.md)]
 
 If federation is being used and password hashes are synced correctly, but you're getting authentication failures, check if cloud password authentication is enabled for the PowerShell service principal. If not, you must set a [Home Realm Discovery (HRD) policy](../../active-directory/manage-apps/configure-authentication-for-federated-users-portal.md) for your Microsoft Entra tenant. To check and set the HRD policy:
 
