Skip to content

Commit 548c2bd

Browse files
committed
Merge branch 'main' into main638803365021271262sync_temp
2 parents c1fc627 + e61910b commit 548c2bd

19 files changed

+1534
-1100
lines changed

hub/apps/design/controls/rich-edit-box.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ title: RichEditBox
44
ms.assetid: 4AFC0DFA-3B89-434D-9F86-4309CCFF7839
55
label: Rich edit box
66
template: detail.hbs
7-
ms.date: 04/11/2025
7+
ms.date: 04/17/2025
88
ms.topic: article
99
doc-status: Published
1010
ms.localizationpriority: medium
1111
---
1212

1313
# Rich edit box
1414

15-
You can use a **RichEditBox** control to enter and edit rich text documents that contain formatted text, hyperlinks, and images, and math equations. You can make a RichEditBox read-only by setting its IsReadOnly property to **true**.
15+
You can use a **RichEditBox** control to enter and edit rich text documents that contain formatted text, hyperlinks, images, math equations, and other rich content. You can make a RichEditBox read-only by setting its IsReadOnly property to **true**.
1616

1717
## Is this the right control?
1818

hub/apps/desktop/modernize/grant-identity-to-nonpackaged-apps.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,15 @@ SignTool.exe sign /fd SHA256 /a /f <path to certificate>\MyCertificate.pfx /p <c
9595

9696
Note: For how to build and sign the identity package within a CI/CD pipeline with production certificates, see the [MSIX and CI/CD Pipeline Overview](/windows/msix/desktop/cicd-overview) for examples.
9797

98-
### Add identity metadata to your desktop application manifests
98+
## Add identity metadata to your desktop application manifests
9999

100100
You connect the identity package with your application executables by including [application manifests](/windows/win32/sbscs/application-manifests) (a.k.a side-by-side or fusion manifests) with metadata that matches metadata from the identity package manifest.
101101

102-
In Visual Studio, you can add an [application manifest](/windows/win32/sbscs/application-manifests) to an executable project by opening the **Project** context menu, and selecting **Add** > **New Item** > **Application Manifest File**.
102+
In Visual Studio, you can add an [application manifest](/windows/win32/sbscs/application-manifests) to an executable project by opening the **Project** context menu, and selecting **Add** > **New Item** > **Application Manifest File**.
103+
104+
105+
Below is an example application manifest snippet demonstrating the `msix` element required to connect your binaries with metadata from your identity package.
103106

104-
Below is an example application manifest snippet demonstrating the `msix` element required to connect your binaries with metadata from your identity package.
105107

