Merge pull request #10685 from MicrosoftDocs/main638790324635029467sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

docker/tutorials/tutorial-multi-container-app-mysql.md

@@ -89,11 +89,11 @@ In this example, you create the network and attach the MySQL container at startu
        --network todo-app --network-alias mysql 
        -v todo-mysql-data:/var/lib/mysql 
        -e MYSQL_ROOT_PASSWORD=<your-password> 
-       -e MYSQL_DB=todos 
+       -e MYSQL_DATABASE=todos 
        mysql:5.7
    ```
 
-   This command also defines the `MYSQL_ROOT_PASSWORD` and `MYSQL_DB` environment variables. For more information, see [MySQL Docker Hub listing](https://hub.docker.com/_/mysql/).
+   This command also defines the `MYSQL_ROOT_PASSWORD` and `MYSQL_DATABASE` environment variables. For more information, see [MySQL Docker Hub listing](https://hub.docker.com/_/mysql/).
 
    > [!WARNING]
    > This tutorial illustrates password credentials to authenticate with a MySQL database, which is not the most secure method. Refer to the [MySQL documentation](https://dev.mysql.com/doc/) to learn about more secure methods of authentication.
@@ -146,7 +146,7 @@ The `todo` app supports setting certain environment variables to specify your My
 | `MYSQL_HOST` | `mysql` | The host name for the MySQL server. |
 | `MYSQL_USER` | `root` | The username to use for the connection. |
 | `MYSQL_PASSWORD` | `<your-password>` | The password to use for the connection. In this example, substitute your root password for the `<your-password>` placeholder. |
-| `MYSQL_DB` | `todos` | The name of the database to use after the connection is established. |
+| `MYSQL_DATABASE` | `todos` | The name of the database to use after the connection is established. |
 
 > [!WARNING]
 > Using environment variables to set connection settings is acceptable for development, but this practice isn't recommended for running applications in production. For more information, see [Why you shouldn't use environment variables for secret data](https://diogomonica.com/2017/03/27/why-you-shouldnt-use-env-variables-for-secret-data/).
@@ -166,7 +166,7 @@ In the following example, you start your app and connect your app container to y
      -e MYSQL_HOST=mysql 
      -e MYSQL_USER=root 
      -e MYSQL_PASSWORD=<your-password> 
-     -e MYSQL_DB=todos 
+     -e MYSQL_DATABASE=todos 
      node:20-alpine 
      sh -c "yarn install && yarn run dev"
    ```
@@ -255,7 +255,7 @@ In the following example, you configure a Docker Compose file for your multi-con
      -e MYSQL_HOST=mysql 
      -e MYSQL_USER=root 
      -e MYSQL_PASSWORD=<your-password> 
-     -e MYSQL_DB=todos 
+     -e MYSQL_DATABASE=todos 
      node:20-alpine 
      sh -c "yarn install && yarn run dev"
    ```
@@ -320,7 +320,7 @@ In the following example, you configure a Docker Compose file for your multi-con
          MYSQL_HOST: mysql
          MYSQL_USER: root
          MYSQL_PASSWORD: <your-password>
-         MYSQL_DB: todos
+         MYSQL_DATABASE: todos
    ```
 
    Remember to enter your MySQL root password for the `<your-password>` placeholder. 
@@ -361,7 +361,7 @@ In the following example, you configure a Docker Compose file for your multi-con
          - todo-mysql-data:/var/lib/mysql
        environment: 
          MYSQL_ROOT_PASSWORD: <your-password>
