Merge pull request #5767 from MicrosoftDocs/master637338855954514219

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

Author: ghogen

docs/cross-platform/cross-platform-mobile-development-in-visual-studio.md

@@ -13,7 +13,7 @@ ms.workload:
 ---
 # Cross-platform mobile development in Visual Studio
 
-You can build apps for Android, iOS, and Windows devices by using Visual Studio.  As you design your app, use tools in Visual Studio to easily add connected services such as Office 365, Azure App Service, and Application Insights.
+You can build apps for Android, iOS, and Windows devices by using Visual Studio.  As you design your app, use tools in Visual Studio to easily add connected services such as Microsoft 365, Azure App Service, and Application Insights.
 
 Build your apps by using C# and the .NET Framework, HTML and JavaScript, or C++. Share code, strings, images, and in some cases even the user interface.
 
@@ -162,6 +162,6 @@ With Visual Studio Tools for Xamarin, you can target Android, iOS, and Windows i
 
 ## See also
 
-- [Add Office 365 APIs to a Visual Studio project](/office/developer-program/office-365-developer-program)
+- [Add Microsoft 365 APIs to a Visual Studio project](/office/developer-program/office-365-developer-program)
 - [Azure App Services - Mobile Apps](https://azure.microsoft.com/services/app-service/mobile/)
 - [Visual Studio App Center](/appcenter)

docs/data-tools/connect-to-data-in-an-access-database-windows-forms.md

@@ -23,7 +23,7 @@ To use these procedures, you need a Windows Forms or WPF project and either an A
 
 ## Create a dataset for an .accdb file
 
-Connect to databases created with Office 365, Access 2013, Access 2010, or Access 2007 by using the following procedure.
+Connect to databases created with Microsoft 365, Access 2013, Access 2010, or Access 2007 by using the following procedure.
 
 1. Open a Windows Forms or WPF application project in Visual Studio.
 

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

@@ -1,7 +1,8 @@
 ---
-title: "Deployment overview | Microsoft Docs"
-ms.custom: "seodec18"
-ms.date: 06/22/2018
+title: "Deploy your Visual Studio app to a folder, IIS, Azure, or another destination"
+description: "Learn more about publishing options for your app using the Publish Wizard"
+ms.custom: "contperfq1"
+ms.date: 08/21/2020
 ms.topic: "overview"
 dev_langs:
   - "FSharp"
@@ -15,7 +16,7 @@ ms.workload:
   - "multiple"
 ---
 
-# Overview of deployment in Visual Studio
+# Deploy your app to a folder, IIS, Azure, or another destination
 
 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.
 
@@ -30,19 +31,27 @@ From within Visual Studio, applications can be published directly to the followi
 - [Azure](#azure)
 - [Docker Container Registry](#docker-container-registry)
 - [Folder](#folder)
-- [Custom targets (IIS, FTP)](#Custom targets (IIS, FTP))
-
-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).
+- [FTP/FTPS server](#ftpftps-server)
+- [Web server(IIS)](#web-server-iis)
+- [Import profile](#import-profile)
 
 ## Azure 
 
+When you choose Azure, you can choose between:
+
+- Azure App Service running on Windows, Linux, or as a Docker image
+- A Docker image deployed to Azure Container Registry
+- An Azure Virtual Machine
+
+![Choose an Azure service](../deployment/media/quickstart-choose-azure-service.png)
+
 ### Azure App Service
 
-[Azure App Service](/azure/app-service/app-service-web-overview) which help developers quickly create scalable web applications and services without maintaining infrastructure. 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.
+[Azure App Service](/azure/app-service/app-service-web-overview) helps developers quickly create scalable web applications and services without maintaining infrastructure. 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.
 
 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.
 
-### When to choose Azure App Service
+#### 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.
@@ -51,7 +60,18 @@ You determine how much computing power an App Service has by choosing a [pricing
 
 > 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) and [Quickstart - Publish ASP.NET Core to Linux](quickstart-deploy-to-linux.md).
+For more information on publishing to App Service, see:
+- [Quickstart - Publish to Azure App Service](quickstart-deploy-to-azure.md) and [Quickstart - Publish ASP.NET Core to Linux](quickstart-deploy-to-linux.md).
+- [Troubleshoot ASP.NET Core on Azure App Service and IIS](/aspnet/core/test/troubleshoot-azure-iis).
+
+### Azure Container Registry
+
+[Azure Container Registry](/azure/container-registry/) allows you to build, store, and manage Docker container images and artifacts in a private registry for all types of container deployments.
+
+#### When to choose Azure Container Registry
+
+- When you have an existing Docker container development and deployment pipeline.
+- When you want to build Docker container images in Azure.
 
 ### Azure Virtual Machines
 
@@ -61,7 +81,7 @@ Scaling an application that's hosted on virtual machines involves spinning up ad
 
 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
+#### When to choose Azure 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.
@@ -94,26 +114,61 @@ Note that if for any reason (such as machine access) you are not able to use clo
 
 For more information, see [Quickstart - Deploy to a local folder](quickstart-deploy-to-local-folder.md)
 
-## Custom targets (IIS, FTP)
+## FTP/FTPS server
 
-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.
+An FTP/FTPS server lets you deploy your application to a server other than Azure. 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:
+When choosing a FTP/FTPS server, 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.
+You can create any number of FTP/FTPS deployment profiles in Visual Studio, making it possible to manage profiles with different settings.
 
-### When to choose custom deployment
+### When to choose FTP/FTPS server 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)
+## Web Server (IIS)
+
+An IIS web server lets you deploy your application to a web server other than Azure. It can deploy to an IIS server (Internet or Intranet) to which you have access, including those on other cloud services. It can work with Web Deploy or a Web Deploy package.
+
+When choosing an IIS web server, 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 IIS web server deployment profiles in Visual Studio, making it possible to manage profiles with different settings.
+
+### When to choose web server (IIS) deployment
+
+- You're using IIS to publish a site or service 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). For help troubleshooting ASP.NET Core on IIS, see [Troubleshoot ASP.NET Core on Azure App Service and IIS](/aspnet/core/test/troubleshoot-azure-iis).
+
+## Import Profile
+
+You can import a profile when publishing to IIS or Azure App Service. You can configure deployment using a *publish settings file* (*\*.publishsettings*). A publish settings file is created by IIS or Azure App Service, or it can be manually created, and then it can be imported into Visual Studio.
+
+Use of a publish settings file can simplify deployment configuration and works better in a team environment versus manually configuring each deployment profile.
+
+### When to choose import profile
+
+- You're publishing to IIS and want to simplify deployment configuration.
+- You're publishing to IIS or Azure App Service and want to speed up deployment configuration for re-use or for team members publishing to the same service.
+
+For more information, see the following:
+
+- [Import publish settings and deploy to IIS](tutorial-import-publish-settings-iis.md)
+- [Import publish settings and deploy to Azure](tutorial-import-publish-settings-azure.md)
 
 ## Next steps
 

docs/deployment/index.yml

@@ -23,10 +23,10 @@ landingContent:
     linkLists:
       - linkListType: overview
         links:
-          - text: Overview of deployment
-            url: deploying-applications-services-and-components-resources.md
           - text: First look at deployment
             url: deploying-applications-services-and-components.md
+          - text: Deploy to a folder, IIS, or Azure
+            url: deploying-applications-services-and-components-resources.md
 
   # Card (optional)
   - title: Get started
@@ -58,18 +58,8 @@ landingContent:
           - text: Package a desktop app for Windows Store
             url: /windows/msix/desktop/desktop-to-uwp-packaging-dot-net
 
-    # Card
-  - title: Deploy .NET packages to NuGet.org
-    linkLists:
-      - linkListType: tutorial
-        links:
-          - text: Publish to NuGet.org (.NET Standard)
-            url: /nuget/quickstart/create-and-publish-a-package-using-visual-studio
-          - text: Publish to NuGet.org (.NET Framework)
-            url: /nuget/quickstart/create-and-publish-a-package-using-visual-studio-net-framework
-
   # Card
-  - title: Deploy ASP.NET apps
+  - title: Deploy ASP.NET Core apps
     linkLists:
       - linkListType: tutorial
         links:
@@ -105,3 +95,13 @@ landingContent:
         links:
           - text: Publish to Linux App Service
             url: ../javascript/publish-nodejs-app-azure.md
+
+  # Card
+  - title: Deploy .NET packages to NuGet.org
+    linkLists:
+      - linkListType: tutorial
+        links:
+          - text: Publish to NuGet.org (.NET Standard)
+            url: /nuget/quickstart/create-and-publish-a-package-using-visual-studio
+          - text: Publish to NuGet.org (.NET Framework)
+            url: /nuget/quickstart/create-and-publish-a-package-using-visual-studio-net-framework

docs/deployment/media/quickstart-choose-azure-service.png

@@ -2,12 +2,12 @@
   href: index.yml
 - name: Overview
   items:
-  - name: Overview of deployment
+  - name: First look at deployment
+    href: deploying-applications-services-and-components.md
+  - name: Deploy to a folder, IIS, or Azure
     href: deploying-applications-services-and-components-resources.md
 - name: Quickstarts
   items:
-  - name: First look at deployment
-    href: deploying-applications-services-and-components.md
   - name: Deploy to Azure App Service
     href: quickstart-deploy-to-azure.md
   - name: Deploy to App Service for Linux

docs/deployment/toc.yml

@@ -79,7 +79,7 @@ Note that for most of the project templates you can also choose to enable Docker
 
 - No Authentication.
 - Individual User Accounts. These are stored in a local or Azure-based database.
-- Work or School Accounts. This option uses Active Directory, Azure AD, or Office 365 for authentication.
+- Work or School Accounts. This option uses Active Directory, Azure AD, or Microsoft 365 for authentication.
 - Windows Authentication. Suitable for intranet applications.
 
 Select the standard Web Application template with No Authentication and click **Create**.

docs/get-started/csharp/tutorial-aspnet-core-ef-step-01.md

@@ -84,7 +84,7 @@ You can use Visual Studio to build apps and games for macOS, Linux, and Windows,
 
 ## Connect to databases
 
-**Server Explorer** helps you browse and manage SQL Server instances and assets locally, remotely, and on Azure, Salesforce.com, Office 365, and websites. To open **Server Explorer**, on the main menu, choose **View** > **Server Explorer**. For more information on using Server Explorer, see [Add new connections](../data-tools/add-new-connections.md).
+**Server Explorer** helps you browse and manage SQL Server instances and assets locally, remotely, and on Azure, Salesforce.com, Microsoft 365, and websites. To open **Server Explorer**, on the main menu, choose **View** > **Server Explorer**. For more information on using Server Explorer, see [Add new connections](../data-tools/add-new-connections.md).
 
 [SQL Server Data Tools (SSDT)](/sql/ssdt/download-sql-server-data-tools-ssdt) is a powerful development environment for SQL Server, Azure SQL Database, and Azure SQL Data Warehouse. It enables you to build, debug, maintain, and refactor databases. You can work with a database project, or directly with a connected database instance on- or off-premises.
 

docs/ide/advanced-feature-overview.md

@@ -10,7 +10,7 @@ ms.workload:
 ---
 # Work with multiple user accounts
 
-If you have multiple Microsoft accounts and/or work or school accounts, you can add them all to Visual Studio so that you can access the resources from any account without having to sign in to it separately. Azure, Application Insights, Azure DevOps, and Office 365 services all support the streamlined sign-in experience.
+If you have multiple Microsoft accounts and/or work or school accounts, you can add them all to Visual Studio so that you can access the resources from any account without having to sign in to it separately. Azure, Application Insights, Azure DevOps, and Microsoft 365 services all support the streamlined sign-in experience.
 
 After you add multiple accounts on one machine, that set of accounts roams with you if you sign in to Visual Studio on another machine.
 
@@ -47,7 +47,7 @@ The next time you open **Server Explorer**, the resources for that subscription
 
 ### Access Azure Active Directory in a Web project
 
-Azure Active Directory (AAD) enables support for end-user single sign-in in ASP.NET MVC web apps or AD authentication in web API services. Domain authentication is different from individual user account authentication. Users that have access to your Active Directory domain can use their existing AAD accounts to connect to your web applications. Office 365 apps can also use domain authentication.
+Azure Active Directory (AAD) enables support for end-user single sign-in in ASP.NET MVC web apps or AD authentication in web API services. Domain authentication is different from individual user account authentication. Users that have access to your Active Directory domain can use their existing AAD accounts to connect to your web applications. Microsoft 365 apps can also use domain authentication.
 
 ::: moniker range="vs-2017"