Merge pull request #3804 from MicrosoftDocs/master

2/1/2019 AM Publish

Author: gewarren

.openpublishing.publish.config.json

@@ -110,5 +110,7 @@
      }
     },
   "need_generate_pdf": false,
-  "need_generate_intellisense": false
+  "need_generate_intellisense": false,
+  "enable_branch_build_custom_validation": true,
+  "enable_pull_request_custom_validation": true
 }

README.md

@@ -1,6 +1,6 @@
-# Visual Studio 2017 documentation
+# Visual Studio documentation
 
-Welcome! This repo contains source files for the Visual Studio 2017 technical documentation. The topics are published on [docs.microsoft.com](https://docs.microsoft.com/visualstudio).
+Welcome! This repo contains source files for the Visual Studio technical documentation. The topics are published on [docs.microsoft.com](https://docs.microsoft.com/visualstudio).
 
 This repo was moved on June 23, 2017 from https://github.com/Microsoft/vsdocs. Traffic to the old URLs is redirected here.
 

docs/azure/index.yml

@@ -13,7 +13,7 @@ metadata:
   ms.author: ghogen
   ms.custom: seodec18
 sections:
-- title: Publish to Azure
+- title: Deploy to Azure App Service
   items:
   - type: paragraph
     text: 'Deploy your app to Azure to staging or production environments with Visual Studio, or set up continuous integration and deployment (CI/CD).'
@@ -26,17 +26,12 @@ sections:
       html: <p></p>
       image:
         src: https://docs.microsoft.com/media/logos/logo_NETcore.svg
-      title: Publish an ASP.NET Core app to Azure
+      title: Deploy an ASP.NET Core app to Azure
     - href: https://docs.microsoft.com/azure/app-service/app-service-web-get-started-dotnet-framework
       html: <p></p>
       image:
         src: https://docs.microsoft.com/media/logos/logo_NET.svg
-      title: Publish an ASP.NET Web App to Azure
-    - href: https://docs.microsoft.com/azure/azure-functions/functions-create-your-first-function-visual-studio
-      html: <p></p>
-      image:
-        src: https://docs.microsoft.com/azure/media/index/AzureFunctions.svg
-      title: Publish Azure Functions
+      title: Deploy an ASP.NET Web App to Azure
     - href: /aspnet/core/host-and-deploy/azure-apps/azure-continuous-deployment?view=aspnetcore-2.1
       html: <p></p>
       image:
@@ -51,8 +46,8 @@ sections:
       html: <p></p>
       image:
         src: https://docs.microsoft.com/media/common/i_vmm-cloud.svg
-      title: Publish an ASP.NET Web App to an Azure VM
-- title: Azure App Services and Azure Functions
+      title: Deploy an ASP.NET Web App to an Azure VM
+- title: Azure App Services, Logic Apps, and Azure Functions
   items:
   - type: paragraph
     text: 'Tutorials for creating web apps and serverless functions hosted in Azure'
@@ -66,7 +61,12 @@ sections:
       image:
         src: https://docs.microsoft.com/azure/media/index/AppService.svg
       title: ASP.NET Core
-    - href: /azure/azure-functions/functions-develop-vs
+    - href: /azure/logic-apps/quickstart-create-logic-apps-with-visual-studio
+      html: <p>Build automated, scalable workflows with Azure Logic Apps.</p>
+      image:
+        src: https://docs.microsoft.com/azure/media/index/LogicApp.svg
+      title: Azure Logic Apps
+    - href: /azure/azure-functions/functions-create-your-first-function-visual-studio
       html: <p>Process events with serverless code</p>
       image:
         src: https://docs.microsoft.com/azure/media/index/AzureFunctions.svg
@@ -89,8 +89,8 @@ sections:
       href: /visualstudio/containers
     - image:
         src: https://docs.microsoft.com/media/logos/logo_docker.svg
-      text: Docker Tools in Visual Studio
-      href: /visualstudio/docker/vs-azure-tools-docker-setup
+      text: Container Tools in Visual Studio
+      href: /visualstudio/docker/docker-tools
     - image:
         src: https://docs.microsoft.com/media/logos/logo_kubernetes.svg
       text: Kubernetes Tools
@@ -172,10 +172,10 @@ sections:
         src: https://docs.microsoft.com//media/common/i_code-performance.svg
       title: Analyze performance
     - href: vs-azure-tools-publishing-a-cloud-service.md
-      html: <p>Publish a cloud service to Azure</p>
+      html: <p>Deploy a cloud service to Azure</p>
       image:
         src: https://docs.microsoft.com//media/common/i_deploy.svg
-      title: Publish
+      title: Deploy
     - href: vs-azure-tools-diagnostics-for-cloud-services-and-virtual-machines.md
       html: <p>Monitor and diagnose cloud services and virtual machines running in Azure</p>
       image:

docs/azure/toc.yml

@@ -1,20 +1,18 @@
 - name: Azure Development with Visual Studio
   href: index.yml
   expanded: true
-- name: Publish to Azure
+- name: Deploy to Azure App Service
   expanded: true
   items:
-  - name: Publish an ASP.NET Core app to Azure 
+  - name: Deploy an ASP.NET Core app to Azure 
     href: /aspnet/core/tutorials/publish-to-azure-webapp-using-vs?view=aspnetcore-2.1
-  - name: Publish a .NET TODO List Web App to Azure
+  - name: Deploy a .NET TODO List Web App to Azure
     href: /dotnet/azure/dotnet-quickstart-vs?view=azure-dotnet
-  - name: Publish Azure Functions
-    href: /azure/azure-functions/functions-develop-vs?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
   - name: Continuous deployment to Azure with Visual Studio and Git with ASP.NET Core 
     href: /aspnet/core/host-and-deploy/azure-apps/azure-continuous-deployment?view=aspnetcore-2.1
   - name: Continuous deployment to Azure with Azure Pipelines
     href: /azure/devops/pipelines/get-started-yaml?view=vsts
-  - name: Publish an ASP.NET Web App to an Azure VM
+  - name: Deploy an ASP.NET Web App to an Azure VM
     href: /azure/virtual-machines/windows/publish-web-app-from-visual-studio?toc=/visualstudio/azure/toc.json&bc=/visualstudio/azure/breadcrumb/toc.json
 - name: Connect to Azure services
   expanded: false
@@ -77,19 +75,19 @@
       href: vs-azure-tools-performance-profiling-cloud-services.md
     - name: Optimize your Azure code
       href: vs-azure-tools-optimizing-azure-code-in-visual-studio.md
-  - name: Publish a cloud service to Azure
+  - name: Deploy a cloud service to Azure
     items:
-    - name: Migrate and Publish a Web Application to an Azure Cloud Service
+    - name: Migrate and Deploy a Web Application to an Azure Cloud Service
       href: vs-azure-tools-migrate-publish-web-app-to-cloud-service.md
-    - name: Use the Visual Studio Publish Azure Application Wizard
+    - name: Use the Visual Studio Deploy Azure Application Wizard
       href: vs-azure-tools-publish-azure-application-wizard.md
-    - name: Publish a cloud service using Visual Studio
+    - name: Deploy a cloud service using Visual Studio
       href: vs-azure-tools-publishing-a-cloud-service.md
     - name: Use Windows PowerShell scripts to publish to dev and test environments
       href: vs-azure-tools-publishing-using-powershell-scripts.md
-    - name: Publish-WebApplicationVM (Windows PowerShell script)
+    - name: Deploy-WebApplicationVM (Windows PowerShell script)
       href: vs-azure-tools-publish-webapplicationvm.md
-    - name: Publish-WebApplicationWebSite (Windows PowerShell script)
+    - name: Deploy-WebApplicationWebSite (Windows PowerShell script)
       href: vs-azure-tools-publish-webapplicationwebsite-windows-powershell-script.md
     - name: Manage service configurations and profiles
       href: vs-azure-tools-service-configurations-and-profiles-how-to-manage.md

docs/deployment/deploying-applications-services-and-components.md

@@ -39,7 +39,7 @@ Deployment to a local folder is typically used for testing, or to begin a staged
 
     ![Choose Publish](../deployment/media/quickstart-publish.png)
 
-- **Visual C++ runtime**: You can deploy the Visual C++ runtime using local deployment or static linking. For more information, see [Deploying Native Desktop Applications (Visual C++)](/cpp/ide/deploying-native-desktop-applications-visual-cpp).
+- **Windows desktop** You can publish a Windows desktop application to a folder using ClickOnce deployment. Users can then install the application with a single click. For more information, see [Deploy a desktop app using ClickOnce](how-to-publish-a-clickonce-application-using-the-publish-wizard.md) (C# and Visual Basic). For C++/CLR, see [Deploy a native app using ClickOnce](/cpp/ide/clickonce-deployment-for-visual-cpp-applications) or, for C/C++, see [Deploy a native app using a Setup project](/cpp/ide/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project).
 
 ## Publish to Azure
 
@@ -78,9 +78,7 @@ Deployment to a local folder is typically used for testing, or to begin a staged
 
     You can also deploy ASP.NET applications and services in a number of other ways. For more information, see [Deploying ASP.NET web applications and services](http://www.asp.net/aspnet/overview/deployment).
 
-- **Visual C++ runtime**: You can deploy the Visual C++ runtime using central deployment. For more information, see [Deploying Native Desktop Applications (Visual C++)](/cpp/ide/deploying-native-desktop-applications-visual-cpp).
-
-- **Windows desktop** You can publish a Windows desktop application to a web server or a network file share using ClickOnce deployment. Users can then install the application with a single click. For more information, see [Deploy a desktop app using ClickOnce](how-to-publish-a-clickonce-application-using-the-publish-wizard.md) and [Deploy a native app using ClickOnce](/cpp/ide/clickonce-deployment-for-visual-cpp-applications).
+- **Windows desktop** You can publish a Windows desktop application to a web server or a network file share using ClickOnce deployment. Users can then install the application with a single click. For more information, see [Deploy a desktop app using ClickOnce](how-to-publish-a-clickonce-application-using-the-publish-wizard.md) (C# and Visual Basic). For C++/CLR, see [Deploy a native app using ClickOnce](/cpp/ide/clickonce-deployment-for-visual-cpp-applications) or, for C/C++, see [Deploy a native app using a Setup project](/cpp/ide/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project).
 
 ## Publish to Microsoft Store
 

docs/deployment/includes/quickstart-prereqs-azure.md

@@ -7,7 +7,7 @@
 * An Azure subscription. If you do not already have subscription, [sign up for free](https://azure.microsoft.com/free/dotnet/), which includes $200 in credit for 30 days and 12 months of popular free services.
 
 * An ASP.NET, ASP.NET Core, .NET Core, or Node.js project. If you don't already have a project, select an option below:
-  * ASP.NET: Follow [Quickstart: Use Visual Studio to create your first ASP.NET Core web app](../../ide/quickstart-aspnet-core.md), or use **File** > **New Project**, select **Visual C#** > **.NET Core**, then select **ASP.NET Core Web Application**. When prompted, select the **Web Application (Model-View-Controller)** template, make sure that **No Authentication** is selected, and then select **OK**.
+  * ASP.NET Core: Follow [Quickstart: Use Visual Studio to create your first ASP.NET Core web app](../../ide/quickstart-aspnet-core.md), or use **File** > **New Project**, select **Visual C#** > **.NET Core**, then select **ASP.NET Core Web Application**. When prompted, select the **Web Application (Model-View-Controller)** template, make sure that **No Authentication** is selected, and then select **OK**.
   * Node.js: Follow [Quickstart: Use Visual Studio to create your first Node.js app](../../ide/quickstart-nodejs.md), or use **File** > **New Project**, select **JavaScript**, then select **Blank Node.js Web Application**.
 
 * Make sure you build the project using the **Build > Build Solution** menu command before following the deployment steps.

docs/deployment/includes/quickstart-prereqs.md

@@ -5,8 +5,8 @@
   * Python: **Python development**
   * Node.js: **Node.js development**
 
-* An ASP.NET Core, .NET Core, Python, or Node.js project. If you don't already have a project, select an option below:
-  * ASP.NET: Follow [Quickstart: Use Visual Studio to create your first ASP.NET Core web app](../../ide/quickstart-aspnet-core.md), or use **File** > **New Project**, select **Visual C#** > **.NET Core**, then select **ASP.NET Core Web Application**. When prompted, select the **Web Application (Model-View-Controller)** template, make sure that **No Authentication** is selected, and then select **OK**.
+* An ASP.NET, ASP.NET Core, Python, or Node.js project. If you don't already have a project, select an option below:
+  * ASP.NET Core: Follow [Quickstart: Use Visual Studio to create your first ASP.NET Core web app](../../ide/quickstart-aspnet-core.md), or use **File** > **New Project**, select **Visual C#** > **.NET Core**, then select **ASP.NET Core Web Application**. When prompted, select the **Web Application (Model-View-Controller)** template, make sure that **No Authentication** is selected, and then select **OK**.
   * Python: Follow [Quickstart: Create your first Python web app using Visual Studio](../../ide/quickstart-python.md), or use **File** > **New Project**, select **Python**, then select **Flask Web Project**.
   * Node.js: Follow [Quickstart: Use Visual Studio to create your first Node.js app](../../ide/quickstart-nodejs.md), or use **File** > **New Project**, select **JavaScript**, then select **Blank Node.js Web Application**.
 

docs/deployment/index.md

@@ -248,15 +248,15 @@ Visual Studio provides several different tools to help you deploy your apps.
                         </div>
                     </div>
                     <div class="cardText">
-                        <h3>Deploy a desktop app using ClickOnce</h3>
+                        <h3>Deploy a desktop app using ClickOnce (C#)</h3>
                     </div>
                 </div>
             </div>
         </div>
         </a>
     </li>
     <li>
-        <a href="/cpp/ide/deployment-in-visual-cpp">
+        <a href="/cpp/ide/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project">
         <div class="cardSize">
             <div class="cardPadding">
                 <div class="card">
@@ -266,7 +266,25 @@ Visual Studio provides several different tools to help you deploy your apps.
                         </div>
                     </div>
                     <div class="cardText">
-                        <h3>Learn about deployment in Visual C++</h3>
+                        <h3>Deploy a C/C++ app</h3>
+                    </div>
+                </div>
+            </div>
+        </div>
+        </a>
+    </li>
+    <li>
+        <a href="/cpp/ide/clickonce-deployment-for-visual-cpp-applications">
+        <div class="cardSize">
+            <div class="cardPadding">
+                <div class="card">
+                    <div class="cardImageOuter">
+                        <div class="cardImage">
+                            <img src="https://docs.microsoft.com/media/logos/logo_Cplusplus.svg" alt="Learn about deployment in Visual C++">
+                        </div>
+                    </div>
+                    <div class="cardText">
+                        <h3>Deploy a C++/CLR app</h3>
                     </div>
                 </div>
             </div>

docs/deployment/quickstart-deploy-to-a-web-site.md

@@ -18,7 +18,7 @@ You can use the **Publish** tool to publish ASP.NET, ASP.NET Core, .NET Core, an
 [!INCLUDE [quickstart-prereqs](includes/quickstart-prereqs.md)]
 
 > [!NOTE]
-> If you need to publish a Windows desktop application to a network file share, see [Deploy a desktop app using ClickOnce](how-to-publish-a-clickonce-application-using-the-publish-wizard.md) (C# or Visual Basic) or [Deploy a native app using ClickOnce](/cpp/ide/clickonce-deployment-for-visual-cpp-applications) (C++).
+> If you need to publish a Windows desktop application to a network file share, see [Deploy a desktop app using ClickOnce](how-to-publish-a-clickonce-application-using-the-publish-wizard.md) (C# or Visual Basic). For C++/CLR, see [Deploy a native app using ClickOnce](/cpp/ide/clickonce-deployment-for-visual-cpp-applications) or, for C/C++, see [Deploy a native app using a Setup project](/cpp/ide/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project).
 
 ## Publish to a Web site
 

docs/deployment/quickstart-deploy-to-local-folder.md

@@ -18,7 +18,7 @@ You can use the **Publish** tool to publish ASP.NET, ASP.NET Core, .NET Core, an
 [!INCLUDE [quickstart-prereqs](includes/quickstart-prereqs.md)]
 
 > [!NOTE]
-> If you need to publish a Windows desktop application to a local folder, see [Deploy a desktop app using ClickOnce](how-to-publish-a-clickonce-application-using-the-publish-wizard.md) (C# or Visual Basic) or [Deploy a native app using ClickOnce](/cpp/ide/clickonce-deployment-for-visual-cpp-applications) (C++).
+> If you need to publish a Windows desktop application to a local folder, see [Deploy a desktop app using ClickOnce](how-to-publish-a-clickonce-application-using-the-publish-wizard.md) (C# or Visual Basic). For C++/CLR, see [Deploy a native app using ClickOnce](/cpp/ide/clickonce-deployment-for-visual-cpp-applications) or, for C/C++, see [Deploy a native app using a Setup project](/cpp/ide/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project).
 
 ## Deploy to a local folder
 

docs/deployment/toc.yml

@@ -42,11 +42,11 @@
       href: tutorial-kubernetes-tools.md
   - name: C++
     items:
-    - name: Deployment in Visual C++...
-      href: /cpp/ide/deployment-in-visual-cpp
+    - name: Deploy a C/C++ app
+      href: /cpp/ide/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project
     - name: Package a desktop app for Microsoft Store (Desktop Bridge)
       href: /windows/uwp/porting/desktop-to-uwp-packaging-dot-net
-    - name: Deploy a native app using ClickOnce...
+    - name: Deploy a C++/CLR app using ClickOnce...
       href: /cpp/ide/clickonce-deployment-for-visual-cpp-applications
   - name: UWP
     items:

docs/deployment/tutorial-import-publish-settings-azure.md

@@ -31,7 +31,7 @@ A publish settings file (*\*.publishsettings*) is different than a publishing pr
 
 ## Prerequisites
 
-* You must have Visual Studio 2017 installed and the **ASP.NET** and .**NET Framework** development workload. For a .NET Core app, you also need the .**NET Core** workload.
+* You must have Visual Studio 2017 installed and the **ASP.NET and web development** workload.
 
     If you haven't already installed Visual Studio, go to the [Visual Studio downloads](https://visualstudio.microsoft.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=button+cta&utm_content=download+vs2017) page to install it for free.
 
@@ -41,9 +41,9 @@ A publish settings file (*\*.publishsettings*) is different than a publishing pr
 
 1. On the computer running Visual Studio, choose **File** > **New Project**.
 
-1. Under **Visual C#** or **Visual Basic**, choose **Web**, and then in the middle pane choose either **ASP.NET Web Application (.NET Framework)** or (C# only) **ASP.NET Core Web Application**, and then click **OK**.
+1. Under **Visual C#** or **Visual Basic**, choose **Web**, and then in the middle pane choose either **ASP.NET Web Application (.NET Framework)** or (for C# only) **ASP.NET Core Web Application**, and then click **OK**.
 
-    If you don't see the specified project templates, click the **Open Visual Studio Installer** link in the left pane of the **New Project** dialog box. The Visual Studio Installer launches. See the prerequisites in this article to identify the required Visual Studio workloads, which you must install.
+    If you don't see the specified project templates, click the **Open Visual Studio Installer** link in the left pane of the **New Project** dialog box. The Visual Studio Installer launches. Install the **ASP.NET and web development** workload.
 
 1. Choose either **MVC** (.NET Framework) or **Web Application (Model-View-Controller)** (for .NET Core), and make sure that **No Authentication** is selected, and then click **OK**.