Skip to content

Commit 4a13379

Browse files
Merge pull request #9785 from MicrosoftDocs/main638350851372116565sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 92fa0c2 + 9663a08 commit 4a13379

File tree

4 files changed

+25
-8
lines changed

4 files changed

+25
-8
lines changed

docs/azure/end-to-end-deployment-entity-framework-core-github-actions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Deploy an ASP.NET Core app and Database to Container Apps using GitHub Actions
33
description: Learn how to use Visual Studio to publish a web app to Azure Container Apps using GitHub actions
4-
ms.date: 09/16/2022
4+
ms.date: 11/03/2023
55
ms.topic: tutorial
66
helpviewer_keywords:
77
- "deployment, web app"
@@ -224,7 +224,7 @@ The connection string is now stored securely in the GitHub repository secrets an
224224
git commit -m "Added GitHub Actions workflow"
225225
git push
226226
```
227-
2. Navigate to the GitHub repository and select the **Actions** tab. A workflow run should have triggered automatically if the push was successful.
227+
1. Navigate to the GitHub repository and select the **Actions** tab. A workflow run should have triggered automatically if the push was successful.
228228
1. Select the active workflow to view the log details for each step as they complete. The migration runs last to update the database in Azure.
229229

230230
:::image type="content" source="./media/end-to-end-deployment-entity-framework-core-github-actions/github-actions-workflow.png" lightbox="./media/end-to-end-deployment-entity-framework-core-github-actions/github-actions-workflow-large.png" alt-text="A screenshot showing the GitHub action workflow.":::

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

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: "First look at deployment"
33
description: "Learn about your options for deploying apps from Visual Studio."
4-
ms.date: 03/23/2023
4+
ms.date: 11/02/2023
55
ms.topic: conceptual
66
dev_langs:
77
- "FSharp"
@@ -33,7 +33,7 @@ See the quickstarts and tutorials for step-by-step deployment instructions. For
3333

3434
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.
3535

36-
- **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 select **Publish**. (If you haven't previously configured any publishing profiles, you must then select **Create new profile**.) Next, select **Folder**. For more information, see [Publish an ASP.NET app](quickstart-deploy-aspnet-web-app.md?tabs=folder).
36+
- **ASP.NET**, **ASP.NET Core**, **Node.js**, **Python**, **.NET Core**, and **.NET 5 and later**: 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 select **Publish**. (If you haven't previously configured any publishing profiles, you must then select **Create new profile**.) Next, select **Folder**. For more information, see [Publish an ASP.NET app](quickstart-deploy-aspnet-web-app.md?tabs=folder).
3737

3838
![Screenshot that shows selecting Publish.](../deployment/media/quickstart-publish.png)
3939

@@ -78,11 +78,12 @@ Deployment to a local folder is typically used for testing or to begin a staged
7878
- [Deploy a .NET Windows desktop app using ClickOnce](quickstart-deploy-using-clickonce-folder.md)
7979
- [Deploy a C++/CLR app using ClickOnce](/cpp/windows/clickonce-deployment-for-visual-cpp-applications)
8080

81+
:::moniker range="<=vs-2019"
8182
## Create an installer package (Windows desktop)
8283

8384
If you require a more complex installation of a desktop application than ClickOnce can provide, you can create a Windows Installer package (MSI or EXE installation file) or a custom bootstrapper.
8485

85-
- An MSI-based installer package can be created by using the [WiX Toolset Visual Studio 2017 Extension](https://marketplace.visualstudio.com/items?itemName=RobMensching.WixToolsetVisualStudio2017Extension). This is a command-line toolset.
86+
- An MSI-based installer package can be created by using the [WiX Toolset Visual Studio 2019 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2019Extension). This is a command-line toolset.
8687

8788
- An MSI or EXE installer package can be created by using a Setup project (vdproj). To use this option, see [Visual Studio Installer Projects Extension and .NET 6.0](../deployment/installer-projects-net-core.md) or, go directly to the [Visual Studio Installer Projects extension](https://marketplace.visualstudio.com/items?itemName=VisualStudioProductTeam.MicrosoftVisualStudio2017InstallerProjects#overview).
8889

@@ -92,7 +93,23 @@ If you require a more complex installation of a desktop application than ClickOn
9293
> InstallShield Limited Edition is no longer included with Visual Studio and isn't supported in Visual Studio 2017 and later versions. Check with Flexera Software about future availability.
9394
9495
- You can also install prerequisite components for desktop applications by configuring a generic installer package, which is known as a bootstrapper. For more information, see [Application deployment prerequisites](../deployment/application-deployment-prerequisites.md).
96+
:::moniker-end
97+
:::moniker range=">=vs-2022"
98+
## Create an installer package (Windows desktop)
99+
100+
If you require a more complex installation of a desktop application than ClickOnce can provide, you can create a Windows Installer package (MSI or EXE installation file) or a custom bootstrapper.
101+
102+
- An MSI-based installer package can be created by using the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension). This is a command-line toolset.
103+
104+
- An MSI or EXE installer package can be created by using a Setup project (vdproj). To use this option, see [Visual Studio Installer Projects Extension and .NET 6.0](../deployment/installer-projects-net-core.md) or, go directly to the [Visual Studio Installer Projects extension](https://marketplace.visualstudio.com/items?itemName=VisualStudioProductTeam.MicrosoftVisualStudio2017InstallerProjects#overview).
95105

106+
- An MSI or EXE installer package can be created by using [InstallShield](https://www.revenera.com/install/products/installshield/installshield-requirements) from Flexera Software. InstallShield may be used with Visual Studio 2017 and later versions. Community Edition isn't supported.
107+
108+
> [!NOTE]
109+
> InstallShield Limited Edition is no longer included with Visual Studio and isn't supported in Visual Studio 2017 and later versions. Check with Flexera Software about future availability.
110+
111+
- You can also install prerequisite components for desktop applications by configuring a generic installer package, which is known as a bootstrapper. For more information, see [Application deployment prerequisites](../deployment/application-deployment-prerequisites.md).
112+
:::moniker-end
96113
## Publish to Microsoft Store
97114

98115
From Visual Studio, you can create app packages for deployment to Microsoft Store.

docs/ide/walkthrough-building-an-application.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 'Tutorial: Build an application'
33
description: Become more familiar with several options that you can configure when you build applications with Visual Studio.
4-
ms.date: 08/15/2023
4+
ms.date: 11/02/2023
55
ms.technology: vs-ide-compile
66
ms.topic: tutorial
77
author: ghogen

docs/msbuild/msbuild.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: MSBuild
33
description: Learn about how the Microsoft Build Engine (MSBuild) platform provides a project file with an XML schema to control builds.
4-
ms.date: 3/15/2023
4+
ms.date: 11/03/2023
55
ms.topic: conceptual
66
helpviewer_keywords:
77
- MSBuild, about MSBuild
@@ -173,7 +173,7 @@ The command line `dotnet build --help` lists the command-line options specific t
173173

174174
## <a name="BKMK_Multitargeting"></a> Multitargeting
175175

176-
By using Visual Studio, you can compile an application to run on any one of several versions of .NET Framework. For example, you can compile an application to run on .NET Framework 2.0 on a 32-bit platform, and you can compile the same application to run on .NET Framework 4.5 on a 64-bit platform. The ability to compile to more than one framework is named multitargeting.
176+
By using Visual Studio, you can compile an application to run on any one of several versions of .NET Framework or .NET Core, including .NET 5 and later. For example, you can compile an application to run on .NET Framework 4 on a 32-bit platform, and you can compile the same application to run on .NET Framework 4.8 on a 64-bit platform. The ability to compile to more than one framework is named multitargeting.
177177

178178
These are some of the benefits of multitargeting:
179179

0 commit comments

Comments
 (0)