Merge pull request #2313 from kraigb/kraigb-azure-linkage

Update deployment quickstarts (generalize languages, reshoot graphics)

Author: ktoliver

.openpublishing.redirection.json

@@ -1090,6 +1090,10 @@
             "redirect_url": "/visualstudio/ide/customize-the-help-viewer",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/ide/not-in-toc/web-publish-options.md",
+            "redirect_url": "/visualstudio/deployment/deploying-applications-services-and-components-resources",   "redirect_document_id": false
+        },
         {
             "source_path": "docs/ide/optimize-solution-loading-in-visual-studio.md",
             "redirect_url": "/visualstudio/ide/optimize-visual-studio-startup-time/",

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

@@ -1,7 +1,7 @@
 ---
 title: "Deployment overview - Visual Studio | Microsoft Docs"
 ms.custom: ""
-ms.date: 07/14/2017
+ms.date: 06/22/2018
 ms.technology: vs-ide-deployment
 ms.topic: "overview"
 dev_langs: 
@@ -18,12 +18,103 @@ ms.workload:
 
 # Overview of deployment in Visual Studio
 
-By deploying an application, service, or component, you distribute it for installation on other computers, devices, servers, or in the cloud. You choose the appropriate method in Visual Studio for the type of deployment that you need. 
+By deploying an application, service, or component, you distribute it for installation on other computers, devices, servers, or in the cloud. You choose the appropriate method in Visual Studio for the type of deployment that you need.
 
-For many common app types, you can deploy your application right from Solution Explorer in Visual Studio.
+For many common app types, you can deploy your application right from Solution Explorer in Visual Studio. For a quick tour of this capability, see [First look at deployment](../deployment/deploying-applications-services-and-components.md).
 
-![Choose a publishing option](../deployment/media/quickstart-publish-iis-ftp.png)
+![Choose a publishing option](../deployment/media/quickstart-publish-azure.png)
+
+## What publishing options are right for me?
+
+From within Visual Studio, applications can be published directly to the following targets:
+
+- [Azure App Service](#azure-app-service)
+- [Azure Virtual Machines](#azure-virtual-machines)
+- [File system](#file-system)
+- [Custom targets (IIS, FTP, etc.)](#custom-targets), which includes all arbitrary web servers.
+
+On the **Publish** tab, you can select an existing publish profile, import an existing one, or create a new one using the options described here. For a tour of the publishing options in the IDE for different app types, see [First look at deployment](../deployment/deploying-applications-services-and-components.md).
+
+## Azure App Service
+
+[Azure App Service](/azure/app-service/app-service-web-overview) helps developers quickly create a variety of scalable web applications and services without maintaining infrastructure.
+
+You determine how much computing power an APp Service has by choosing a [pricing tier or plan](/azure/app-service/azure-web-sites-web-hosting-plans-in-depth-overview) for the containing App Service. You can have multiple Web apps (and other app types) share the same App Service without changing the pricing tier. For example, you can host development, staging, and production Web apps together on the same App Service.
+
+An App Service runs on cloud-hosted virtual machines in Azure, but those virtual machines are managed for you. Each app in an App Service will be assigned a unique \*.azurewebsites.net URL; all pricing tiers other than Free allow assigning custom domain names to the site.
+
+### When to choose Azure App Service
+
+- You want to deploy a web application that's accessible through the Internet.
+- You want to automatically scale your web application according to demand without needing to redeploy.
+- You don't want to maintain server infrastructure (including software updates).
+- You don't need any machine-level customizations on the servers that host your web application.
+
+> If you want to use Azure App Service in your own datacenter or other on-premises computers, you can do so using the [Azure Stack](https://azure.microsoft.com/overview/azure-stack/).
+
+For more information on publishing to App Service, see [Quickstart - Publish to Azure App Service](quickstart-deploy-to-azure.md).
+
+## Azure Virtual Machines
+
+[Azure Virtual Machines (VMs)](https://azure.microsoft.com/documentation/services/virtual-machines/) let you create and manage any number of computing resources in the cloud. By assuming responsibility for all software and updates on the VMs, you can customize them as much as desired as required by your application. You can access the virtual machines directly through Remote Desktop, and each one will maintain its assigned IP address as long as desired.
+
+Scaling an application that's hosted on virtual machines involves spinning up additional VMs according to demand and then deploying the necessary software. This additional level of control lets you scale differently in different global regions. For example, if your application is serving employees in a variety of regional offices, you can scale your VMs according to the number of employees in those regions, potentially reducing costs.
+
+For additional information, refer to the [detailed comparison](https://azure.microsoft.com/documentation/articles/choose-web-site-cloud-service-vm/) between Azure App Service, Azure Virtual Machines, and other Azure services that you can use as a deployment target using the Custom option in Visual Studio.
+
+### When to choose Azure App Virtual Machines
+
+- You want to deploy a web application that's accessible through the Internet, with full control over the lifetime of assigned IP addresses.
+- You need machine-level customizations on your servers, which includes additional software such as a specialized database system, specific networking configurations, disk partitions, and so forth.
+- You want a fine level of control over scaling of your web application.
+- You need direct access to the servers hosting your application for any other reason.
+
+> If you want to use Azure Virtual Machines in your own datacenter or other on-premises computers, you can do so using the [Azure Stack](https://azure.microsoft.com/overview/azure-stack/).
+
+## File system
+
+Deploying to the file system means to simply copy your application's files to a specific folder on your own computer. This is most often used for testing purposes, or to deploy the application for use by a limited number of people if the computer is also running a server. If the target folder is shared on a network, then deploying to the file system can make the web application files available to others who might then deploy it to specific servers.
+
+Any local machines that are running a server can make your application available through the Internet or an Intranet depending on how it's configured and the networks to which it's connected. (If you do connect a computer directly to the Internet, be especially careful to protect it from external security threats.) Because you manage these machines, you're in complete control of the software and hardware configurations.
+
+Note that if for any reason (such as machine access) you are not able to use cloud services like Azure App Service or Azure Virtual Machines, you can use the [Azure Stack](https://azure.microsoft.com/overview/azure-stack/) in your own datacenter. The Azure Stack allows you to manage and use computing resources through Azure App Service and Azure Virtual Machines while yet keeping everything on-premises.
+
+### When to choose file system deployment
+
+- You need only deploy the application to a file share from which others will deploy it to different servers.
+- You need only a local test deployment.
+- You want to examine and potentially modify the application files independently before sending them onto another deployment target.
+
+For more information, see [Quickstart - Deploy to a local folder](quickstart-deploy-to-local-folder.md)
+
+## Custom targets (IIS, FTP)
+
+A custom target lets you deploy your application to a target other than Azure App Service, Azure Virtual Machines, or the local file system. It can deploy to a file system or any other server (Internet or Intranet) to which you have access, including those on other cloud services. It can work with web deploy (files or .ZIP) and FTP.
+
+When choosing a custom target, Visual Studio prompts you for a profile name, and then collect additional **Connection** information including the target server or location, a site name, and credentials. You can control the following behaviors on the **Settings** tab:
+
+- The configuration you want to deploy.
+- Whether to remove existing files from the destination.
+- Whether to precompile during publishing.
+- Whether to exclude files in the App_Data folder from deployment.
+
+You can create any number of Custom deployment profiles in Visual Studio, making it possible to manage profiles with different settings.
+
+### When to choose custom deployment
+
+- You're using cloud services on a provider other than Azure that can be accessed through URLs.
+- You want to deploy using credentials other than the ones that you use within Visual Studio, or those tied directly to your Azure accounts.
+- You want to delete files from the target each time you deploy.
+
+For more information, see [Quickstart - Deploy to a web site](quickstart-deploy-to-a-web-site.md)
 
 ## Next steps
 
-* For a quick tour of deployment options in the Visual Studio IDE, see [First look at deployment](../deployment/deploying-applications-services-and-components.md).
+Tutorials:
+
+- [Deploy a .NET Core application with the publish tool](/dotnet/core/deploying/deploy-with-vs?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json)
+- [Publish an ASP.NET core app to Azure](/aspnet/core/tutorials/publish-to-azure-webapp-using-vs?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json)
+- [Deployment in Visual C++](/cpp/ide/deployment-in-visual-cpp)
+- [Deploy UWP apps](/windows/uwp/packaging/packaging-uwp-apps?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json)
+- [Publish a Node.js app to Azure using Web Deploy](https://github.com/Microsoft/nodejstools/wiki/Publish-to-Azure-Website-using-Web-Deploy?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json)
+- [Publish a Python app to Azure App Service](/visualstudio/python/publishing-python-web-applications-to-azure-from-visual-studio?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json)

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

@@ -2,7 +2,7 @@
 title: "Deployment feature tour"
 description: "Learn about your options for deploying apps from Visual Studio."
 ms.custom: "mvc"
-ms.date: 11/26/2017
+ms.date: 06/22/2018
 ms.technology: vs-ide-deployment
 ms.topic: "quickstart"
 dev_langs: 
@@ -28,13 +28,13 @@ ms.workload:
 
 # Quickstart: First look at deployment in Visual Studio
 
-By deploying an application, service, or component, you distribute it for installation on other computers, devices, servers, or in the cloud. You choose the appropriate method in Visual Studio for the type of deployment that you need. (Many app types support other deployment tools such as command line deployment or NuGet that are not described here.)
+By deploying an application, service, or component, you distribute it for installation on other computers, devices, or servers, or in the cloud. You choose the appropriate method in Visual Studio for the type of deployment that you need. (Many app types support other deployment tools such as command line deployment or NuGet that are not described here.)
 
-See the Tutorials for step-by-step deployment instructions. If you are deploying a web application and need more in-depth information to decide on the best deployment option from Visual Studio, see [What publishing options are right for me?](../ide/not-in-toc/web-publish-options.md).
+See the Quickstarts and Tutorials for step-by-step deployment instructions. For an overview of deployment options, see [What publishing options are right for me?](deploying-applications-services-and-components-resources.md#what-publishing-options-are-right-for-me).
 
 ## Deploy to local folder
 
-Deployment to a local folder is typically used for testing or to begin a staged deployment in which another tool will be used for final deployment.
+Deployment to a local folder is typically used for testing, or to begin a staged deployment in which another tool is used for final deployment.
 
 - **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).
 
@@ -48,7 +48,9 @@ Deployment to a local folder is typically used for testing or to begin a staged
 
     ![Choose Azure App Service](../deployment/media/quickstart-publish-azure.png "Choose Azure App Service")
 
-    In Visual Studio 2017 version 15.7, you can deploy ASP.NET Core apps to **App Service for Linux**.
+    In Visual Studio 2017 version 15.7 and later, you can deploy ASP.NET Core apps to **App Service for Linux**.
+
+    For Python apps, also see [Python - Publishing to Azure App Service](/visualstudio/python/publishing-python-web-applications-to-azure-from-visual-studio?toc=/visualstudio/deployment/toc.json&bc=/visualstudio/deployment/_breadcrumb/toc.json).
 
     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).
 
@@ -119,8 +121,7 @@ In a team environment, you can use Visual Studio Team Services (VSTS) to enable
 
 ## Next steps
 
-In this tutorial, you took a quick look at deployment options for different applications. If you are deploying a web application such as ASP.NET, read more in-depth about some of the deployment options available in Visual Studio.
+In this tutorial, you took a quick look at deployment options for different applications.
 
 > [!div class="nextstepaction"]
-> [What publishing options are right for me?](../ide/not-in-toc/web-publish-options.md)
-
+> [What publishing options are right for me?](deploying-applications-services-and-components-resources.md#what-publishing-options-are-right-for-me)

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

@@ -0,0 +1,13 @@
+## Prerequisites
+
+* [Visual Studio 2017](https://www.visualstudio.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=button+cta&utm_content=download+vs2017) installed with the appropriate workloads for your language of choice:
+  * ASP.NET: **ASP.NET and web development**
+  * Node.js: **Node.js development**
+
+* An Azure subscription. If you do not already have subscription, [sign up for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=doc&utm_campaign=visualstudio), which includes $200 in credit for 30 days and 12 months of popular free services.
+
+* An 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**.
+  * 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

@@ -0,0 +1,13 @@
+## Prerequisites
+
+* [Visual Studio 2017](https://www.visualstudio.com/downloads/?utm_medium=microsoft&utm_source=docs.microsoft.com&utm_campaign=button+cta&utm_content=download+vs2017) installed with the appropriate workloads for your language of choice:
+  * ASP.NET: **ASP.NET and web development**
+  * 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**.
+  * 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**.
+
+* Make sure you build the project using the **Build > Build Solution** menu command before following the deployment steps.