-         MYSQL_DB: todos
+         MYSQL_DATABASE: todos
    ```
 
    Remember to enter your MySQL root password for the `<your-password>` placeholder. 
@@ -394,15 +394,15 @@ In the following example, you configure a Docker Compose file for your multi-con
          MYSQL_HOST: mysql
          MYSQL_USER: root
          MYSQL_PASSWORD: <your-password>
-         MYSQL_DB: todos
+         MYSQL_DATABASE: todos
 
      mysql:
        image: mysql:5.7
        volumes:
          - todo-mysql-data:/var/lib/mysql
        environment: 
          MYSQL_ROOT_PASSWORD: <your-password>
-         MYSQL_DB: todos
+         MYSQL_DATABASE: todos
 
    volumes:
      todo-mysql-data:

docs/azure/azure-cosmosdb-add-connected-service.md

@@ -5,7 +5,7 @@ author: ghogen
 manager: mijacobs
 ms.subservice: azure-development
 ms.topic: conceptual
-ms.date: 02/15/2024
+ms.date: 03/20/2025
 ms.author: ghogen
 monikerRange: ">= vs-2019"
 ---
@@ -118,9 +118,12 @@ The connected service functionality adds all the needed references and connectio
 
 1. Enter a connection string name, and choose whether you want the connection string stored in a local secrets file, or in [Azure Key Vault](/azure/key-vault).
 
-   ![Screenshot showing "Specify connection string" screen.](./media/azure-cosmosdb-add-connected-service/connection-string.png)
+   ![Screenshot showing "Specify connection string" screen.](./media/azure-cosmosdb-add-connected-service/vs-2022/connection-string.png)
+
+   The connection string is added as a secret and made available in the app configuration. In ASP.NET Core apps, you can access this connection string by using the `Configuration` property on the `WebApplicationBuilder` object.
 
-   The connection string is added as a secret and made available in the app configuration. In ASP.NET Core apps, you can access this connection string by using the `Configuration` property on the `WebApplicationBuild` object.
+   > [!NOTE]
+   > With Visual Studio 2022 version 17.12 and later, this procedure uses [Microsoft Entra managed identity](/entra/identity/managed-identities-azure-resources/overview), a passwordless authentication method, to connect to the database. The warning on this screen means that you need to perform a manual step in the Azure CLI after completing this procedure in Visual Studio. See [Use data plane role-based access control with Azure Cosmos DB for NoSQL](/azure/cosmos-db/nosql/security/how-to-grant-data-plane-role-based-access?tabs=built-in-definition%2Ccsharp&pivots=azure-interface-cli#disable-local-auth).
 
 1. The **Summary of changes** screen shows all the modifications that will be made to your project if you complete the process. If the changes look OK, choose **Finish**.
 

docs/azure/media/azure-cosmosdb-add-connected-service/vs-2022/connection-string.png

@@ -130,6 +130,7 @@ Use double quotes around the values, as in the preceding example, and use the ba
 |com.microsoft.visualstudio.debuggee.noattach.program|The program launched when you use **Start without debugging** (**Ctrl**+**F5**) in an Azure functions project that runs in an [isolated process](/azure/azure-functions/dotnet-isolated-process-guide). Typically both **F5** and **Ctrl**+**F5** uses the same program, but if any project type like Azure Functions in an isolated process requires a different program than **F5**, then this will be used.|
 |com.microsoft.visualstudio.debuggee.noattach.arguments|The arguments passed to the program when you use **Start without debugging** (**Ctrl**+**F5**) in an Azure functions project that runs in an isolated process.|
 |com.microsoft.visual-studio.project-name|The name of the project, which helps Visual Studio find the project if the project is not in the same folder as the Dockerfile.|
+|com.microsoft.visualstudio.launch-url.path-query|The path and query used by the containers window when opening links in the ports tab.<br/><br/>Requires Visual Studio 17.13 or later.|
 :::moniker-end
 
 ### Customize the Docker build process

docs/containers/docker-compose-properties.md

@@ -65,7 +65,7 @@ Create the sample database by following these steps:
 
     Visual Studio creates the project and several files, including an empty Windows form named **Form1**.
 
-1. In Solution Explorer, add two Windows forms to your project so that it has a total of three forms, and give them the following names:
+1. In **Solution Explorer**, add two Windows forms to your project so that it has a total of three forms, and give them the following names:
 
    - **Navigation**
 
@@ -135,7 +135,7 @@ To find the connection string:
 
 To store the connection string in your project:
 
-1. In Solution Explorer, do one of the following steps, depending on your project type:
+1. In **Solution Explorer**, do one of the following steps, depending on your project type:
 
    - For a C# project, expand the **Properties** node under the project, and then open the **Settings.settings** file.
 
@@ -172,13 +172,13 @@ The Navigation form opens when you run the application and includes the followin
 
 For C# projects:
 
-1. In Solution Explorer, open **Program.cs**.
+1. In **Solution Explorer**, open **Program.cs**.
 
 1. Change the `Application.Run` line to: `Application.Run(new Navigation());`
 
 For Visual Basic projects:
 
-1. In Solution Explorer, right-click the project and choose **Properties**.
+1. In **Solution Explorer**, right-click the project and choose **Properties**.
 
 1. In the Project Designer, select the **Application** tab, and then select **Navigation** in the **Startup object** list.