From 49a14f85f8fb815b9ba132789443c4842b4d8ab2 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Fri, 20 May 2022 14:13:15 -0700 Subject: [PATCH 1/2] Update Readme and add mention of Windows 11 and WinUI 3 --- .../Pages/About.xaml | 2 +- .../SamplePages/samples.json | 4 ++-- ReadMe.md | 21 +++++++++++++++---- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml index 5e315e800a7..60faaef28c2 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml @@ -154,7 +154,7 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json index 8cdfcc3a619..63c7795dbdf 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json @@ -617,7 +617,7 @@ }, { "Name": "Lottie", - "About": "Lottie-Windows is a library and tools for rendering Lottie animations on Windows 10.", + "About": "Lottie-Windows is a library and tools for rendering Lottie animations on Windows 10 and Windows 11.", "Subcategory": "Effect", "Icon": "/Assets/Helpers.png", "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/animations/Lottie.md", @@ -1310,7 +1310,7 @@ { "Name": "GazeTracing", "Type": "GazeTracingPage", - "About": "Shows how to use the Windows 10 API for eye trackers", + "About": "Shows how to use the Windows API for eye trackers", "CodeUrl" : "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.Input.GazeInteraction", "XamlCodeFile": "GazeTracingXaml.bind", "CodeFile": "GazeTracingCode.bind", diff --git a/ReadMe.md b/ReadMe.md index 17aa154349e..8a8e3618144 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,11 +1,14 @@ # ๐Ÿงฐ Windows Community Toolkit -The Windows Community Toolkit is a collection of helper functions, custom controls, and app services. It simplifies and demonstrates common developer patterns when building experiences for Windows 10. +The Windows Community Toolkit is a collection of helper functions, custom controls, and app services. It simplifies and demonstrates common developer patterns when building experiences for Windows 10 and Windows 11. It contains components and helpers for both UWP and WinUI 3/WinAppSDK applications. Find out more about our support for [WinUI 3 here](https://aka.ms/wct-winui3). + +**Note**: Our general helpers for .NET are now the [.NET Community Toolkit](https://aka.ms/toolkit/dotnet), including the [MVVM Toolkit](https://aka.ms/mvvmtoolkit). | Target | Branch | Status | Recommended package version | | ------ | ------ | ------ | ------ | -| Production | rel/7.1.1 | [![Build Status](https://dev.azure.com/dotnet/CommunityToolkit/_apis/build/status/Toolkit-CI?branchName=rel/7.1.1)](https://dev.azure.com/dotnet/CommunityToolkit/_build/latest?definitionId=10&branchName=rel/7.1.1) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Toolkit.Uwp.svg)](https://www.nuget.org/profiles/Microsoft.Toolkit) | +| Production (UWP) | rel/7.1.2 | [![Build Status](https://dev.azure.com/dotnet/CommunityToolkit/_apis/build/status/Toolkit-CI?branchName=rel/7.1.2)](https://dev.azure.com/dotnet/CommunityToolkit/_build/latest?definitionId=10&branchName=rel/7.1.2) | [![NuGet](https://img.shields.io/nuget/v/Microsoft.Toolkit.Uwp.svg)](https://www.nuget.org/profiles/Microsoft.Toolkit) | +| Production (WinAppSDK/WinUI 3) | rel/winui/7.1.2 | [![Build Status](https://dev.azure.com/dotnet/CommunityToolkit/_apis/build/status/Toolkit-CI?branchName=rel/winui/7.1.2)](https://dev.azure.com/dotnet/CommunityToolkit/_build/latest?definitionId=10&branchName=rel/winui/7.1.2) | [![NuGet](https://img.shields.io/nuget/v/CommunityToolkit.WinUI.svg)](https://www.nuget.org/packages?q=CommunityToolkit.WinUI) | | Previews | main | [![Build Status](https://dev.azure.com/dotnet/CommunityToolkit/_apis/build/status/Toolkit-CI?branchName=main)](https://dev.azure.com/dotnet/CommunityToolkit/_build/latest?definitionId=10) | [![DevOps](https://vsrm.dev.azure.com/dotnet/_apis/public/Release/badge/696bc9fd-f160-4e97-a1bd-7cbbb3b58f66/1/1)](https://dev.azure.com/dotnet/CommunityToolkit/_packaging?_a=feed&feed=CommunityToolkit-MainLatest) | ## ๐Ÿ™Œ Getting Started @@ -20,6 +23,14 @@ All documentation for the toolkit is hosted on [Microsoft Docs](https://docs.mic Want to see the toolkit in action before jumping into the code? Download and play with the [Windows Community Toolkit Sample App](https://www.microsoft.com/store/apps/9nblggh4tlcq) from the Store. +## ๐Ÿงช Toolkit Labs for Windows ๐Ÿ’ป + +We're in the process of migrating our development process to the upcoming Toolkit Labs for Windows, find out more in [this issue here](https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/4487). + +## โ‰ Support + +If you need help with something or have an idea, feel free to start a [Discussion](https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions) or find us on [Discord](https://aka.ms/wct/discord). If you have detailed repro steps, open an [issue here instead](https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/new/choose). + ## ๐Ÿš€ Contribution Do you want to contribute? Check out our [Windows Community Toolkit Wiki](https://aka.ms/wct/wiki) page to learn more about contribution and guidelines. @@ -35,11 +46,13 @@ The [Features list](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs ## ๐Ÿ’  Principles 1. The toolkit will be kept simple. -2. As soon as a comparable feature is available in the Windows SDK for Windows 10, it will be marked as deprecated. -3. All features will be supported for two Windows SDK for Windows 10 release cycles or until another principle supersedes it. +2. As soon as a comparable feature is available in the Windows SDK for Windows, it will be marked as deprecated. +3. All features will be supported for two Windows SDK for Windows release cycles or until another principle supersedes it. ## ๐ŸŒ Roadmap +[See our 2022 Plans here](https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/4486). + Read what we [plan for next iterations](https://github.com/CommunityToolkit/WindowsCommunityToolkit/milestones), and feel free to ask questions. Check out our [Preview Packages Wiki Page](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki/Preview-Packages) to learn more about updating your NuGet sources in Visual Studio, then you can also get pre-release packages of upcoming versions to try. From cbe6959e7d8856753439958622eb9f2675dffcee Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Fri, 20 May 2022 14:48:36 -0700 Subject: [PATCH 2/2] Update Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml Co-authored-by: Arlo --- Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml index 60faaef28c2..1c6e9056b0c 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml @@ -154,7 +154,7 @@