Merge pull request #10294 from MicrosoftDocs/main638550471512144443sync_temp

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

Author: learn-build-service-prod[bot]

docs/azure/how-to-get-publish-profile-from-azure-app-service.md

@@ -5,7 +5,7 @@ author: ghogen
 manager: mijacobs
 ms.subservice: azure-development
 ms.topic: how-to
-ms.date: 05/16/2024
+ms.date: 06/18/2024
 ms.author: ghogen
 monikerRange: ">=vs-2019"
 ---
@@ -15,7 +15,8 @@ monikerRange: ">=vs-2019"
 A publish profile is a file that contains information and settings that Visual Studio uses to deploy applications and services to Azure.
 
 1. In the Azure portal, open the Azure App Service.
-2. Go to **Download publish profile** and save the profile locally.
+1. Make sure that **Basic authentication** is enabled. Go to **Configuration**, **General settings**, **SCM Basic Auth Publishing Credentials**, and choose **On**.
+1. Go to **Download publish profile** and save the profile locally.
 
    :::image type="content" source="./media/app-service-get-publish-profile.png" alt-text="Screenshot showing how to get the publish profile from Azure App Service." lightbox="./media/app-service-get-publish-profile.png":::
 
@@ -25,3 +26,4 @@ See also [Azure App Service](/azure/app-service).
 
 > [!NOTE]
 > When [basic authentication is disabled](/azure/app-service/configure-basic-auth-disable), **Download publish profile** and **Reset publish profile** are disabled.
+

docs/azure/how-to-sign-in-with-azure-subscription.md

@@ -4,7 +4,7 @@ description: Sign in to Visual Studio for Windows with an Azure subscription and
 author: ghogen
 ms.subservice: azure-development
 ms.author: ghogen
-ms.topic: "how-to"
+ms.topic: how-to
 ms.date: 10/19/2021
 ---
 

docs/azure/includes/cloud-services-legacy.md

@@ -4,7 +4,7 @@ description: include
 author: ghogen
 ms.subservice: azure-development
 ms.author: ghogen
-ms.topic: "include"
+ms.topic: include
 ms.date: 10/25/2021
 ---
 > [!NOTE]

docs/azure/includes/prerequisites-azure-subscription.md

@@ -4,7 +4,7 @@ description: include
 author: ghogen
 ms.subservice: azure-development
 ms.author: ghogen
-ms.topic: "include"
+ms.topic: include
 ms.date: 12/20/2023
 ---
 An Azure account. If you don't have an Azure account, activate your [Azure benefits for Visual Studio subscribers](/visualstudio/subscriptions/vs-azure-eligibility) or [sign up for a free trial](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).

docs/azure/includes/subscription-azure-benefits.md

@@ -4,7 +4,7 @@ description: include
 author: ghogen
 ms.subservice: azure-development
 ms.author: ghogen
-ms.topic: "include"
+ms.topic: include
 ms.date: 12/20/2023
 ---
 Many Visual Studio subscriptions include [Azure individual Dev/Test credits](/visualstudio/subscriptions/vs-azure-eligibility). If you're a Visual Studio subscriber, you can use these credits to try various Azure services at no cost. If you're not a subscriber and don't have an Azure subscription, you can [create a free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).

docs/azure/includes/vs-2019/create-aspnet5-app-2019.md

@@ -4,7 +4,7 @@ description: include
 author: ghogen
 ms.subservice: azure-development
 ms.author: ghogen
-ms.topic: "include"
+ms.topic: include
 ms.date: 03/08/2021
 ---
 

docs/azure/includes/vs-2022/create-aspnet5-app-2022.md

@@ -4,7 +4,7 @@ description: include
 author: ghogen
 ms.subservice: azure-development
 ms.author: ghogen
-ms.topic: "include"
+ms.topic: include
 ms.date: 10/25/2021
 ---
 

docs/azure/overview-aspnet-azure-development.md

@@ -10,7 +10,7 @@ ms.subservice: azure-development
 ms.topic: overview
 ms.date: 04/15/2024
 ms.author: ghogen
-monikerRange: ">=vs-2019"
+monikerRange: >=vs-2019
 ---
 
 # Overview: Develop ASP.NET web apps for Azure with Visual Studio

docs/azure/overview-azure-integration.md

