Merge pull request #7842 from MicrosoftDocs/main637841702493672077

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

Author: ghogen

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

@@ -1,7 +1,7 @@
 ---
 title: "First look at deployment"
 description: "Learn about your options for deploying apps from Visual Studio."
-ms.date: 10/29/2021
+ms.date: 03/28/2022
 ms.topic: conceptual
 dev_langs:
   - "FSharp"
@@ -42,26 +42,22 @@ Deployment to a local folder is typically used for testing or to begin a staged
 
   - [Deploy a .NET Windows desktop app using ClickOnce](quickstart-deploy-using-clickonce-folder.md)
   - [Deploy a .NET Framework Windows desktop app using ClickOnce](how-to-publish-a-clickonce-application-using-the-publish-wizard.md).
-  - [Deploy a C++/CLR app using ClickOnce](/cpp/windows/clickonce-deployment-for-visual-cpp-applications) or, for C/C++, see [Deploy a native app using a Setup project](/cpp/windows/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project).
+  - (C++/CLR) [Deploy a C++/CLR app using ClickOnce](/cpp/windows/clickonce-deployment-for-visual-cpp-applications)
+  - (C/C++) [Deploy a native app using a Setup project](/cpp/windows/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project)
 
 ## Publish to Azure
 
-- **ASP.NET**, **ASP.NET Core**, **Python**, and **Node.js**: Publish to Azure App Service or Azure App Service on Linux (using containers) by using one of the following methods:
+- **ASP.NET**, **ASP.NET Core**, **Python**, and **Node.js**: Publish to Azure App Service or Azure App Service on Linux by using one of the following methods:
 
-  - For continuous (or automated) deployment of apps, use Azure DevOps with Azure Pipelines.
-  - For one-time (or manual) deployment of apps, use the **Publish** tool in Visual Studio.
+  - For continuous (or automated) deployment of apps, use Azure DevOps with [Azure Pipelines](/azure/devops/pipelines/tasks/build/visual-studio-build).
+  - For one-time (or manual) deployment of apps, use the [Publish](publish-overview.md) tool in Visual Studio. See [Deploy an ASP.NET Web app](/azure/app-service/quickstart-dotnetcore).
   - To create GitHub Action workflows for ASP.NET and Azure Function projects hosted on GitHub.com, see [Deploy to Azure using GitHub Actions](../deployment/azure-deployment-using-github-actions.md).
+  - For deployment using Git, see [Continuous deployment of ASP.NET Core to Azure with Git](/azure/app-service/deploy-continuous-deployment).
 
-  For deployment that provides more customized configuration of the server, you can also use the **Publish** tool to deploy apps to an Azure virtual machine.
-
-  To use the **Publish** tool, right-click the project in Solution Explorer and select **Publish**. (If you've previously configured any publishing profiles, you must then select **Create new profile**.) In the **Publish** dialog box, select either **App Service** or **Azure Virtual Machines**, and then follow the configuration steps.
+  To use the **Publish** tool, right-click the project in Solution Explorer and select **Publish**. (If you've previously configured any publishing profiles, you must then select **Create new profile**.) In the **Publish** dialog box, select either **App Service** or, if you customize your own server, **Azure Virtual Machines**, and then follow the configuration steps.
 
   ![Screenshot that shows selecting Azure App Service.](../deployment/media/quickstart-publish-azure-new.png "Choose Azure App Service")
 
-  Starting in Visual Studio 2017 version 15.7, you can deploy ASP.NET Core apps to App Service on Linux.
-
-  For a quick introduction, see [Publish an ASP.NET app](quickstart-deploy-aspnet-web-app.md?tabs=folder). Also, see [Deploy an ASP.NET web app](/azure/app-service/quickstart-dotnetcore?tabs=netcore31&pivots=development-environment-vs#publish-your-web-app). For deployment using Git, see [Continuous deployment of ASP.NET Core to Azure with Git](/azure/app-service/deploy-continuous-deployment).
-
   > [!NOTE]
   > If you don't 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).
 

docs/deployment/index.yml

@@ -11,7 +11,7 @@ metadata:
   author: mikejo5000
   ms.author: mikejo
   manager: jmartens
-  ms.date: 09/17/2019
+  ms.date: 03/28/2022
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
 
@@ -28,60 +28,64 @@ landingContent:
           - text: Overview of Publish
             url: publish-overview.md
 
-  # Card (optional)
-  - title: Get started (.NET)
-    linkLists:
-      - linkListType: quickstart
-        links:
-          - text: Deploy an ASP.NET web app
-            url: quickstart-deploy-aspnet-web-app.md
-          - text: Deploy a .NET Core app using ClickOnce
-            url: quickstart-deploy-using-clickonce-folder.md
-
   # Card
-  - title: Deploy ASP.NET web apps
+  - title: ASP.NET web app deployment
     linkLists:
       - linkListType: tutorial
         links:
-          - text: Publish ASP.NET Core to Azure
+          - text: Publish tool
+            url: quickstart-deploy-aspnet-web-app.md
+          - text: Azure
             url: /azure/app-service/quickstart-dotnetcore?tabs=netcore31&pivots=development-environment-vs#publish-your-web-app
           - text: Get publish settings from IIS
             url: tutorial-import-publish-settings-iis.md
           - text: Publish with Git
             url: /azure/app-service/deploy-continuous-deployment
 
   # Card
-  - title: Deploy .NET desktop apps
+  - title: C++ app deployment
+    linkLists:
+      - linkListType: how-to-guide
+        links:
+          - text: Installer package
+            url: deploying-applications-services-and-components.md#create-an-installer-package-windows-desktop
+          - text: Setup project
+            url: /cpp/windows/walkthrough-deploying-a-visual-cpp-application-by-using-a-setup-project
+
+  # Card
+  - title: .NET./.NET Core app deployment
     linkLists:
       - linkListType: tutorial
         links:
-          - text: Deploy .NET Core apps
+          - text: Publish tool
             url: /dotnet/core/deploying/deploy-with-vs
-          - text: Deploy a .NET Framework desktop app using ClickOnce
-            url: how-to-publish-a-clickonce-application-using-the-publish-wizard.md
-          - text: Deploy a desktop app using an installer package
+          - text: ClickOnce
+            url: quickstart-deploy-using-clickonce-folder.md
+          - text: Installer package
             url: deploying-applications-services-and-components.md#create-an-installer-package-windows-desktop
       - linkListType: how-to-guide
         links:
           - text: Package a desktop app for Windows Store
             url: /windows/msix/desktop/desktop-to-uwp-packaging-dot-net
 
   # Card
-  - title: Deploy C++ apps
+  - title: .NET Framework desktop app deployment
     linkLists:
-      - linkListType: how-to-guide
+      - linkListType: tutorial
         links:
-          - text: Deploy using an installer package
+          - text: ClickOnce
+            url: how-to-publish-a-clickonce-application-using-the-publish-wizard.md
+          - text: Installer package
             url: deploying-applications-services-and-components.md#create-an-installer-package-windows-desktop
 
   # Card
   - title: Additional deployment types
     linkLists:
       - linkListType: how-to-guide
         links:
-          - text: Node.js apps to Linux App Service
+          - text: Node.js apps on Linux App Service
             url: ../javascript/publish-nodejs-app-azure.md
-          - text: Deploy containerized apps
+          - text: Containerized apps
             url: ../containers/index.yml
           - text: Publish NuGet packages
             url: /nuget