Skip to content

Commit a67d001

Browse files
Merge pull request #5450 from MicrosoftDocs/main638840596934980109sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents 7823230 + 84f3b69 commit a67d001

25 files changed

+34
-34
lines changed

hub/apps/design/devices/designing-for-MR.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ When creating a UWP app that will potentially be used on a Mixed Reality platfor
116116

117117
* Remember, gaze is not as accurate as mouse pointing. Smaller mouse targets or buttons may cause frustration for your users, so resize controls accordingly. If they are designed for touch, they will work in Mixed Reality, but you may decide to enlarge some buttons at runtime. See [Updating 2D UWP apps for Windows Mixed Reality](/windows/mixed-reality/develop/porting-apps/building-2d-apps).
118118

119-
* The HoloLens defines the color black as the absence of light. It's simply not rendered, allowing the "real world" so show through. Your application should not use black if this is would cause confusion. In a Mixed Reality headset, black is black.
119+
* Your application should not use black as this could cause confusion. The HoloLens defines the color black as the absence of light and is simply not rendered, allowing the "real world" to show through. In a Mixed Reality headset, black is rendered as black.
120120

121121
* The HoloLens does not support color themes in apps, and defaults to blue to ensure the best experience for users. For more advice about selecting colors, you should consult [this topic](https://developer.microsoft.com/windows/mixed-reality/color_light_and_materials) which discusses the use of color and material in Mixed Reality designs.
122122

hub/apps/desktop/modernize/xaml-islands/host-custom-control-with-xaml-islands-cpp.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ To host a custom WinRT XAML control, you'll create the following projects and co
4747
5. Add a reference to the Windows Runtime metadata:
4848
1. In **Solution Explorer**, right-click on your project **References** node and select **Add Reference**.
4949
2. Click the **Browse** button at the bottom of the page and navigate to the UnionMetadata folder in your SDK install path. By default the SDK will be installed to `C:\Program Files (x86)\Windows Kits\10\UnionMetadata`.
50-
3. Then, select the folder named after the Windows version you are targetting (e.g. 10.0.18362.0) and inside of that folder pick the `Windows.winmd` file.
50+
3. Then, select the folder named after the Windows version you are targeting (e.g. 10.0.18362.0) and inside of that folder pick the `Windows.winmd` file.
5151
4. Click **OK** to close the **Add Reference** dialog.
5252

5353
6. Build the solution and confirm that it builds successfully.
@@ -169,7 +169,7 @@ You're now ready to add code to the **MyUWPApp** project to perform these tasks:
169169
<TextBlock HorizontalAlignment="Center" TextWrapping="Wrap"
170170
Text="Hello from XAML Islands" FontSize="30" />
171171
<TextBlock HorizontalAlignment="Center" Margin="15" TextWrapping="Wrap"
172-
Text="😍❤💋🌹🎉😎🐱‍👤" FontSize="16" />
172+
Text="😍❤💋🌹🎉😎 🐱‍👤" FontSize="16" />
173173
<Button HorizontalAlignment="Center"
174174
x:Name="Button" Click="ClickHandler">Click Me</Button>
175175
</StackPanel>
@@ -566,7 +566,7 @@ This section demonstrates how to add a WinRT XAML control from the WinUI 2 libra
566566
<TextBlock HorizontalAlignment="Center" TextWrapping="Wrap"
567567
Text="Hello from XAML Islands" FontSize="30" />
568568
<TextBlock HorizontalAlignment="Center" Margin="15" TextWrapping="Wrap"
569-
Text="😍❤💋🌹🎉😎🐱‍👤" FontSize="16" />
569+
Text="😍❤💋🌹🎉😎 🐱‍👤" FontSize="16" />
570570
<Button HorizontalAlignment="Center"
571571
x:Name="Button" Click="ClickHandler">Click Me</Button>
572572
<winui:RatingControl />

hub/apps/develop/camera/process-media-frames-with-mediaframereader.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ The **FrameRenderer** helper class implements the following methods.
149149

150150
## Use MultiSourceMediaFrameReader to get time-correlated frames from multiple sources
151151

152-
Starting with Windows 10, version 1607, you can use [**MultiSourceMediaFrameReader**](/uwp/api/windows.media.capture.frames.multisourcemediaframereader) to receive time-corellated frames from multiple sources. This API makes it easier to do processing that requires frames from multiple sources that were taken in close temporal proximity, such as using the [**DepthCorrelatedCoordinateMapper**](/uwp/api/windows.media.devices.core.depthcorrelatedcoordinatemapper) class. One limitation of using this new method is that frame-arrived events are only raised at the rate of the slowest capture source. Extra frames from faster sources will be dropped. Also, because the system expects frames to arrive from different sources at different rates, it does not automatically recognize if a source has stopped generating frames altogether. The example code in this section shows how to use an event to create your own timeout logic that gets invoked if correlated frames don't arrive within an app-defined time limit.
152+
Starting with Windows 10, version 1607, you can use [**MultiSourceMediaFrameReader**](/uwp/api/windows.media.capture.frames.multisourcemediaframereader) to receive time-correlated frames from multiple sources. This API makes it easier to do processing that requires frames from multiple sources that were taken in close temporal proximity, such as using the [**DepthCorrelatedCoordinateMapper**](/uwp/api/windows.media.devices.core.depthcorrelatedcoordinatemapper) class. One limitation of using this new method is that frame-arrived events are only raised at the rate of the slowest capture source. Extra frames from faster sources will be dropped. Also, because the system expects frames to arrive from different sources at different rates, it does not automatically recognize if a source has stopped generating frames altogether. The example code in this section shows how to use an event to create your own timeout logic that gets invoked if correlated frames don't arrive within an app-defined time limit.
153153

154154
The steps for using [**MultiSourceMediaFrameReader**](/uwp/api/windows.media.capture.frames.multisourcemediaframereader) are similar to the steps for using [**MediaFrameReader**](/uwp/api/Windows.Media.Capture.Frames.MediaFrameReader) described previously in this article. This example will use a color source and a depth source. Declare some string variables to store the media frame source IDs that will be used to select frames from each source. Next, declare a [**ManualResetEventSlim**](/dotnet/api/system.threading.manualreseteventslim), a [**CancellationTokenSource**](/dotnet/api/system.threading.cancellationtokensource), and an [**EventHandler**](/dotnet/api/system.eventhandler) that will be used to implement timeout logic for the example.
155155

hub/apps/develop/dispatcherqueue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ void Main()
168168
169169
var appWindow = AppWindow.Create(nullptr, 0, dispatcherQueueController.DispatcherQueue());
170170
171-
// Since we associated the DispatcherQueue above with the AppWindow, we're able to retreive it
171+
// Since we associated the DispatcherQueue above with the AppWindow, we're able to retrieve it
172172
// as a property. If we were to not associate a dispatcher, this property would be null.
173173
ASSERT(appWindow.DispatcherQueue() == dispatcherQueueController.DispatcherQueue());
174174

hub/apps/develop/ui-input/display-ui-objects.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Your desktop app can be [WinUI 3](../../winui/winui3/index.md), [Windows Present
1818
For classes that implement the [**IInitializeWithWindow**](/windows/win32/api/shobjidl_core/nn-shobjidl_core-iinitializewithwindow) interface (or the equivalent [**IDataTransferManagerInterop**](/windows/win32/api/shobjidl_core/nn-shobjidl_core-idatatransfermanagerinterop) interface), you can use that interface to set an owner window on the object before you display it. It's a two-step process.
1919

2020
1. Decide which window will be the owner of the UI object that you want to display, and retrieve that window's HWND. For more details and code examples for this step, see [Retrieve a window handle (HWND)](./retrieve-hwnd.md).
21-
2. Then call the appropriate interoperatability API (for C# or C++/WinRT) to set an owner window handle (HWND) for the WinRT UI object.
21+
2. Then call the appropriate interoperability API (for C# or C++/WinRT) to set an owner window handle (HWND) for the WinRT UI object.
2222

2323
## For classes that implement IInitializeWithWindow
2424

@@ -75,7 +75,7 @@ private async void ShowFolderPickerAsync(IntPtr hWnd)
7575

7676
### WinUI 3 with C++
7777

78-
The C++/WinRT code below expects that you've already used the pattern documented in [Retrieve a window handle (HWND)](./retrieve-hwnd.md). Then, to set the owner window for the UI object that you want to display, the code calls the interoperatability method [**IInitializeWithWindow::Initialize**](/windows/win32/api/shobjidl_core/nf-shobjidl_core-iinitializewithwindow-initialize).
78+
The C++/WinRT code below expects that you've already used the pattern documented in [Retrieve a window handle (HWND)](./retrieve-hwnd.md). Then, to set the owner window for the UI object that you want to display, the code calls the interoperability method [**IInitializeWithWindow::Initialize**](/windows/win32/api/shobjidl_core/nf-shobjidl_core-iinitializewithwindow-initialize).
7979

8080
```cppwinrt
8181
// pch.h

hub/apps/distribute-through-store/how-to-distribute-your-win32-app-through-microsoft-store.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Let's explore each of these options in more detail in the following sections.
3535

3636
### Option 1 - Package your Win32 app as MSIX
3737

38-
Package your application into a MSIX is very simple, you can either use:
38+
Package your application into an MSIX is very simple, you can either use:
3939
- Visual Studio by adding the project Windows Application Packaging to your solution. See [Set up your desktop application for MSIX packaging in Visual Studio](/windows/msix/desktop/desktop-to-uwp-packaging-dot-net).
4040
- Use installer solutions from one of our partners. See [Package a desktop app using third-party installers](/windows/msix/desktop/desktop-to-uwp-third-party-installer).
4141
- Microsoft MSIX Packaging Tool to create the MSIX from an existing installer. See [Create an MSIX package from any desktop installer (MSI, EXE, ClickOnce, or App-V)](/windows/msix/packaging-tool/create-app-package).

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ To create a new project using the WinUI C# Blank App project template:
105105
The `MainWindow` class included with the project template includes some sample code that needs to be removed to make room for your content.
106106

107107
1. Double-click `MainWindow.xaml` in **Solution Explorer** to open it. You should see XAML markup for a `StackPanel` control.
108-
1. Delete the XAML for the `StackPanel`. (You'll add your own content in it's place as you create your app.)
108+
1. Delete the XAML for the `StackPanel`. (You'll add your own content in its place as you create your app.)
109109

110110
```xaml
111111
<!-- ↓ Delete this. ↓ -->

hub/apps/publish/partner-center/remove-azure-ad-tenant-associations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ To remove a tenant, find its name on the **Tenants** page (in **Account settings
2020
:::image type="content" source="../images/partner-center-account-settings-tenants-remove-azure-ad.png" alt-text="Screenshot showing Remove option in Partner Center tenant settings.":::
2121

2222
> [!TIP]
23-
> You can’t remove a tenant if you are currently signed into Partner Center using an account in the same tenant. To remove a tenant, you must sign in to Partner Center as an **Manager** for another tenant that is associated with the account. If there is only one tenant associated with the account, that tenant can only be removed after signing in with the Microsoft account that opened the account.
23+
> You can’t remove a tenant if you are currently signed into Partner Center using an account in the same tenant. To remove a tenant, you must sign in to Partner Center as a **Manager** for another tenant that is associated with the account. If there is only one tenant associated with the account, that tenant can only be removed after signing in with the Microsoft account that opened the account.

hub/apps/publish/store-business-verification-reqs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Then, expand and edit the **Contact Info** section. Select **Update**.
8080

8181
![Additional Information for Verification location in Partner Center](images\account-verify-additional-info.png)
8282

83-
5. Within this tab, you can chose between the two availabe identification options.
83+
5. Within this tab, you can chose between the two available identification options.
8484

8585
* **DUNS ID**: This is the recommended and faster verification method. Simply enter your DUNS ID.
8686

hub/apps/windows-app-sdk/migrate-to-windows-app-sdk/guides/background-task-migration-strategy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Background tasks offered in the UWP app model can either be out-of-proc or in-pr
1818

1919
In the case of out-of-proc background tasks in UWP, background tasks will be written as a Windows Runtime (WinRT) component, and the component is set as the [TaskEntryPoint](/uwp/api/windows.applicationmodel.background.backgroundtaskbuilder.taskentrypoint) on [BackgroundTaskBuilder](/uwp/api/windows.applicationmodel.background.backgroundtaskbuilder) during registration. While migrating to Windows App SDK, developers can keep this as-is and package the WinRT component together with the desktop project. In this case, the broker infrastructure will be launching `backgroundtaskhost` process when the trigger is invoked, and the WinRT component background task would be executed in the process. In this approach, the background task would be running in a Low Integrity Level (IL) process (`backgroundtaskhost.exe`) while the main desktop project would be running in a Medium IL process.
2020

21-
If the application needs to to run a background task in a medium IL process itself, the full trust COM component needs to be used for background tasks. In that scenario, developers must use the Windows App SDK [BackgroundTaskBuilder](/windows/windows-app-sdk/api/winrt/microsoft.windows.applicationmodel.background.backgroundtaskbuilder) to register the full trust COM component. Note that the [BackgroundTaskBuilder](/uwp/api/windows.applicationmodel.background.backgroundtaskbuilder) API from the **Windows.ApplicationModel.Background** namespace will throw exceptions while registering of some of the triggers.
21+
If the application needs to run a background task in a medium IL process itself, the full trust COM component needs to be used for background tasks. In that scenario, developers must use the Windows App SDK [BackgroundTaskBuilder](/windows/windows-app-sdk/api/winrt/microsoft.windows.applicationmodel.background.backgroundtaskbuilder) to register the full trust COM component. Note that the [BackgroundTaskBuilder](/uwp/api/windows.applicationmodel.background.backgroundtaskbuilder) API from the **Windows.ApplicationModel.Background** namespace will throw exceptions while registering of some of the triggers.
2222

2323
A full WinUI 3 background task registration sample can be found on [GitHub](https://github.com/microsoft/WindowsAppSDK-Samples/tree/release/experimental/Samples/BackgroundTask).
2424

hub/package-manager/winget/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ See more details on [scope-related issues](https://github.com/microsoft/winget-c
6666

6767
A 403 Forbidden error may occur when attempting to download a package using the WinGet tool. This issue can arise if an Independent Software Vendor (ISV) opts not have their product distributed by a package manager service like WinGet.
6868

69-
The server reponsible for initiating the download typically checks for a user agent string included with the download request to identify the device or client (e.g., browser, WinGet). If you can download the installer using your browser, but encounter issues with WinGet, it is possible that the ISV has blocked the WinGet user agent string.
69+
The server responsible for initiating the download typically checks for a user agent string included with the download request to identify the device or client (e.g., browser, WinGet). If you can download the installer using your browser, but encounter issues with WinGet, it is possible that the ISV has blocked the WinGet user agent string.
7070

7171
The user agent string for WinGet has the following format:
7272

hub/powertoys/command-palette/adding-commands.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ Deploy and reload, and presto - a command to show a message box!
102102
103103
## Adding more pages
104104

105-
So far, we've only worked with commands that "do something". However, you can also add commands that show additional pages withing the Command Palette. There are basically two types of "Commands" in the Palette:
105+
So far, we've only worked with commands that "do something". However, you can also add commands that show additional pages within the Command Palette. There are basically two types of "Commands" in the Palette:
106106
- **IInvokableCommand** - These are commands that *do something*.
107107
- **IPage** - These are commands that *show something*.
108108

hub/powertoys/command-palette/command-results.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ The toolkit provides a number of helper methods to create command results. These
1919

2020
## KeepOpen command result
2121

22-
The **KeepOpen** command result does nothing. It leaves the palette in its current state, with the current page stack and query. This can be useful for commands that want to keep the the user in the Command Palette, to keep working with the current page.
22+
The **KeepOpen** command result does nothing. It leaves the palette in its current state, with the current page stack and query. This can be useful for commands that want to keep the user in the Command Palette, to keep working with the current page.
2323

2424
> [!NOTE]
25-
> Even when returing **KeepOpen**, launching a new app or window from the Command Palette will automatically hide the palette the next window recieves focus.
25+
> Even when returning **KeepOpen**, launching a new app or window from the Command Palette will automatically hide the palette the next window receives focus.
2626
2727
## Hide command result
2828

hub/powertoys/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ PowerToys is currently available in the following languages: Arabic (Saudi Arabi
333333

334334
## PowerToys video walk-through
335335

336-
In this video, Clint Rutkas (PM for PowerToys) walks through how to install and use the various utilities available. He aslo shares some tips, information about how to contribute, and more.
336+
In this video, Clint Rutkas (PM for PowerToys) walks through how to install and use the various utilities available. He also shares some tips, information about how to contribute, and more.
337337

338338
> [!VIDEO https://learn.microsoft.com/shows/Tabs-vs-Spaces/PowerToys-Utilities-to-customize-Windows-10/player?format=ny]
339339

landing/arm-docs/iso.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The primary use for Windows 11 Arm64 ISO files is to create virtual machines on
1919

2020
**Using a Windows on Arm device**: Arm64 ISO files can be used to create a VM in Hyper-V on Windows 11 Arm-based PCs by following the instructions found at [Create a virtual machine with Hyper-V on Windows 11](/virtualization/hyper-v-on-windows/quick-start/create-virtual-machine).
2121

22-
**Using an x64-based Windows device**: Arm64 VMs are not supported in Hyper-V on x64 hardware. To run an Windows on Arm VM from an x64-based device, create an Arm64 VM in the cloud using Azure. Find guidance here: [Quickstart - Create a Windows on Arm VM in the Azure portal](/windows/arm/create-arm-vm).
22+
**Using an x64-based Windows device**: Arm64 VMs are not supported in Hyper-V on x64 hardware. To run a Windows on Arm VM from an x64-based device, create an Arm64 VM in the cloud using Azure. Find guidance here: [Quickstart - Create a Windows on Arm VM in the Azure portal](/windows/arm/create-arm-vm).
2323

2424
**Using an Arm-based Apple device**: Arm64 VMs can be created using Mac computers built with Arm-based Apple Silicon. [Learn more](https://support.microsoft.com/windows/options-for-using-windows-11-with-mac-computers-with-apple-m1-m2-and-m3-chips-cd15fd62-9b34-4b78-b0bc-121baa3c568c) about the options available and some of the limitations that apply.
2525

0 commit comments

Comments
 (0)