Merge pull request #3083 from MicrosoftDocs/master636909473904461626

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

Author: gewarren

.openpublishing.redirection.json

@@ -7339,6 +7339,36 @@
             "source_path": "subscriptions/vscloud-renewals.md",
             "redirect_url": "/visualstudio/subscriptions/vscloud-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "docs/containers/docker-tools.md",
+            "redirect_url": "/visualstudio/containers/container-tools",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/containers/visual-studio-tools-for-docker.md",
+            "redirect_url": "/visualstudio/containers/overview",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/containers/vs-azure-tools-docker-edit-and-refresh.md",
+            "redirect_url": "/visualstudio/containers/edit-and-refresh",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/containers/vs-azure-tools-docker-hosting-web-apps-in-docker.md",
+            "redirect_url": "/visualstudio/containers/hosting-web-apps-in-docker",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/containers/docker-deploy-app-service.md",
+            "redirect_url": "/visualstudio/containers/deploy-app-service",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "docs/containers/vs-azure-tools-docker-troubleshooting-docker-errors.md",
+            "redirect_url": "/visualstudio/containers/troubleshooting-docker-errors",
+            "redirect_document_id": true
         }
     ]
 }

docs/containers/container-tools-configure.md

@@ -0,0 +1,68 @@
+---
+title: Configure Visual Studio Container Tools
+description: Configure the tools available in Visual Studio for working with Docker containers.
+author: ghogen
+ms.author: ghogen
+ms.topic: conceptual
+ms.date: 03/20/2019
+ms.technology: vs-azure
+---
+# How to configure Visual Studio Container Tools
+
+Using Visual Studio settings, you can control some aspects of how Visual Studio works with Docker containers, including settings that affect performance and resource usage when working with Docker containers.
+
+## Container Tools settings
+
+From the main menu, choose **Tools > Options**, and expand **Container Tools > Settings**. The container tools settings appear.
+
+::: moniker range="vs-2017"
+
+![Visual Studio Container Tools options, showing: Automatically pull required Docker images on project load, Automatically start containers in background, Automatically kill containers on solution close, and Do not prompt for trusting SSL certificate.](./media/overview/visual-studio-docker-tools-options.png)
+::: moniker-end
+
+::: moniker range=">=vs-2019"
+
+Container Tools **General** settings:
+
+![Visual Studio Container Tools options, showing: Install Docker Desktop if needed, and Trust ASP.NET Core SSL certificate.](./media/configure-container-tools/tools-options-1.png)
+
+Container Tools **Single Project** and **Docker Compose** settings:
+
+![Visual Studio Container Tools options, showing: Kill containers on project close, Pull required Docker images on project open, and Run containers on project open.](./media/configure-container-tools/tools-options-2.png)
+::: moniker-end
+
+The following table might help you decide how to set these options.
+
+::: moniker range="vs-2017"
+| Name | Default Setting | Applies To | Description |
+| -----|:---------------:|:----------:| ----------- |
+| Automatically pull required Docker images on project load | On | Docker Compose | For increased performance when loading projects, Visual Studio will start a Docker pull operation in the background so that when you're ready to run your code, the image is already downloaded or in the process of downloading. If you're just loading projects and browsing code, you can turn this off to avoid downloading container images you don't need. |
+| Automatically start containers in background | On | Docker Compose | Again for increased performance, Visual Studio creates a container with volume mounts ready for when you build and run your container. If you want to control when your container is created, turn this off. |
+| Automatically kill containers on solution close | On | Docker Compose | Turn this off if you would like containers for your solution to continue to run after closing the solution or closing Visual Studio. |
+| Do not prompt for trusting localhost SSL certificate | Off | ASP.NET Core 2.1 projects | If the localhost SSL certificate is not trusted, Visual Studio will prompt every time you run your project, unless this checkbox is checked. |
+::: moniker-end
+
+::: moniker range=">=vs-2019"
+
+The following table describes **General** settings:
+
+| Name | Default Setting | Applies To | Description |
+| -----|:---------------:|:----------:| ----------- |
+| Install Docker Desktop if needed | Prompt Me | Single Project, Docker Compose | Choose whether you want to be prompted if Docker Desktop is not installed. |
+| Trust ASP.NET Core SSL certificate | Prompt Me | ASP.NET Core 2.x projects | When set to **Prompt Me**, if the localhost SSL certificate is not trusted, Visual Studio will prompt every time you run your project. |
+
+The following table describes **Single Project** and **Docker Compose** settings:
+
+| Name | Default Setting | Applies To | Description |
+| -----|:---------------:|:----------:| ----------- |
+| Pull required Docker images on project open | True | Single Project, Docker Compose | For increased performance when loading projects, Visual Studio will start a Docker pull operation in the background so that when you're ready to run your code, the image is already downloaded or in the process of downloading. If you're just loading projects and browsing code, you can set to **False** to avoid downloading container images you don't need. |
+| Run containers on project open | True | Single Project, Docker Compose | Again for increased performance, Visual Studio creates a container with volume mounts ready for when you build and run your container. If you want to control when your container is created, set to **False**. |
+| Kill containers on project close | True | Single Project and Docker Compose | Set to **False** if you would like containers for your solution to continue to run after closing the solution or closing Visual Studio. |
+
+::: moniker-end
+> [!WARNING]
+> If the localhost SSL certificate is not trusted, and you check the box to suppress prompting, then HTTPS web requests might fail at runtime in your app or service. In that case, uncheck the **Do not prompt** checkbox, run your project, and indicate trust at the prompt.
+
+## Next steps
+
+Read more about working with containers in Visual Studio in this [overview](visual-studio-tools-for-docker.md).

