Merging changes synced from https://github.com/MicrosoftDocs/visualstudio-docs-pr (branch live)

Author: fenxu

docs/debugger/includes/remote-debugger-install-web-deploy.md

@@ -16,7 +16,9 @@ translation.priority.ht:
 ---
 1. If you intend to deploy your applications with Web Deploy in Visual Studio, install the latest version of Web Deploy on the server.
 
-    To install Web Deploy, use the [Web Platform Installer (WebPI)](https://www.microsoft.com/web/downloads/platform.aspx). You find Web Deploy in the Applications tab. You can also obtain an installer directly from the [Microsoft Download Center](https://www.microsoft.com/search/result.aspx?q=webdeploy&form=dlc). 
+    To install Web Deploy, use the [Web Platform Installer (WebPI)](https://www.microsoft.com/web/downloads/platform.aspx). (To find the Web Platform Installer link from IIS, select **IIS** in the left pane of Server Manager. Right-click the server and select **Internet Information Services (IIS) Manager**.)
+
+    In the Web Platform Installer, you find Web Deploy in the Applications tab. You can also obtain an installer directly from the [Microsoft Download Center](https://www.microsoft.com/search/result.aspx?q=webdeploy&form=dlc). 
 
 2. Verify that Web Deploy is running correctly by opening  **Control Panel > System and Security > Administrative Tools > Services** and make sure that **Web Deployment Agent Service** is running (the service name is different in older versions).
 

docs/debugger/remote-debugging-aspnet-on-a-remote-iis-7-5-computer.md

@@ -46,6 +46,7 @@ Depending on your security settings, it may save you time to add the following t
 - go.microsoft.com
 - download.microsoft.com
 - visualstudio.com
+- iis.net
 
 If you are using Internet Explorer, you can add the trusted sites by going to **Internet Options > Security > Trusted Sites > Sites**. These steps are different for other browsers. (If you need to download an older version of the remote debugger from my.visualstudio.com, some additional trusted sites are required to sign in.)
 
@@ -55,6 +56,8 @@ When you download the software, you may get requests to grant permission to load
 
 If you want more detailed information to install ASP.NET on IIS, see [IIS 8.0 Using ASP.NET 3.5 and ASP.NET 4.5](/iis/get-started/whats-new-in-iis-8/iis-80-using-aspnet-35-and-aspnet-45).
 
+1. In the left pane of Server Manager, select **IIS**. Right-click the server and select **Internet Information Services (IIS) Manager**.
+
 1. Use the Web Platform Installer (WebPI) to install ASP.NET 4.5 (from the Server node in Windows Server 2012 R2, choose **Get New Web Platform Components** and then search for ASP.NET)
 
     ![RemoteDBG_IIS_AspNet_45](../debugger/media/remotedbg_iis_aspnet_45.png "RemoteDBG_IIS_AspNet_45")
@@ -74,7 +77,7 @@ If you want more detailed information to install ASP.NET on IIS, see [IIS 8.0 Us
 
 1. Open Windows Explorer and create a new folder, **C:\Publish**, where you will later deploy the ASP.NET project.
 
-2. Open the **Internet Information Services (IIS) Manager**. (In the left pane of Server Manager, select **IIS**. Right-click the server and select **Internet Information Services (IIS) Manager**.)
+2. If it's not already open, open the **Internet Information Services (IIS) Manager**. (In the left pane of Server Manager, select **IIS**. Right-click the server and select **Internet Information Services (IIS) Manager**.)
 
 3. Under **Connections** in the left pane, go to **Sites**.
 

docs/debugger/remote-debugging-aspnet-on-a-remote-iis-computer.md

@@ -51,6 +51,7 @@ Depending on your security settings, it may save you time to add the following t
 - go.microsoft.com
 - download.microsoft.com
 - visualstudio.com
+- iis.net
 
 If you are using Internet Explorer, you can add the trusted sites by going to **Internet Options > Security > Trusted Sites > Sites**. These steps are different for other browsers. (If you need to download an older version of the remote debugger from my.visualstudio.com, some additional trusted sites are required to sign in.)
 
@@ -73,7 +74,7 @@ When you download the software, you may get requests to grant permission to load
 
 1. Open Windows Explorer and create a new folder, **C:\Publish**, where you will later deploy the ASP.NET project.
 
-2. Open the **Internet Information Services (IIS) Manager**. (In the left pane of Server Manager, select **IIS**. Right-click the server and select **Internet Information Services (IIS) Manager**.)
+2. If it's not already open, open the **Internet Information Services (IIS) Manager**. (In the left pane of Server Manager, select **IIS**. Right-click the server and select **Internet Information Services (IIS) Manager**.)
 
 3. Under **Connections** in the left pane, go to **Sites**.
 

docs/debugger/remote-debugging-azure.md

@@ -79,18 +79,19 @@ From Visual Studio, you can quickly publish and debug your app to a fully provis
 
 You can create an Azure VM for Windows Server and then install and configure IIS and the other required software components. This takes more time than deploying to an Azure App Service and requires that you follow the remaining steps in this tutorial.
 
-First, follow all the steps described in [Install and run IIS](/azure/virtual-machines/virtual-machines-windows-hero-role).
+First, follow all the steps described in [Install and run IIS](/azure/virtual-machines/windows/quick-create-portal).
 
 When you open port 80 in the Network security group, also open port 4022 for the Remote Debugger. That way, you won't have to open it later.
 
 ### Update browser security settings on Windows Server
 
-Depending on your browser security settings, it may save you time to add the following trusted sites to your browser so you can easily download the software described in this tutorial. Access to these sites may be needed:
+Depending on your browser security settings, it may save you time to add the following trusted sites to your browser so you can more quickly download the software described in this tutorial. Access to these sites may be needed:
 
 - microsoft.com
 - go.microsoft.com
 - download.microsoft.com
 - visualstudio.com
+- iis.net
 
 If you are using Internet Explorer, you can add the trusted sites by going to **Internet Options > Security > Trusted Sites > Sites**. These steps are different for other browsers. (If you need to download an older version of the remote debugger from my.visualstudio.com, some additional trusted sites are required to sign in.)
 
@@ -109,7 +110,7 @@ When you download the software, you may get requests to grant permission to load
 
 [!INCLUDE [remote-debugger-install-web-deploy](../debugger/includes/remote-debugger-install-web-deploy.md)]
 
-### <a name="BKMK_deploy_asp_net"></a> Configure ASP.NET Web site on the Windows Server computer
+### <a name="BKMK_deploy_asp_net"></a> Configure the ASP.NET Web site on the Windows Server computer
 
 1. Open the **Internet Information Services (IIS) Manager** and go to **Sites**.
 

docs/deployment/TOC.md

@@ -14,6 +14,8 @@
 ### [Building ClickOnce Applications from the Command Line](building-clickonce-applications-from-the-command-line.md)
 ## ASP.NET
 ### [Publish an ASP.NET Core app to Azure](/aspnet/core/tutorials/publish-to-azure-webapp-using-vs)
+### [Import publish settings and deploy to Azure](tutorial-import-publish-settings-azure.md)
+### [Import publish settings and deploy to IIS](tutorial-import-publish-settings-iis.md)
 ### [Continuous deployment of ASP.NET Core to Azure with Git](/aspnet/core/publishing/azure-continuous-deployment)
 ### [Deploy ASP.NET to IIS](/iis/get-started/whats-new-in-iis-8/iis-80-using-aspnet-35-and-aspnet-45)
 ## Native

docs/deployment/creating-bootstrapper-packages.md

@@ -24,7 +24,7 @@ ms.workload:
   - "multiple"
 ---
 # Create bootstrapper packages
-The Setup program is a generic installer that can be configured to detect and install redistributable components such as Windows Installer (.msi) files and executable programs. The installer is also known as a bootstrapper. It is programmed through a set of XML manifests that specify the metadata to manage the installation of the component.  Each redistributable component, or prerequisite, is a bootstrapper package. A bootstrapper package is a group of directories and files that contain manifest files that describe how the prerequisite should be installed. 
+The Setup program is a generic installer that can be configured to detect and install redistributable components such as Windows Installer (.msi) files and executable programs. The installer is also known as a bootstrapper. It is programmed through a set of XML manifests that specify the metadata to manage the installation of the component.  Each redistributable component, or prerequisite, that appears in the **Prerequisites** dialog box for ClickOnce is a bootstrapper package. A bootstrapper package is a group of directories and files that contain manifest files that describe how the prerequisite should be installed. 
 
 The bootstrapper first detects whether any of the prerequisites are already installed. If prerequisites are not installed, first the bootstrapper shows the license agreements. Second, after the end-user accepts the license agreements, the installation begins for the prerequisites. Otherwise, if all the prerequisites are detected, the bootstrapper just starts the application installer.  
 

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

@@ -34,7 +34,7 @@ See the Tutorials for step-by-step instructions.
 
 ### Deploy to local folder
 
-- **ASP.NET**, **ASP.NET Core**, **Node.js**, **Python**, and **.NET Core**: Use the Publish tool to deploy to a local folder. The exact options available depend on your app type. In Solution Explorer, right-click your project and choose **Publish**, and then choose **Folder**. For more information, see [Deploy to a local folder](quickstart-deploy-to-local-folder.md).
+- **ASP.NET**, **ASP.NET Core**, **Node.js**, **Python**, and **.NET Core**: Use the Publish tool to deploy to a local folder. The exact options available depend on your app type. In Solution Explorer, right-click your project and choose **Publish**. (If you have previously configured any publishing profiles, you must then click **Create new profile**.) Next, choose **Folder**. For more information, see [Deploy to a local folder](quickstart-deploy-to-local-folder.md).
 
     ![Choose Publish](../deployment/media/quickstart-publish.png)
 
@@ -44,10 +44,12 @@ See the Tutorials for step-by-step instructions.
 
 - **ASP.NET**, **ASP.NET Core**, **Node.js**, **Python**, and **.NET Core**: You can use the Publish tool to deploy to a website using FTP or Web Deploy. For more information, see [Deploy to a web site](quickstart-deploy-to-a-web-site.md).
 
-    In Solution Explorer, right-click the project and choose **Publish**. In the Publish tool, choose the option you want and follow the configuration steps.
+    In Solution Explorer, right-click the project and choose **Publish**. (If you have previously configured any publishing profiles, you must then click **Create new profile**.) In the Publish tool, choose the option you want and follow the configuration steps.
 
     ![Choose IIS, FTP, etc.](../deployment/media/quickstart-publish-iis-ftp.png)
 
+    For information on importing a publish profile in Visual Studio, see [Import publish settings and deploy to IIS](../deployment/tutorial-import-publish-settings-iis.md).
+
     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). 
@@ -56,19 +58,17 @@ See the Tutorials for step-by-step instructions.
 
 ### Publish to Azure
 
-- **ASP.NET, ASP.NET Core, Python, Node.js, and .NET Core** web applications: You can use the Publish tool to quickly deploy apps to Azure App Service or to an Azure Virtual Machine. In Solution Explorer, right-click the project and choose **Publish**. In the Publish dialog box, choose either **Microsoft Azure App Service** or **Microsoft Azure Virtual Machines**, and then follow the configuration steps.
+- **ASP.NET, ASP.NET Core, Python, Node.js, and .NET Core** web applications: You can use the Publish tool to quickly deploy apps to Azure App Service or to an Azure Virtual Machine. In Solution Explorer, right-click the project and choose **Publish**. (If you have previously configured any publishing profiles, you must then click **Create new profile**.) In the Publish dialog box, choose either **Microsoft Azure App Service** or **Microsoft Azure Virtual Machines**, and then follow the configuration steps.
 
     ![Choose Azure App Service](../deployment/media/quickstart-publish-azure.png "Choose Azure App Service")
 
-    To publish to an Azure Virtual Machine, scroll right and select **Microsoft Azure Virtual Machines**.
+    For information on importing a publish profile from Azure App Service to Visual Studio, see [Import publish settings and deploy to Azure](../deployment/tutorial-import-publish-settings-azure.md).
 
     For a quick introduction, see [Publish to Azure](quickstart-deploy-to-azure.md). Also, see [Publish an ASP.NET Core app to Azure](/aspnet/core/tutorials/publish-to-azure-webapp-using-vs). For deployment using Git, see [Continuous deployment of ASP.NET Core to Azure with Git](/aspnet/core/publishing/azure-continuous-deployment).
 
     > [!NOTE]
     > If you do not already have an Azure account, you can [sign up here](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=doc&utm_campaign=visualstudio).
 
-- Other **Azure services**: See the specific [Azure service](/azure/#pivot=products) documentation for different deployment options that may be supported by Visual Studio.
-
 ### Publish to Microsoft Store
 
 From Visual Studio, you can create app packages for deployment to Microsoft Store.

docs/deployment/includes/install-web-deploy-with-hosting-server.md

@@ -0,0 +1,19 @@
+Web Deploy 3.6 for Hosting Servers provides additional configuration features that enable the creation of the publish settings file from the UI.
+
+1. If you have Web Deploy 3.6 already installed on Windows Server, uninstall it using **Control Panel** > **Programs** > **Uninstall a Program**.
+
+2. Next, install Web Deploy 3.6 for Hosting Servers on Windows Server.
+
+    To install Web Deploy for Hosting Servers, use the [Web Platform Installer (WebPI)](https://www.microsoft.com/web/downloads/platform.aspx). (To find the Web Platform Installer link from IIS, select **IIS** in the left pane of Server Manager. Right-click the server and select **Internet Information Services (IIS) Manager**.)
+
+    In the Web Platform Installer, you find **Web Deploy for Hosting Servers** in the Applications tab.
+
+3. On Windows Server, go to **Select server roles** > **Web Server (IIS)** > **Management Tools**, and then select the **IIS Management Scripts and Tools** role, click **Next**, and then install the role.
+
+    ![Install IIS Management Scripts and Tools](../../deployment/media/tutorial-iis-management-scripts-and-tools.png)
+
+    This role is required to enable the generation of the publish settings file.
+
+4. Verify that Web Deploy is running correctly by opening  **Control Panel > System and Security > Administrative Tools > Services** and make sure that **Web Deployment Agent Service** is running (the service name is different in older versions).
+
+    If the agent service is not running, start it. If it is not present at all, go to **Control Panel > Programs > Uninstall a program**, find **Microsoft Web Deploy <version>**. Choose to **Change** the installation and make sure that you choose  **Will be installed to the local hard drive** for the Web Deploy components. Complete the change installation steps.

docs/deployment/media/quickstart-publish-azure.png

@@ -19,13 +19,19 @@ You can use the **Publish** tool to publish ASP.NET apps to a website.
 
 These steps apply to ASP.NET, ASP.NET Core, .NET Core, and Python apps in Visual Studio. For Node.js, the steps are supported but the user interface is different.
 
+## 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.
+
+    If you haven't already installed Visual Studio, install it for free [here](http://www.visualstudio.com).
+
 ## Create a new project 
 
 1. In 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. Choose **MVC**, make sure that **No Authentication** is selected, and then click **OK**.
+1. Choose **MVC** (or choose **Web Application (Model-View-Controller)** for .NET Core), make sure that **No Authentication** is selected, and then click **OK**.
 
 1. Type a name like **MyWebApp** and click **OK**.
 
@@ -39,7 +45,9 @@ These steps apply to ASP.NET, ASP.NET Core, .NET Core, and Python apps in Visual
 
     ![Choose Publish](../deployment/media/quickstart-publish-aspnet.png "Choose Publish")
 
-1. In the **Publish** pane, choose **IIS, FTP, etc**.
+1. If you have previously configured any publishing profiles, the **Publish** pane appears. Click **Create new profile**.
+
+1. In the **Pick a publish target** dialog box, choose **IIS, FTP, etc**.
 
     ![Choose IIS, FTP, etc.](../deployment/media/quickstart-publish-iis-ftp.png "Choose IIS, FTP, etc.")
 
@@ -51,7 +59,7 @@ These steps apply to ASP.NET, ASP.NET Core, .NET Core, and Python apps in Visual
 
 1. In the **Publish method** field, choose a method such as **Web Deploy** or **FTP**.
 
-    The settings that you see next correspond to your publishing method.
+    The settings that you see next correspond to your publishing method. Web Deploy simplifies deployment of Web applications and Web sites to IIS servers, and must be installed as an application on the server. Use the [Web Platform Installer](https://www.microsoft.com/web/downloads/platform.aspx) to install it.
 
 1. Configure required settings for the publish method and click **Validate Connection**.
 
@@ -69,4 +77,7 @@ These steps apply to ASP.NET, ASP.NET Core, .NET Core, and Python apps in Visual
 
 ## Next steps
 
-- [Deploy ASP.NET to IIS](/iis/get-started/whats-new-in-iis-8/iis-80-using-aspnet-35-and-aspnet-45)
+In this quickstart, you learned how to use Visual Studio to create a publishing profile. You can also configure a publishing profile by importing publish settings.
+
+> [!div class="nextstepaction"]
+> [Import publish settings and deploy to IIS](tutorial-import-publish-settings-iis.md)