@@ -7,7 +7,7 @@ ms.subservice: azure-development
 ms.topic: how-to
 ms.date: 10/19/2023
 ms.author: ghogen
-monikerRange: ">=vs-2019"
+monikerRange: >=vs-2019
 ---
 
 # Find and provision Azure resources in Visual Studio

docs/azure/overview-connected-services.md

@@ -17,7 +17,7 @@ Developers are building apps with an increasing number of services, yet the serv
 With Visual Studio's **Connected Services**, you get a modern service consumption experience that enables each service the ability to tailor their consumption experience, prompting you for the relevant questions you need to get started quickly.
 
 Connected Services includes a collection of tools in Visual Studio that help you connect your application to the following:
-- [Azure services](#azure)
+- [Azure services](#connect-your-app-to-azure-services)
 - OpenAPI endpoints
 - gRPC (Remote Procedure Call) endpoints
 - Windows Communication Foundation (WCF) endpoints
@@ -35,8 +35,6 @@ Supported project types vary by the type of service. You'll see the options that
 
 [!INCLUDE [subscription-azure-benefits](includes/subscription-azure-benefits.md)]
 
-<a name="azure"/>
-
 ## Connect your app to Azure services
 
 Use Connected Services to connect your application to live Azure services emulators and other local alternatives to Azure services. Visual Studio currently supports the following:

docs/deployment/media/tutorial-azure-app-service-download-publish-profile.png

@@ -1,7 +1,7 @@
 ---
 title: "Publish to Azure by importing publish settings"
 description: Create and import publish settings to deploy ASP.NET and ASP.NET Core web applications from Visual Studio to Azure App Service.
-ms.date: 10/22/2021
+ms.date: 06/18/2024
 ms.topic: tutorial
 helpviewer_keywords:
   - "deployment, publish settings"
@@ -15,11 +15,11 @@ ms.subservice: deployment
 You can use the **Publish** tool to import publish settings and then deploy your app. In this article, we use publish settings for Azure App Service. These steps apply to ASP.NET and ASP.NET Core web apps. 
 
 > [!NOTE]
-> A publish settings file (*\*.publishsettings*) is different than a publishing profile (*\*.pubxml*) created in Visual Studio. A publish settings file is created by Azure App Service, and then it can be imported into Visual Studio.
+> A publish settings file (`*.publishsettings`) is different than a publishing profile (`*.pubxml`) created in Visual Studio. A publish settings file is created by Azure App Service, and then it can be imported into Visual Studio.
 
 ## Prerequisites
 
-* You must have Visual Studio 2019 installed and the **ASP.NET and web development** workload.
+* You must have Visual Studio 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/?cid=learn-onpage-download-cta) page to install it for free.
 
@@ -35,7 +35,7 @@ You can use the **Publish** tool to import publish settings and then deploy your
 
     The project template you choose (ASP.NET or ASP.NET Core) must correspond to the version of ASP.NET installed on the web server.
 
-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 select **OK**.
+1. Choose either **MVC** (.NET Framework) or **Web Application (Model-View-Controller)** (for .NET Core or .NET 5 and later), and make sure that **No Authentication** is selected, and then select **OK**.
 
 1. Type a name like **MyWebApp** and select **OK**.
 
@@ -47,11 +47,13 @@ You can use the **Publish** tool to import publish settings and then deploy your
 
 1. In the Azure portal, open the Azure App Service.
 
-1. Go to **Get publish profile** and save the profile locally.
+1. Go to **Download publish profile** and save the profile locally.
 
-    ![Get the publish profile](../deployment/media/tutorial-azure-app-service-get-publish-profile.png)
+    ![Screenshot showing how to download the publish profile in Azure App Service.](../deployment/media/tutorial-azure-app-service-download-publish-profile.png)
 
-    A file with a *.publishsettings* file extension has been generated in the location where you saved it. The following code shows a partial example of the file (in a more readable formatting).
+    In order to deploy with Web Deploy, you need to enable **Basic authentication**, which is what Web Deploy uses. In Azure App Service, go to **Configuration**, **General settings**, **SCM Basic Auth Publishing Credentials**, and enable Web Deploy. You can't download a publish profile if this setting is not enabled.
+
+    A file with a `.publishsettings` file extension has been generated in the location where you saved it. The following code shows a partial example of the file (in a more readable formatting).
 
     ```xml
     <publishData>
@@ -73,7 +75,7 @@ You can use the **Publish** tool to import publish settings and then deploy your
     </publishData>
     ```
 
-    Typically, the preceding *.publishsettings file contains two publishing profiles that you can use in Visual Studio, one to deploy using Web Deploy, and one to deploy using FTP. The preceding code shows the Web Deploy profile. Both profiles will be imported later when you import the profile.
+    Typically, the preceding `.publishsettings` file contains two publishing profiles that you can use in Visual Studio, one to deploy using Web Deploy, and one to deploy using FTP. The preceding code shows the Web Deploy profile. Both profiles will be imported later when you import the profile.
 
 ## Import the publish settings in Visual Studio and deploy
 

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

@@ -50,7 +50,7 @@ Creating a web template is different than creating other kinds of templates. Bec
 
 7. Select the files in your template (this includes the *vstemplate* file), right-click the selection, and choose **Send to** > **Compressed (zipped) folder**. The files are compressed into a *.zip* file.
 
-8. Put the *.zip* template file in the Visual Studio project template directory. By default, this directory is *%USERPROFILE%\Documents\Visual Studio \<Version\>\ProjectTemplates*.
+8. Put the *.zip* template file in the Visual Studio project template directory. By default, this directory is `%USERPROFILE%\Documents\Visual Studio {Version}\Templates\ProjectTemplates`.
 
 ## Example
 

docs/ide/how-to-manually-create-web-templates.md

@@ -1,7 +1,7 @@
 ---
 title: MSBuild Conditional Constructs
 description: Learn how MSBuild provides a mechanism for conditional processing with the Choose, When, and Otherwise elements.
-ms.date: 11/04/2016
+ms.date: 06/26/2024
 ms.topic: reference
 dev_langs:
 - VB
@@ -27,7 +27,7 @@ MSBuild provides a mechanism for either/or processing with the [Choose](../msbui
 
 ## Use the Choose element
 
- The `Choose` element contains a series of `When` elements with `Condition` attributes that are tested in order from top to bottom until one evaluates to `true`. If more than one `When` element evaluates to `true`, only the first one is used. An `Otherwise` element, if present, will be evaluated if no condition on a `When` element evaluates to `true`.
+ The `Choose` element contains a series of `When` elements with `Condition` attributes that are tested in order from top to bottom until one evaluates to `true`. If more than one `When` element evaluates to `true`, only the first one is used. An `Otherwise` element, if present, is evaluated if no condition on a `When` element evaluates to `true`.
 
  `Choose` elements can be used as child elements of `Project`, `When` and `Otherwise` elements. `When` and `Otherwise` elements can have `ItemGroup`, `PropertyGroup`, or `Choose` child elements.
 
@@ -71,7 +71,7 @@ MSBuild provides a mechanism for either/or processing with the [Choose](../msbui
 </Project>
 ```
 
-In this example, a condition on a compiler constant `DEFINED_CONSTANT` is used. These are included in the `DefinedConstants` property. The regular expression is used to match the exact constant in a semicolon-separated list.
+In this example, a condition on a compiler constant `DEFINED_CONSTANT` is used. These definitions are included in the `DefineConstants` property. The regular expression is used to match the exact constant in a semicolon-separated list.
 
 ```xml
 <Choose>

docs/msbuild/msbuild-conditional-constructs.md

@@ -34,7 +34,7 @@ Visit the Visual Studio Tools for Unity [getting started with Tools For Unity.](
 
 ### Supported Unity versions
 #### Visual Studio Editor Unity package
-Unity 2020.1 and newer require a Unity Package for external editor tools like Visual Studio and Visual Studio for Mac. [Documentation to Learn more about these changes in the Unity blog post.](https://unity.com/releases/2020-1/programmer-tools#verified-ide-packages-now-include-visual-studio).
+Unity 2020.1 and newer require a Unity Package for external editor tools like Visual Studio and Visual Studio for Mac. [Documentation to Learn more about these changes in the Unity blog post.](https://unity.com/developer-tools#verified-ide-packages-now-include-visual-studio).
 
 The [getting started section](getting-started-with-visual-studio-tools-for-unity.md) includes more information on the configuration of the Visual Studio Editor package.