docs/containers/container-tools.md

@@ -0,0 +1,30 @@
+---
+title: Visual Studio Container Tools with ASP.NET Core
+author: ghogen
+description: Learn how to use Visual Studio Container Tools and Docker for Windows
+ms.author: ghogen
+ms.date: 02/01/2019
+ms.technology: vs-azure
+ms.topic: include
+---
+# Quickstart: Docker in Visual Studio
+
+::: moniker range="vs-2017"
+
+[!include[Visual Studio Container Tools](includes/vs-2017/container-tools.md)]
+
+::: moniker-end
+
+::: moniker range=">= vs-2019"
+
+[!include[Visual Studio Container Tools](includes/vs-2019/container-tools.md)]
+
+::: moniker-end
+
+## Additional resources
+
+* [Container development with Visual Studio](/visualstudio/containers)
+* [Troubleshoot Visual Studio 2017 development with Docker](troubleshooting-docker-errors.md)
+* [Visual Studio Container Tools GitHub repository](https://github.com/Microsoft/DockerTools)
+
+[0]:media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png

docs/containers/docker-deploy-app-service.md renamed to docs/containers/deploy-app-service.md

@@ -1,6 +1,6 @@
 ---
 title: Deploy an ASP.NET Core Docker container to Azure App Service | Microsoft Docs
-description: Learn how to use Visual Studio Tools for Docker to deploy an ASP.NET Core web app to Azure App Service
+description: Learn how to use Visual Studio Container Tools to deploy an ASP.NET Core web app to Azure App Service
 author: ghogen
 manager: jillfra
 ms.technology: vs-azure
@@ -56,21 +56,21 @@ The following steps guide you through creating a basic ASP.NET Core app that wil
 1. On the publish target dialog, choose **App Service Linux**.
 1. You can publish only to App Service, or you can publish to both App Service and Azure Container Registry (ACR). To publish the container in an Azure Container Registry (ACR), choose **Create new App Service for containers**, and click **Publish**.
 
-   ![Screenshot of publish dialog](media/docker-deploy-app-service/publish-app-service-linux.PNG)
+   ![Screenshot of publish dialog](media/deploy-app-service/publish-app-service-linux.PNG)
 
    To publish only to an Azure App Service without using Azure Container Registry, choose **Create new**, and click **Publish**.
 
 1. Check that you're signed in with the account that's associated with your Azure subscription, and choose a unique name, subscription, resource group, hosting plan, and container registry (if applicable), or accept the defaults.
 
-   ![Screenshot of publish settings](media/docker-deploy-app-service/publish-app-service-linux2.png)
+   ![Screenshot of publish settings](media/deploy-app-service/publish-app-service-linux2.png)
 
 1. Choose **Create**. Your container is deployed to Azure in the resource group and container registry you selected. This process takes a bit of time. When it's completed, the **Publish** tab shows information about what was published, including the site URL.
 
-   ![Screenshot of publish tab](media/docker-deploy-app-service/publish-succeeded.PNG)
+   ![Screenshot of publish tab](media/deploy-app-service/publish-succeeded.PNG)
 
 1. Click on the site link to verify your app works as expected in Azure.
 
-   ![Screenshot of web application](media/docker-deploy-app-service/web-application-running.png)
+   ![Screenshot of web application](media/deploy-app-service/web-application-running.png)
 
 1. The publishing profile is saved with all the details you selected, such as the resource group and container registry.
 1. To deploy again with the same publishing profile, use the **Publish** button, the **Publish** button on the **Web Publish Activity** window, or right-click on the project in **Solution Explorer** and choose the **Publish** item on the context-menu.

docs/containers/docker-tools.md

@@ -91,7 +91,7 @@ Often, changes will need further inspection, leveraging the debugging features o
 4. Hit F5 to start debugging and hit the breakpoint.
 5. Switch to Visual Studio to view the breakpoint, inspect values, and so on.
 
-   ![Breakpoint](media/vs-azure-tools-docker-edit-and-refresh/breakpoint.png)
+   ![Breakpoint](media/edit-and-refresh/breakpoint.png)
 
 ## Summary
 
@@ -100,7 +100,7 @@ with the production realism of developing within a Docker container.
 
 ## Troubleshooting
 
-[Troubleshooting Visual Studio Docker Development](vs-azure-tools-docker-troubleshooting-docker-errors.md)
+[Troubleshooting Visual Studio Docker Development](troubleshooting-docker-errors.md)
 
 ## More about Docker with Visual Studio, Windows, and Azure
 

docs/containers/vs-azure-tools-docker-edit-and-refresh.md renamed to docs/containers/edit-and-refresh.md

@@ -1,6 +1,6 @@
 ---
 title: Deploy an ASP.NET Docker container to Azure Container Registry (ACR) | Microsoft Docs
-description: Learn how to use Visual Studio Tools for Docker to deploy an ASP.NET Core web app to a container registry
+description: Learn how to use Visual Studio Container Tools to deploy an ASP.NET Core web app to a container registry
 author: ghogen
 manager: jillfra
 ms.assetid: e5e81c5e-dd18-4d5a-a24d-a932036e78b9
@@ -55,7 +55,7 @@ The following steps guide you through creating a basic ASP.NET Core app that wil
     | **[SKU](https://docs.microsoft.com/azure/container-registry/container-registry-skus)** | Standard | Service tier of the container registry  |
     | **Registry Location** | A location close to you | Choose a Location in a [region](https://azure.microsoft.com/regions/) near you or near other services that will use your container registry. |
 
-    ![Visual Studio's create Azure Container Registry dialog](media/vs-azure-tools-docker-hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png)
+    ![Visual Studio's create Azure Container Registry dialog](media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png)
 
 5. Click **Create**
 

docs/containers/vs-azure-tools-docker-hosting-web-apps-in-docker.md renamed to docs/containers/hosting-web-apps-in-docker.md

@@ -1,5 +1,5 @@
 ---
-title: Visual Studio Tools for Docker with ASP.NET Core
+title: Visual Studio Container Tools with ASP.NET Core
 author: ghogen
 description: Learn how to use Visual Studio 2017 tooling and Docker for Windows
 ms.author: ghogen
@@ -14,7 +14,7 @@ With Visual Studio, you can easily build, debug, and run containerized ASP.NET C
 
 * [Docker Desktop](https://hub.docker.com/editions/community/docker-ce-desktop-windows)
 * [Visual Studio 2017](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2017) with the **Web Development**, **Azure Tools** workload, and/or **.NET Core cross-platform development** workload installed
-* To publish to Azure Container Registry, an Azure subscription. [Sign up for a free trial](https://azure.microsoft.com/en-us/offers/ms-azr-0044p/).
+* To publish to Azure Container Registry, an Azure subscription. [Sign up for a free trial](https://azure.microsoft.com/offers/ms-azr-0044p/).
 
 ## Installation and setup
 
@@ -29,7 +29,7 @@ For Docker installation, first review the information at [Docker Desktop for Win
 1. Select **Web Application**.
 1. Check the **Enable Docker Support** checkbox.
 
-   ![Enable Docker Support check box](../../media/docker-tools/enable-docker-support.PNG)
+   ![Enable Docker Support check box](../../media/container-tools/enable-docker-support.PNG)
 
 1. Select the type of container you want (Windows or Linux) and click **OK**.
 
@@ -116,10 +116,4 @@ Once the develop and debug cycle of the app is completed, you can create a produ
 
 You can now pull the container from the registry to any host capable of running Docker images, for example [Azure Container Instances](/azure/container-instances/container-instances-tutorial-deploy-app).
 
-## Additional resources
-
-* [Container development with Visual Studio](/visualstudio/containers)
-* [Troubleshoot Visual Studio 2017 development with Docker](../../vs-azure-tools-docker-troubleshooting-docker-errors.md)
-* [Visual Studio Tools for Docker GitHub repository](https://github.com/Microsoft/DockerTools)
-
-[0]:../../media/vs-azure-tools-docker-hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png
+[0]:../../media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog.png

docs/containers/includes/vs-2017/docker-tools.md renamed to docs/containers/includes/vs-2017/container-tools.md

@@ -16,7 +16,7 @@ With Visual Studio, you can easily build, debug, and run containerized ASP.NET C
 * [Docker Desktop](https://hub.docker.com/editions/community/docker-ce-desktop-windows)
 * [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=inline+link&utm_content=download+vs2019) with the **Web Development**, **Azure Tools** workload, and/or **.NET Core cross-platform development** workload installed
 * [.NET Core 2.2 Development Tools](https://dotnet.microsoft.com/download/dotnet-core/2.2) for development with .NET Core 2.2
-* To publish to Azure Container Registry, an Azure subscription. [Sign up for a free trial](https://azure.microsoft.com/en-us/offers/ms-azr-0044p/).
+* To publish to Azure Container Registry, an Azure subscription. [Sign up for a free trial](https://azure.microsoft.com/offers/ms-azr-0044p/).
 
 ## Installation and setup
 
@@ -27,7 +27,7 @@ For Docker installation, first review the information at [Docker Desktop for Win
 1. Create a new project using the **ASP.NET Core Web Application** template.
 1. Select **Web Application**, and make sure the **Enable Docker Support** checkbox is selected.
 
-   ![Enable Docker Support check box](../../media/docker-tools/vs-2019/create-new-web-application.PNG)
+   ![Enable Docker Support check box](../../media/container-tools/vs-2019/create-new-web-application.PNG)
 
 1. Select the type of container you want (Windows or Linux) and click **Create**.
 
@@ -110,16 +110,10 @@ Once the develop and debug cycle of the app is completed, you can create a produ
 
 1. Click **Create**
 
-   ![Screenshot showing successful publish](../../media/docker-tools/publish-succeeded.png)
+   ![Screenshot showing successful publish](../../media/container-tools/publish-succeeded.png)
 
 ## Next Steps
 
 You can now pull the container from the registry to any host capable of running Docker images, for example [Azure Container Instances](/azure/container-instances/container-instances-tutorial-deploy-app).
 
-## Additional resources
-
-* [Container development with Visual Studio](/visualstudio/containers)
-* [Troubleshoot Visual Studio 2017 development with Docker](../../vs-azure-tools-docker-troubleshooting-docker-errors.md)
-* [Visual Studio Tools for Docker GitHub repository](https://github.com/Microsoft/DockerTools)
-
-[0]:../../media/vs-azure-tools-docker-hosting-web-apps-in-docker/vs-acr-provisioning-dialog-2019.png
+[0]:../../media/hosting-web-apps-in-docker/vs-acr-provisioning-dialog-2019.png

docs/containers/includes/vs-2019/docker-tools.md renamed to docs/containers/includes/vs-2019/container-tools.md

@@ -21,7 +21,7 @@ sections:
     className: cardsM
     columns: 3
     items:
-    - href: docker-tools.md
+    - href: container-tools.md
       html: <p></p>
       image:
         src: https://docs.microsoft.com/media/logos/logo_docker.svg
@@ -67,7 +67,7 @@ sections:
       html: <p></p>
       image:
         src: https://docs.microsoft.com/media/common/i_web.svg
-      title: ASP.NET Docker Tools
+      title: ASP.NET Container Tools
     - href: https://docs.microsoft.com/azure/vs-azure-tools-docker-hosting-web-apps-in-docker
       html: <p></p>
       image: