Skip to content

Commit 245f90c

Browse files
Merge pull request #6440 from MicrosoftDocs/main639088478757654776sync_temp
For protected branch, push strategy should use PR and merge to target branch method to work around git push error
2 parents f9b8e17 + 79c800c commit 245f90c

13 files changed

Lines changed: 33 additions & 34 deletions

File tree

hub/apps/desktop/index.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ landingContent:
2424
url: ../get-started/start-here.md
2525
- text: An overview of UI frameworks
2626
url: ../get-started/index.md
27-
- text: Window App SDK
27+
- text: Windows App SDK
2828
url: ../windows-app-sdk/index.md
2929

3030
- title: Design and UI
@@ -115,7 +115,7 @@ landingContent:
115115
url: /answers/questions/
116116
- text: "@WindowsDocs"
117117
url: https://twitter.com/WindowsDocs
118-
- text: OneDevMinute on YouTube
118+
- text: OneDevMinute on Microsoft Learn
119119
url: /shows/One-Dev-Minute/?WT.mc_id=odm-c9-niner
120120
- text: Windows developer support
121121
url: https://developer.microsoft.com/windows/support

hub/apps/get-started/best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ For Windows 11, we improved the behavior of the Share dialog in several ways.
136136

137137
- Discoverability settings for nearby sharing are now at the top of the dialog and more settings are available at the bottom.
138138
- All apps can now participate in the Share dialog as targets, including unpackaged desktop apps and PWAs that are installed through Microsoft Edge.
139-
- A previously unpackaged desktop app can participate as a target in the Share dialog if you package it with external location (see [Grant package identity by packaging with external location](../desktop/modernize/grant-identity-to-nonpackaged-apps.md)). For sample code that demonstrates how to do that, see the [SparsePackages](https://github.com/microsoft/AppModelSamples/tree/master/Samples/SparsePackages) sample app.
139+
- A previously unpackaged desktop app can participate as a target in the Share dialog if you package it with external location (see [Grant package identity by packaging with external location](../desktop/modernize/grant-identity-to-nonpackaged-apps.md)). For sample code that demonstrates how to do that, see the [PackageWithExternalLocation](https://github.com/microsoft/AppModelSamples/tree/master/Samples/PackageWithExternalLocation) sample app.
140140
- A PWA can participate in the Share dialog if it implements the [Web Share Target API](/microsoft-edge/progressive-web-apps-chromium/webappmanifests#identify-your-app-as-a-share-target).
141141

142142
![An image of the Share dialog in Windows 11](images/great-apps/share-target.png)
@@ -324,7 +324,7 @@ In fact, the [World Health Organization](https://www.who.int/news-room/fact-shee
324324
>
325325
> **Accessibility is an opportunity**
326326
>
327-
> According to the [Microsoft Accessibility Approach Datasheet](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE4wNu4): Inclusive organizations that embrace best practices for employing and supporting persons with disabilities in the workplace outperform their peers and do better at attracting and keeping top talent. Millennials, who are 75% of the global workforce, typically choose employers who reflect their values. Diversity and inclusion top that list.
327+
> Inclusive organizations that embrace best practices for employing and supporting persons with disabilities in the workplace outperform their peers and do better at attracting and keeping top talent. Millennials, who are 75% of the global workforce, typically choose employers who reflect their values. Diversity and inclusion top that list.
328328
329329
### Incorporating accessibility
330330

hub/apps/tutorials/winui-notes/note.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ Now you're going to add code to the **NotePage.xaml.cs** code-behind file to han
161161

162162
### Add event handlers
163163

164-
Next, add the [Click](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.primitives.buttonbase.click) event handlers for the for the **Save** and **Delete** buttons. Adding event handlers is something that you'll do often while creating your apps, so Visual Studio provides several features to make it easier.
164+
Next, add the [Click](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.controls.primitives.buttonbase.click) event handlers for the **Save** and **Delete** buttons. Adding event handlers is something that you'll do often while creating your apps, so Visual Studio provides several features to make it easier.
165165

166166
1. In the **NotePage.xaml** file, place your cursor after the `Content` attribute in the **Save** `Button` control. Type `Click=`. At this point, Visual Studio should pop up an auto-complete UI that looks like this:
167167

hub/apps/tutorials/winui-notes/project.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ You'll also add a [Frame](/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.c
8989
</Grid>
9090
```
9191

92-
1. Save the file by pressing <kbd>CTRL + S</kbd>, clicking the Save icon in the tool bar, or by selecting the menu **File** > **Save MainPage.xaml**.
92+
1. Save the file by pressing <kbd>CTRL + S</kbd>, clicking the Save icon in the tool bar, or by selecting the menu **File** > **Save MainWindow.xaml**.
9393

9494
Don't worry if you don't understand what all this XAML markup does right now. As you build the rest of the app UI, we'll explain XAML concepts in more detail.
9595

hub/apps/tutorials/winui-notes/view-model.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ no-loc: ["NotePage.xaml", "NotePage.xaml.cs", "Note.cs", "AllNotesPage", "WinUIN
1111

1212
This portion of the tutorial introduces the concepts of data views and models.
1313

14-
In the previous steps of the tutorial, you added a new page to the project that lets the user save, edit, or delete a single note. However, because the app needs to handle more than one note, you need to add another page that displays all the notes (call it `AllNotesPage`). This page let's the user choose a note to open in the editor page so they can view, edit, or delete it. It should also let the user create a new note.
14+
In the previous steps of the tutorial, you added a new page to the project that lets the user save, edit, or delete a single note. However, because the app needs to handle more than one note, you need to add another page that displays all the notes (call it `AllNotesPage`). This page lets the user choose a note to open in the editor page so they can view, edit, or delete it. It should also let the user create a new note.
1515

1616
To accomplish this, `AllNotesPage` needs to have a collection of notes, and a way to display the collection. This is where the app runs into trouble because the note data is tightly bound to the `NotePage` file. In `AllNotesPage`, you just want to display all the notes in a list or other collection view, with information about each note, like the date it was created and a preview of the text. With the note text being tightly bound to the `TextBox` control, there's no way to do this.
1717

@@ -231,7 +231,7 @@ Now you can update the XAML file to use the `Note` model. Previously, you read t
231231
1. Add a `Text` attribute to the `TextBox` control. Bind it to the `Text` property of `noteModel`: `Text="{x:Bind noteModel.Text, Mode=TwoWay}"`.
232232
1. Update the `Header` to bind to the `Date` property of `noteModel`: `Header="{x:Bind noteModel.Date.ToString()}"`.
233233

234-
```csharp
234+
```xaml
235235
<TextBox x:Name="NoteEditor"
236236
<!--Add this line. ↓ -->
237237
Text="{x:Bind noteModel.Text, Mode=TwoWay}"

hub/apps/windows-app-sdk/downloads-archive.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -228,26 +228,26 @@ None at present.
228228

229229
| Version | SDK downloads | Runtime downloads |
230230
|---|---|---|
231-
| **Version 1.0.4** <br> 06/14/2022 <br> [Release notes](release-notes-archive/stable-channel-1.0.md#version-104) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.4/vsix-2022-cs)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.4/vsix-2022-cpp) <br/> [C# Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.4/vsix-2019-cs)<br/>[C++ Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.4/vsix-2019-cpp) | [Installer (x64)](https://aka.ms/windowsappsdk/1.0/1.0.4/windowsappruntimeinstall-1.0.4-x64.exe) <br/> [Installer (x86)](https://aka.ms/windowsappsdk/1.0/1.0.4/windowsappruntimeinstall-1.0.4-x86.exe) <br/> [Installer (arm64)](https://aka.ms/windowsappsdk/1.0/1.0.4/windowsappruntimeinstall-1.0.4-arm64.exe) <br/> [Redistributable](https://aka.ms/windowsappsdk/1.0/1.0.4/windowsappruntimeredist-1.0.4.zip) |
232-
| **1.0.3** <br> 04/18/2022 <br> [Release notes](release-notes-archive/stable-channel-1.0.md#version-103) | No new Visual Studio extensions. | [Installer (x64)](https://aka.ms/windowsappsdk/1.0/1.0.3/windowsappruntimeinstall-1.0.3-x64.exe) <br/> [Installer (x86)](https://aka.ms/windowsappsdk/1.0/1.0.3/windowsappruntimeinstall-1.0.3-x86.exe) <br/> [Installer (arm64)](https://aka.ms/windowsappsdk/1.0/1.0.3/windowsappruntimeinstall-1.0.3-arm64.exe) <br/> [Redistributable](https://aka.ms/windowsappsdk/1.0/1.0.3/windowsappruntimeredist-1.0.3.zip) |
233-
| **1.0.2** <br> 04/05/2022 <br> [Release notes](release-notes-archive/stable-channel-1.0.md#version-102) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.2/vsix-2022-cs)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.2/vsix-2022-cpp) <br/> [C# Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.2/vsix-2019-cs)<br/>[C++ Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.2/vsix-2019-cpp)| [Installer (x64)](https://aka.ms/windowsappsdk/1.0/1.0.2/windowsappruntimeinstall-1.0.2-x64.exe) <br/> [Installer (x86)](https://aka.ms/windowsappsdk/1.0/1.0.2/windowsappruntimeinstall-1.0.2-x86.exe) <br/> [Installer (arm64)](https://aka.ms/windowsappsdk/1.0/1.0.2/windowsappruntimeinstall-1.0.2-arm64.exe) <br/> [Redistributable](https://aka.ms/windowsappsdk/1.0/1.0.2/windowsappruntimeredist-1.0.2.zip) |
234-
| **1.0.1** <br> 03/15/2022 <br> [Release notes](release-notes-archive/stable-channel-1.0.md#version-101) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.1/vsix-2022-cs)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.1/vsix-2022-cpp) <br/> [C# Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.1/vsix-2019-cs)<br/>[C++ Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.1/vsix-2019-cpp)| [Installer (x64)](https://aka.ms/windowsappsdk/1.0/1.0.1/windowsappruntimeinstall-1.0.1-x64.exe) <br/> [Installer (x86)](https://aka.ms/windowsappsdk/1.0/1.0.1/windowsappruntimeinstall-1.0.1-x86.exe) <br/> [Installer (arm64)](https://aka.ms/windowsappsdk/1.0/1.0.1/windowsappruntimeinstall-1.0.1-arm64.exe) <br/> [Redistributable](https://aka.ms/windowsappsdk/1.0/1.0.1/windowsappruntimeredist-1.0.1.zip) |
235-
| **1.0.0** <br> 11/16/2021 <br> [Release notes](release-notes-archive/stable-channel-1.0.md#version-10) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/stable-vsix-2022-cs)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/stable-vsix-2022-cpp) <br/> C# Visual Studio 2019 extension (no longer available)<br/>C++ Visual Studio 2019 extension(no longer available)| [Redistributable](https://aka.ms/windowsappsdk/1.0-stable/msix-installer) |
236-
| **0.8** <br> 06/24/2021 <br> [Release notes](release-notes-archive/stable-channel-0.8.md#version-08) | Visual Studio extension(no longer available) | [Redistributable](https://github.com/microsoft/WindowsAppSDK/releases/tag/v0.8.0) |
231+
| **Version 1.0.4** <br> 06/14/2022 <br> [Release notes](./release-notes/windows-app-sdk-1-0.md#version-104) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.4/vsix-2022-cs)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.4/vsix-2022-cpp) <br/> [C# Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.4/vsix-2019-cs)<br/>[C++ Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.4/vsix-2019-cpp) | [Installer (x64)](https://aka.ms/windowsappsdk/1.0/1.0.4/windowsappruntimeinstall-1.0.4-x64.exe) <br/> [Installer (x86)](https://aka.ms/windowsappsdk/1.0/1.0.4/windowsappruntimeinstall-1.0.4-x86.exe) <br/> [Installer (arm64)](https://aka.ms/windowsappsdk/1.0/1.0.4/windowsappruntimeinstall-1.0.4-arm64.exe) <br/> [Redistributable](https://aka.ms/windowsappsdk/1.0/1.0.4/windowsappruntimeredist-1.0.4.zip) |
232+
| **1.0.3** <br> 04/18/2022 <br> [Release notes](./release-notes/windows-app-sdk-1-0.md#version-103) | No new Visual Studio extensions. | [Installer (x64)](https://aka.ms/windowsappsdk/1.0/1.0.3/windowsappruntimeinstall-1.0.3-x64.exe) <br/> [Installer (x86)](https://aka.ms/windowsappsdk/1.0/1.0.3/windowsappruntimeinstall-1.0.3-x86.exe) <br/> [Installer (arm64)](https://aka.ms/windowsappsdk/1.0/1.0.3/windowsappruntimeinstall-1.0.3-arm64.exe) <br/> [Redistributable](https://aka.ms/windowsappsdk/1.0/1.0.3/windowsappruntimeredist-1.0.3.zip) |
233+
| **1.0.2** <br> 04/05/2022 <br> [Release notes](./release-notes/windows-app-sdk-1-0.md#version-102) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.2/vsix-2022-cs)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.2/vsix-2022-cpp) <br/> [C# Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.2/vsix-2019-cs)<br/>[C++ Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.2/vsix-2019-cpp)| [Installer (x64)](https://aka.ms/windowsappsdk/1.0/1.0.2/windowsappruntimeinstall-1.0.2-x64.exe) <br/> [Installer (x86)](https://aka.ms/windowsappsdk/1.0/1.0.2/windowsappruntimeinstall-1.0.2-x86.exe) <br/> [Installer (arm64)](https://aka.ms/windowsappsdk/1.0/1.0.2/windowsappruntimeinstall-1.0.2-arm64.exe) <br/> [Redistributable](https://aka.ms/windowsappsdk/1.0/1.0.2/windowsappruntimeredist-1.0.2.zip) |
234+
| **1.0.1** <br> 03/15/2022 <br> [Release notes](./release-notes/windows-app-sdk-1-0.md#version-101) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.1/vsix-2022-cs)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0/1.0.1/vsix-2022-cpp) <br/> [C# Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.1/vsix-2019-cs)<br/>[C++ Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0/1.0.1/vsix-2019-cpp)| [Installer (x64)](https://aka.ms/windowsappsdk/1.0/1.0.1/windowsappruntimeinstall-1.0.1-x64.exe) <br/> [Installer (x86)](https://aka.ms/windowsappsdk/1.0/1.0.1/windowsappruntimeinstall-1.0.1-x86.exe) <br/> [Installer (arm64)](https://aka.ms/windowsappsdk/1.0/1.0.1/windowsappruntimeinstall-1.0.1-arm64.exe) <br/> [Redistributable](https://aka.ms/windowsappsdk/1.0/1.0.1/windowsappruntimeredist-1.0.1.zip) |
235+
| **1.0.0** <br> 11/16/2021 <br> [Release notes](./release-notes/windows-app-sdk-1-0.md#version-10) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/stable-vsix-2022-cs)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/stable-vsix-2022-cpp) <br/> C# Visual Studio 2019 extension (no longer available)<br/>C++ Visual Studio 2019 extension(no longer available)| [Redistributable](https://aka.ms/windowsappsdk/1.0-stable/msix-installer) |
236+
| **0.8** <br> 06/24/2021 <br> [Release notes](./release-notes/windows-app-sdk-0-8.md#version-080-stable) | Visual Studio extension(no longer available) | [Redistributable](https://github.com/microsoft/WindowsAppSDK/releases/tag/v0.8.0) |
237237
| **0.5** <br> 03/29/2021 |||
238238
| 0.1 <br> 12/11/2020 |||
239239

240240
## Out-of-support preview releases
241241

242242
| Version | SDK downloads | Runtime downloads |
243243
|---|---|---|
244-
| **Version 1.0 Preview 3 (1.0.0-preview3)** <br> 10/27/2021 <br> [Release notes](release-notes-archive/preview-channel-1.0.md#version-10-preview-3-100-preview3) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0-preview3/extension/VS2022/csharp)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0-preview3/extension/VS2022/cpp) <br/> [C# Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0-preview3/extension/VS2019/csharp)<br/>[C++ Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0-preview3/extension/VS2019/cpp)| [Redistributable](https://aka.ms/windowsappsdk/1.0-preview3/msix-installer) |
245-
|**1.0 Preview 2** <br> 10/5/2021 <br> [Release notes](release-notes-archive/preview-channel-1.0.md#version-10-preview-2-100-preview2) |||
246-
|**1.0 Preview 1** <br> 09/17/2021 <br> [Release notes](release-notes-archive/preview-channel-1.0.md#version-10-preview-1-100-preview1) |||
244+
| **Version 1.0 Preview 3 (1.0.0-preview3)** <br> 10/27/2021 <br> [Release notes](./release-notes/windows-app-sdk-1-0.md#winui-3-100-preview3) | [C# Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0-preview3/extension/VS2022/csharp)<br/>[C++ Visual Studio 2022 extension](https://aka.ms/windowsappsdk/1.0-preview3/extension/VS2022/cpp) <br/> [C# Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0-preview3/extension/VS2019/csharp)<br/>[C++ Visual Studio 2019 extension](https://aka.ms/windowsappsdk/1.0-preview3/extension/VS2019/cpp)| [Redistributable](https://aka.ms/windowsappsdk/1.0-preview3/msix-installer) |
245+
|**1.0 Preview 2** <br> 10/5/2021 <br> [Release notes](./release-notes/windows-app-sdk-1-0.md#version-10-preview-2-100-preview2) |||
246+
|**1.0 Preview 1** <br> 09/17/2021 <br> [Release notes](./release-notes/windows-app-sdk-1-0.md#version-10-preview-2-100-preview2) |||
247247

248248
## Out-of-support experimental releases
249249

250250
| Version | SDK downloads | Runtime downloads |
251251
|---|---|---|
252-
| **1.0.0 Experimental**<br>08/09/2021<br> [Release notes](release-notes-archive/experimental-channel-1.0.md#version-10-experimental-100-experimental1) || [Redistributable](https://github.com/microsoft/WindowsAppSDK/releases/tag/1.0.0-experimental1) |
253-
| **0.8 Experimental** <br> 05/27/2021 <br> [Release notes](release-notes-archive/experimental-channel-0.8.md#version-08-preview-080-preview) | [Visual Studio extension](https://github.com/microsoft/WindowsAppSDK/releases/tag/v0.8.0-rc) | [Redistributable](https://github.com/microsoft/WindowsAppSDK/releases/tag/v0.8-preview) |
252+
| **1.0.0 Experimental**<br>08/09/2021<br> [Release notes](./release-notes/windows-app-sdk-1-0.md#version-10-experimental-100-experimental1) || [Redistributable](https://github.com/microsoft/WindowsAppSDK/releases/tag/1.0.0-experimental1) |
253+
| **0.8 Experimental** <br> 05/27/2021 <br> [Release notes](./release-notes/windows-app-sdk-0-8.md#version-08-preview-080-preview) | [Visual Studio extension](https://github.com/microsoft/WindowsAppSDK/releases/tag/v0.8.0-rc) | [Redistributable](https://github.com/microsoft/WindowsAppSDK/releases/tag/v0.8-preview) |

hub/apps/windows-app-sdk/release-notes/project-reunion-0-5-preview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ For more information on affected APIs as well as workarounds and replacements fo
215215
- `INotifyCollectionChanged`
216216
- `ICommand`
217217

218-
The `System` namespace versions still exist, but cannot be used with WinUI 3. This means that `ObservableCollection` doesn't work as-is in WinUI 3 C# UWP apps. For a workaround, see the [CollectionsInterop sample](https://github.com/microsoft/Xaml-Controls-Gallery/blob/winui3preview/XamlControlsGallery/CollectionsInterop.cs) in the [XAML Controls Gallery sample](https://github.com/microsoft/Xaml-Controls-Gallery/tree/winui3preview).
218+
The `System` namespace versions still exist, but cannot be used with WinUI 3. This means that `ObservableCollection` doesn't work as-is in WinUI 3 C# UWP apps. For a workaround, see the [CollectionsInterop sample](https://github.com/microsoft/WinUI-Gallery/blob/main/WinUIGallery/CollectionsInterop.cs) in the [XAML Controls Gallery sample](https://github.com/microsoft/WinUI-Gallery).
219219

220220
## XAML Controls Gallery (WinUI 3 Preview branch)
221221

0 commit comments

Comments
 (0)