Skip to content

Commit ac70f6e

Browse files
Merge pull request #11067 from MicrosoftDocs/main638944166607612672sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents b20c470 + 3f860ce commit ac70f6e

File tree

4 files changed

+31
-4
lines changed

4 files changed

+31
-4
lines changed

docs/get-started/csharp/tutorial-wasdk.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: "Tutorial: Create Windows App SDK Apps with Visual Studio & C#"
33
description: Create a Windows App SDK application in Visual Studio by using the Extensible Application Markup Language (XAML) and C#.
44
titleSuffix: ""
55
ms.custom: vs-acquisition
6-
ms.date: 5/21/2024
6+
ms.date: 9/24/2025
77
ms.subservice: general-ide
88
ms.topic: tutorial
99
ms.devlang: csharp
@@ -30,19 +30,30 @@ If you haven't already installed Visual Studio, go to the [Visual Studio downloa
3030
Visit the [Visual Studio downloads page](https://visualstudio.microsoft.com/vs/) for a free version.
3131
- Workloads and components required for developing with WinUI and the Windows App SDK. To verify or install a workload in Visual Studio, select **Tools** > **Get Tools and Features**. For more information, see [Change workloads or individual components](../../install/modify-visual-studio.md#change-workloads-or-individual-components).
3232

33-
On the **Workloads** tab of the Visual Studio Installer, select the following workloads and components:
33+
On the **Workloads** tab of the Visual Studio Installer, select the following:
3434

3535
### [Visual Studio 2022 version 17.10 and later](#tab/vs-2022-17-10)
3636

37-
* For **C#** app development using the Windows App SDK, select **Windows application development**.
37+
* For **C#** app development using the Windows App SDK, select **WinUI application development**.
3838

39+
> [!NOTE]
40+
> _In Visual Studio 17.10 - 17.12, this workload is called **Windows application development**._
41+
3942
### [Visual Studio 2022 version 17.1 - 17.9](#tab/vs-2022-17-1)
4043

4144
* For **C#** app development using the Windows App SDK, select **.NET Desktop Development**.
4245
* Then in the **Installation details** pane of the installation dialog box, select **Windows App SDK C# Templates** (near the bottom of the list).
46+
* On the **Individual components** tab, in the **SDKs, libraries, and frameworks** section, make sure **Windows 10 SDK (10.0.19041.0)** is selected.
4347

48+
### [Other Visual Studio versions](#tab/vs-other)
49+
50+
* For C# app development using the Windows App SDK, select **.NET Desktop Development**.
51+
* On the **Individual components** tab, in the **SDKs, libraries, and frameworks** section, make sure **Windows 10 SDK (10.0.19041.0)** is selected.
52+
4453
---
4554

55+
For details, see [Install tools for the Windows App SDK](/windows/apps/windows-app-sdk/set-up-your-development-environment).
56+
4657
::: moniker-end
4758

4859
## Create a project
@@ -53,7 +64,7 @@ First, create a WinUI 3 project. The project type comes with all the template fi
5364
> [!IMPORTANT]
5465
> Visual Studio 2019 only supports Windows App SDK 1.1 and earlier. Visual Studio 2022 is recommended for developing apps with all versions of the Windows App SDK.
5566
56-
The Windows App SDK 1.1.x templates are available by installing a [Visual Studio extension (VSIX)](/windows/apps/windows-app-sdk/set-up-your-development-environment?tabs=cs-vs-community%2Ccpp-vs-community%2Cvs-other%2Cvs-2019#visual-studio-project-and-item-templates).
67+
The Windows App SDK 1.1.x templates are available by installing a [Visual Studio extension (VSIX)](/windows/apps/windows-app-sdk/set-up-your-development-environment).
5768

5869
> [!NOTE]
5970
> If you have a Windows App SDK Visual Studio extension (VSIX) already installed, then uninstall it before installing another version. For directions, see [Manage extensions for Visual Studio](/visualstudio/ide/finding-and-using-visual-studio-extensions).

docs/version-control/git-create-pull-request.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,22 @@ You can toggle your like status on a comment by clicking on the icon, or by clic
9898

9999
The ability to add comments to a pull request is limited for some Git providers. For example, with GitHub as the provider, you can only add comments on lines within 3 lines of a change, but with the Azure DevOps provider, you can add comments at any line of a file involved in the pull request. In any case, you can only add comments on files that are included in the pull request.
100100

101+
:::moniker range="visualstudio"
102+
103+
### View comments in diff view
104+
105+
You can view comments in the diff view as well as the file view. In the diff view, you can see comments alongside the original and updated code. This makes it easier to see exactly what was changed and why. You can also edit the working file directly in this view.
106+
107+
:::image type="content" source="./media/visualstudio/pr-comment-in-diff.png" alt-text="Screenshot a PR comment in the diff view." lightbox="./media/visualstudio/pr-comment-in-diff.png" :::
108+
109+
### Markdown formatting in comments
110+
111+
In file view or diff view, comments render using Markdown formatting.
112+
113+
:::image type="content" source="./media/visualstudio/pr-comment-markdown.png" alt-text="Screenshot a PR comment that shows Markdown formatting." :::
114+
115+
:::moniker-end
116+
101117
### Use the keyboard
102118

103119
You can navigate across files and individual comments using the icons in the toolbar, or use the following keyboard shortcuts:
778 KB
Loading
83.6 KB
Loading

0 commit comments

Comments
 (0)