106108
```xml
107109
<?xml version="1.0" encoding="utf-8"?>
@@ -147,8 +149,8 @@ Note the below important details about this code:
147149
* Set `externalLocation` to the absolute path of your application's installation directory (without any executable names)
148150
* Set `packagePath` to the absolute path of the identity package produced in the previous step (with the file name)
149151

150-
For a complete example including unregistering the package on uninstall, see [`StartUp.cs`](https://github.com/microsoft/AppModelSamples/blob/0c019d835d194dfc65ee0c0663086582d48165a9/Samples/SparsePackages/PhotoStoreDemo/StartUp.cs#L146-L220).
152+
For production-ready code in C# and C++, see [Sample apps](#sample-apps) below. The samples also demonstrate how to unregister the identity package on uninstall.
151153

152-
## Sample app
154+
## Sample apps
153155

154-
See the [SparsePackages](https://github.com/microsoft/AppModelSamples/tree/master/Samples/SparsePackages) sample for a fully functional sample app that demonstrates how to grant package identity to a desktop app by registering an identity package.
156+
See the [PackageWithExternalLocation](https://aka.ms/sparsepkgsample) samples for fully functional C# and C++ apps that demonstrate how to register an identity package.

hub/apps/develop/camera/camera-quickstart-winui3.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.localizationpriority: medium
1111

1212
# Show the camera preview in a WinUI 3 app
1313

14-
In this quickstart, you will learn how to create a basic WinUI 3 camera app that displays the camera preview. In a WinUI 3 app, you use the [MediaPlayerElement](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.mediaplayerelement) control in the [Microsot.UI.Xaml.Controls](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls) namespace to render the camera preview and the WinRT class [MediaCapture](/uwp/api/windows.media.capture.mediacapture) to access the device's camera preview stream. **MediaCapture** provides APIs for performing a wide range of camera-related tasks such as such as capturing photos and videos and configuring the camera's device driver. See the other articles in this section for details about other **MediaCapture** features.
14+
In this quickstart, you will learn how to create a basic WinUI 3 camera app that displays the camera preview. In a WinUI 3 app, you use the [MediaPlayerElement](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.mediaplayerelement) control in the [Microsoft.UI.Xaml.Controls](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls) namespace to render the camera preview and the WinRT class [MediaCapture](/uwp/api/windows.media.capture.mediacapture) to access the device's camera preview stream. **MediaCapture** provides APIs for performing a wide range of camera-related tasks such as such as capturing photos and videos and configuring the camera's device driver. See the other articles in this section for details about other **MediaCapture** features.
1515

1616
The code in this walkthrough is adapted from the [MediaCapture WinUI 3 sample on github](https://github.com/microsoft/Windows-Camera/tree/master/Samples/MediaCaptureWinUI3).
1717

@@ -21,7 +21,7 @@ The code in this walkthrough is adapted from the [MediaCapture WinUI 3 sample on
2121
## Prerequisites
2222

2323
- Your device must have developer mode enabled. For more information see [Enable your device for development](/windows/apps/get-started/enable-your-device-for-development).
24-
- Visual Studio 2022 or later with the **Windows application development** workload.
24+
- Visual Studio 2022 or later with the **WinUI application development** workload.
2525

2626
## Create a new WinUI 3 app
2727

@@ -30,7 +30,7 @@ In Visual Studio, create a new project. In the **Create a new project** dialog,
3030

3131
## Create the UI
3232

33-
The simple UI for this example includes a **MediaPlayerElement** control for displaying the camera preview, a [ComboBox](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.combobox) that allows you to select from the device's cameras, and buttons for initializing the **MediaCapture** class, starting and stopping the camera preview, and reseting the sample. We also include a [TextBlock](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.textblock) for displaying status messages.
33+
The simple UI for this example includes a **MediaPlayerElement** control for displaying the camera preview, a [ComboBox](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.combobox) that allows you to select from the device's cameras, and buttons for initializing the **MediaCapture** class, starting and stopping the camera preview, and resetting the sample. We also include a [TextBlock](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.textblock) for displaying status messages.
3434

3535
In your project's MainWindow.xml file, replace the default **StackPanel** control with the following XAML.
3636

hub/apps/develop/security/share-certificates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Apps can authenticate to a web service using a certificate, and multiple apps ca
1818
1919
## Prerequisites
2020

21-
- [Visual Studio](https://visualstudio.microsoft.com/) with the **ASP.NET and web development** and **Windows application development** workloads installed.
21+
- [Visual Studio](https://visualstudio.microsoft.com/) with the **ASP.NET and web development** and **WinUI application development** workloads installed.
2222
- The latest [Windows Software Development Kit (SDK)](https://developer.microsoft.com/windows/downloads/windows-sdk/) to use the Windows Runtime (WinRT) APIs in your WinUI app.
2323
- [PowerShell](/powershell/scripting/install/installing-powershell-on-windows) for working with self-signed certificates.
2424

hub/apps/distribute-through-store/how-to-use-store-web-installer-for-distribution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ Once installation is done, the installer will automatically launch the applicati
2828
This functionality is available for the following web-hosted content types:
2929

3030
- Free packaged MSIX content published on the Microsoft Store
31+
- Win32 apps published on the Microsoft Store
3132

3233
This functionality isn't currently available for the following content types:
3334

3435
- MSIXVC apps published on the Microsoft Store
35-
- Win32 apps published on the Microsoft Store
3636
- Paid content published on the Microsoft Store
3737
- Content rated above Everyone/ESRB (or equivalent) while signed in to Windows using an Enterprise account
3838

hub/apps/get-started/start-here.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Get started with Windows development using WinUI
33
description: List of steps to get started developing Windows apps with WinUI and the Windows App SDK.
44
ms.topic: how-to
5-
ms.date: 03/24/2025
5+
ms.date: 04/18/2025
66
keywords: windows, desktop development
77
ms.localizationpriority: medium
88
ms.collection: windows11
@@ -53,15 +53,18 @@ On the **Workloads** tab of the Visual Studio Installer app, select the followin
5353

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

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

58-
:::image type="content" source="images/hello-world/vs-workload-winui.png" alt-text="A screenshot of the Visual Studio installer UI with the Windows application development workload selected.":::
58+
:::image type="content" source="images/hello-world/vs-workload-winui.png" alt-text="A screenshot of the Visual Studio installer UI with the WinUI application development workload selected.":::
5959

60-
* For **C++** app development using the Windows App SDK, select **Windows application development**.
61-
* Then in the **Installation details** pane, under the **Windows application development** node, select **C++ WinUI app development tools**. (This will also select any additional required components.)
60+
* For **C++** app development using the Windows App SDK, select **WinUI application development**.
61+
* Then in the **Installation details** pane, under the **WinUI application development** node, select **C++ WinUI app development tools**. (This will also select any additional required components.)
6262

6363
:::image type="content" source="images/hello-world/vs-workload-winui-cpp.png" alt-text="A screenshot of the Visual Studio installer UI with the C++ WinUI app development tools selected.":::
6464

65+
> [!NOTE]
66+
> _In Visual Studio 17.10 - 17.12, this workload is called **Windows application development**._
67+
6568
#### [Visual Studio 2022 version 17.1 - 17.9](#tab/vs-2022-17-1)
6669

6770
* For **C#** app development using the Windows App SDK, select **.NET Desktop Development**.

hub/apps/get-started/windows-developer-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ sections:
7979
See [Use the Windows App SDK in an existing project](/windows/apps/windows-app-sdk/use-windows-app-sdk-in-existing-project) for more information.
8080
- question: Do I need to use Visual Studio to build WinUI apps?
8181
answer: |
82-
We strongly recommend using Visual Studio 2022 versions 17.10 and above to develop WinUI apps. Using the latest version of Visual Studio will give you access to rich development features like Hot Reload. The latest Visual Studio installers include a **Windows application development** workload, making it easy to get started with WinUI development.
82+
We strongly recommend using Visual Studio 2022 versions 17.10 and above to develop WinUI apps. Using the latest version of Visual Studio will give you access to rich development features like Hot Reload. The latest Visual Studio installers include a **WinUI application development** workload, making it easy to get started with WinUI development.
8383
8484
You may be able to use other IDEs and development workflows, but [Visual Studio](/visualstudio/windows/) is currently the only officially supported IDE for WinUI. Note that [MSBuild](/visualstudio/msbuild/msbuild) is required to compile projects that use XAML or WinUI.
8585
- question: When I build an app using Windows App SDK and WinUI 3, am I building a "WinUI app"?

hub/apps/how-tos/github-copilot-winui-vs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ In this how-to, we'll demonstrate how [GitHub Copilot](https://github.com/featur
1717

1818
## Prerequisites
1919

20-
- Visual Studio 2022 (v17.10+) with the Windows application development workload applied (see [Get started with WinUI](../get-started/start-here.md) for additional configuration details). GitHub Copilot is included in Visual Studio 2022 v17.10 and later by default.
20+
- Visual Studio 2022 (v17.10+) with the **WinUI application development** workload applied (see [Get started with WinUI](../get-started/start-here.md) for additional configuration details). GitHub Copilot is included in Visual Studio 2022 v17.10 and later by default.
2121
- An active subscription to [GitHub Copilot](https://github.com/features/copilot/plans) associated with the GitHub account that you sign in to Visual Studio with.
2222
- Familiarity with C#, WinUI, and Windows App SDK.
2323

hub/apps/publish/publish-your-app/msix/app-package-management.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Generally speaking, later OS versions can run packages that target previous OS v
1818

1919
## Removing an app from the Store
2020

21-
At times, you may want to stop offering an app to customers, effectively "unpublishing" it. To do so, use the toggle button in **Store presence** card from the **App overview** page. After you confirm that you want to make the app unavailable, within a few hours it will no longer be visible in the Store, and no new customers will be able to get it (unless they have a [promotional code](../../generate-promotional-codes.md) and are using a Windows 10 or Windows 11 device).
21+
At times, you may want to stop offering an app to customers, effectively "unpublishing" it. To do so, navigate to the **Store presence** card on the **App overview** page. You will see that your product is currently available in the Microsoft Store. Click on **Modify availabilty**, select **Make product unavailable** and click on **Apply**. After you confirm that you want to make the app unavailable, within a few hours it will no longer be visible in the Store, and no new customers will be able to get it (unless they have a [promotional code](../../generate-promotional-codes.md) and are using a Windows 10 or Windows 11 device).
2222

2323
:::image type="content" source="images/new-overview-make-product-unavailable.png" lightbox="images/new-overview-make-product-unavailable.png" alt-text="A screenshot of the new msix overview page showing how to make product unavailable in Store":::
2424

@@ -29,7 +29,7 @@ This option has the same effect as if you created a submission and chose **Make
2929

3030
Note that any customers who already have the app will still be able to use it and can download it again (and could even get updates if you submit new packages later).
3131

32-
After making the app unavailable, you'll still see it in Partner Center. If you decide to offer the app to customers again, you can click **Make product available** from the banner on the **App overview** page or you can use the toggle button in **Store presence** card on **App overview** page. After you confirm, the app will be available to new customers (unless restricted by the settings in your last submission) within a few hours.
32+
After making the app unavailable, you'll still see it in Partner Center. If you decide to offer the app to customers again, you can click **Make product available** from the banner on the **App overview** page or you can navigate to **Store presence** card on **App overview** page and **Modify availability** for your product. After you confirm, the app will be available to new customers (unless restricted by the settings in your last submission) within a few hours.
3333

3434
:::image type="content" source="images/new-overview-make-product-available.png" lightbox="images/new-overview-make-product-available.png" alt-text="A screenshot of the new msix overview page showing how to make product available in Store":::
3535

Loading
Loading

0 commit comments

Comments
 (0)