diff --git a/.editorconfig b/.editorconfig index 167a3bb3dc0..2786b81bfd7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,8 +1,8 @@ # Remove the line below if you want to inherit .editorconfig settings from higher directories root = true -# C# files -[*.cs] +# All files +[*] #### Core EditorConfig Options #### @@ -10,14 +10,40 @@ root = true charset = utf-8 # Indentation and spacing +tab_width = 4 indent_size = 4 indent_style = space -tab_width = 4 # New line preferences -end_of_line = crlf +end_of_line = unset insert_final_newline = false +#### Build files #### + +# Solution files +[*.{sln,slnx}] +tab_width = 4 +indent_size = 4 +indent_style = tab + +# Configuration files +[*.{json,xml,yml,config,runsettings}] +indent_size = 2 + +# MSBuild files +[*.{slnf,props,targets,projitems,csproj,shproj}] +indent_size = 2 + +#### Source files #### + +# Markdown files +[*.md] +indent_size = 2 +insert_final_newline = true + +# C# files +[*.cs] + #### .NET Coding Conventions #### # this. and Me. preferences @@ -138,8 +164,8 @@ csharp_space_between_square_brackets = false csharp_preserve_single_line_blocks = true csharp_preserve_single_line_statements = true - # Naming Symbols + # constant_fields - Define constant fields dotnet_naming_symbols.constant_fields.applicable_kinds = field dotnet_naming_symbols.constant_fields.required_modifiers = const @@ -171,6 +197,7 @@ dotnet_naming_symbols.non_interface_types.applicable_kinds dotnet_naming_symbols.interface_types.applicable_kinds = interface # Naming Styles + # camel_case - Define the camelCase style dotnet_naming_style.camel_case.capitalization = camel_case # pascal_case - Define the Pascal_case style @@ -239,15 +266,8 @@ dotnet_naming_rule.interface_types_must_be_prefixed_with_i.style dotnet_naming_style.prefix_private_field_with_underscore.capitalization = camel_case dotnet_naming_style.prefix_private_field_with_underscore.required_prefix = _ -# Code files +# .NET Code Analysis -# SA1009: Closing parenthesis should be spaced correctly -# Needed for null forgiving operator after functions, "foo()!" -dotnet_diagnostic.SA1009.severity = none - -[*.{cs,vb}] - -# Migrate back from old Toolkit.ruleset dotnet_diagnostic.CA1001.severity = warning dotnet_diagnostic.CA1009.severity = warning dotnet_diagnostic.CA1016.severity = warning @@ -310,24 +330,43 @@ dotnet_diagnostic.CA2238.severity = warning dotnet_diagnostic.CA2240.severity = warning dotnet_diagnostic.CA2241.severity = warning dotnet_diagnostic.CA2242.severity = warning + +# StyleCop Code Analysis + +# Closing parenthesis should be spaced correctly: "foo()!" +dotnet_diagnostic.SA1009.severity = none + +# Hide warnings when using the new() expression from C# 9. +dotnet_diagnostic.SA1000.severity = none + dotnet_diagnostic.SA1011.severity = none dotnet_diagnostic.SA1101.severity = none + +# Hide warnings when accessing properties without "this". +dotnet_diagnostic.SA1101.severity = none dotnet_diagnostic.SA1118.severity = none dotnet_diagnostic.SA1200.severity = none dotnet_diagnostic.SA1201.severity = none dotnet_diagnostic.SA1202.severity = none dotnet_diagnostic.SA1309.severity = none dotnet_diagnostic.SA1310.severity = none + +# Hide warnings for record parameters. +dotnet_diagnostic.SA1313.severity = none + +# TypeParameterNamesMustBeginWithT: We do have a few templates that don't start with T. We need to double check that changing this is not a breaking change. If not, we can re-enable this. +dotnet_diagnostic.SA1314.severity = none + +# UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline initializers. It's also debatable if we want this or not. +dotnet_diagnostic.SA1413.severity = none + dotnet_diagnostic.SA1600.severity = none dotnet_diagnostic.SA1602.severity = none dotnet_diagnostic.SA1611.severity = none + +# DocumentationTextMustEndWithAPeriod: Let's enable this rule back when we shift to WinUI3 (v8.x). If we do it now, it would mean more than 400 file changes. +dotnet_diagnostic.SA1629.severity = none + dotnet_diagnostic.SA1633.severity = none dotnet_diagnostic.SA1634.severity = none dotnet_diagnostic.SA1652.severity = none - -dotnet_diagnostic.SA1629.severity = none # DocumentationTextMustEndWithAPeriod: Let's enable this rule back when we shift to WinUI3 (v8.x). If we do it now, it would mean more than 400 file changes. -dotnet_diagnostic.SA1413.severity = none # UseTrailingCommasInMultiLineInitializers: This would also mean a lot of changes at the end of all multiline initializers. It's also debatable if we want this or not. -dotnet_diagnostic.SA1314.severity = none # TypeParameterNamesMustBeginWithT: We do have a few templates that don't start with T. We need to double check that changing this is not a breaking change. If not, we can re-enable this. -dotnet_diagnostic.SA1000.severity = none # Hide warnings when using the new() expression from C# 9. -dotnet_diagnostic.SA1313.severity = none # Hide warnings for record parameters. -dotnet_diagnostic.SA1101.severity = none # Hide warnings when accessing properties without "this". diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 5a46684f76d..510e2f03e7b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -9,7 +9,7 @@ assignees: '' +IF NOT CERTAIN ABOUT THE ISSUE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "QUESTIONS & HELP" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/questions-help] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE ISSUE 🚨 --> ## Describe the bug A clear and concise description of what the bug is. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index c76d8f07908..55100a7ecff 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -9,7 +9,7 @@ assignees: '' +IF NOT CERTAIN ABOUT THE FEATURE AND REQUIRE MORE CLARITY THEN PLEASE POST ON "IDEAS" CATEGORY OF THE DISCUSSIONS PLATFORM [https://github.com/CommunityToolkit/WindowsCommunityToolkit/discussions/categories/ideas] WHERE YOU CAN DISCUSS AND ENAGAGE WITH THE COMMUNITY TO GAIN FURTHER CLAIRITY REGARDING THE FEATURE 🚨 --> ## Describe the problem this feature would solve - [ ] Sample in sample app has been added / updated (for bug fixes / features) - - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets) -- [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/windows-toolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc... + - [ ] Icon has been created (if new sample) following the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets) +- [ ] New major technical changes in the toolkit have or will be added to the [Wiki](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki) e.g. build changes, source generators, testing infrastructure, sample creation changes, etc... - [ ] Tests for the changes have been added (for bug fixes / features) (if applicable) - [ ] Header has been added to all new source files (run *build/UpdateHeaders.bat*) - [ ] Contains **NO** breaking changes diff --git a/Contributing.md b/Contributing.md index b32b2127d45..6e784b3635d 100644 --- a/Contributing.md +++ b/Contributing.md @@ -12,16 +12,16 @@ Due to the high volume of incoming issues please keep our GitHub issues for bug For missing documentation related question, please file an issue at [Microsoft Docs](https://github.com/MicrosoftDocs/WindowsCommunityToolkitDocs/issues/new). ## Fix a Bug :bug: -If you find any bug, you can help the community by [submitting an issue](https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=bug+%3Abug%3A&template=bug_report.md&title=). Once the issue is filed, feel free to start working on the PR and submit a PR. +If you find any bug, you can help the community by [submitting an issue](https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=bug+%3Abug%3A&template=bug_report.md&title=). Once the issue is filed, feel free to start working on the PR and submit a PR. ## Good First Issue :ok_hand: -If this is your first time contributing to the Windows Community Toolkit and do not have advanced level programming experience, we have got you covered :boom: WCT has a list of [good first issue](https://github.com/windows-toolkit/WindowsCommunityToolkit/labels/good%20first%20issue%20%3Aok_hand%3A) that can be a great entryway to find and fix any issues that best fit your expertise or technical background. +If this is your first time contributing to the Windows Community Toolkit and do not have advanced level programming experience, we have got you covered :boom: WCT has a list of [good first issue](https://github.com/CommunityToolkit/WindowsCommunityToolkit/labels/good%20first%20issue%20%3Aok_hand%3A) that can be a great entryway to find and fix any issues that best fit your expertise or technical background. ## Help Wanted :raising_hand: -WCT has a list of issues that are labeled as [help wanted](https://github.com/windows-toolkit/WindowsCommunityToolkit/labels/help%20wanted%20%3Araising_hand%3A). The level of complexity in the list can vary but if you have an advanced level of programming experience, feel free to jump in to solve these issues. +WCT has a list of issues that are labeled as [help wanted](https://github.com/CommunityToolkit/WindowsCommunityToolkit/labels/help%20wanted%20%3Araising_hand%3A). The level of complexity in the list can vary but if you have an advanced level of programming experience, feel free to jump in to solve these issues. ## Add New Feature :mailbox_with_mail: -* To contribute a new feature, fill out the [Feature Request Template](https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=feature+request+%3Amailbox_with_mail%3A&template=feature_request.md&title=%5BFeature%5D) and provide detailed information to express the proposal. +* To contribute a new feature, fill out the [Feature Request Template](https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/new?assignees=&labels=feature+request+%3Amailbox_with_mail%3A&template=feature_request.md&title=%5BFeature%5D) and provide detailed information to express the proposal. * Once the Feature Request is submitted, it will be open for discussion. * If it gets approved by the team, proceed to submit a PR of the proposed Feature. * If the PR contains an error-free code and the reviewer signs off, the PR will be merged. diff --git a/Directory.Build.props b/Directory.Build.props index aebd7b6929a..63fd9d141d7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,63 +1,65 @@ - Microsoft.Toolkit - true - true - https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png - images\nuget.png - https://github.com/windows-toolkit/WindowsCommunityToolkit - MIT - https://github.com/windows-toolkit/WindowsCommunityToolkit/releases - (c) .NET Foundation and Contributors. All rights reserved. - en-US - $(MSBuildProjectName.Contains('.Design')) - $(MSBuildProjectName.Contains('Test')) - $(MSBuildProjectName.Contains('Uwp')) - $(MSBuildProjectName.Contains('Sample')) - 10.0 - 19041 - 17763 - $(MSBuildThisFileDirectory)bin\nupkg + $(MSBuildThisFileDirectory) + $(RepositoryDirectory)build\ - - true - + - + true + $(RepositoryDirectory)bin\nupkg + true + true false + false + $(NoWarn);CS8002;SA0001 - + - true + + $(NoWarn);CS8002 + + true - - - + + + false false + + + + + + + + + - + true @@ -67,51 +69,9 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - - - - - - - - - - - - - - - - - - true - - - - - - - - $(NoWarn);8002 - - - - - - - - - stylecop.json - - - - - - - - + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index 4b3849792b5..d719a7455cd 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,12 +1,16 @@ + + - true + + true + false - + true $(MSBuildThisFileDirectory)toolkit.snk @@ -14,8 +18,9 @@ - - + + + diff --git a/GazeInputTest/GazeInputTest.csproj b/GazeInputTest/GazeInputTest.csproj index cca2cf2c13f..28a650ed0be 100644 --- a/GazeInputTest/GazeInputTest.csproj +++ b/GazeInputTest/GazeInputTest.csproj @@ -17,12 +17,12 @@ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true false + $(NoWarn);2008 true bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x86 false @@ -33,7 +33,6 @@ bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x86 false @@ -45,7 +44,6 @@ true bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM false @@ -56,7 +54,6 @@ bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM false @@ -68,7 +65,6 @@ true bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM64 false @@ -79,7 +75,6 @@ bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM64 false @@ -91,7 +86,6 @@ true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x64 false @@ -102,7 +96,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x64 false diff --git a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt b/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt index 7af1a8a98d9..22bf00947e7 100644 --- a/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt +++ b/Microsoft.Toolkit.Diagnostics/Generated/Guard.Collection.tt @@ -266,7 +266,7 @@ GenerateTextForItems(EnumerableTypes, item => // in 2-complement to perform the bounds check with a single compare operation. // This is the same trick used throughout CoreCLR as well. // For more info and code sample, see the original conversation here: - // https://github.com/windows-toolkit/WindowsCommunityToolkit/pull/3131#discussion_r390682835 + // https://github.com/CommunityToolkit/WindowsCommunityToolkit/pull/3131#discussion_r390682835 #> if ((uint)index < (uint)<#=item.Name#>.<#=item.Size#>) { diff --git a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj index 531855099c1..9c1f7d0a868 100644 --- a/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj +++ b/Microsoft.Toolkit.Diagnostics/Microsoft.Toolkit.Diagnostics.csproj @@ -1,17 +1,19 @@ - netstandard1.4;netstandard2.0;netstandard2.1;net5.0 - 9.0 + Enable true - enable - Windows Community Toolkit Diagnostics .NET Standard + netstandard1.4;netstandard2.0;netstandard2.1;net5.0 + + + + Windows Community Toolkit - Diagnostics (.NET Standard) This package includes .NET Standard code only helpers such as: - Guard: Helper methods to verify conditions when running code. - ThrowHelper: Helper methods to efficiently throw exceptions. - Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers + Diagnostics;Guard;ThrowHelper;TypeInfo;Extensions;Helpers diff --git a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj index 258ad9de37e..1e8597bc417 100644 --- a/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj +++ b/Microsoft.Toolkit.HighPerformance/Microsoft.Toolkit.HighPerformance.csproj @@ -1,11 +1,13 @@ - netstandard1.4;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.1;net5.0 - 9.0 - enable + Enable true - Windows Community Toolkit High Performance .NET Standard + netstandard1.4;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.1;net5.0 + + + + Windows Community Toolkit - High Performance (.NET Standard) This package includes high performance .NET Standard helpers such as: - Memory2D<T> and Span2D<T>: two types providing fast and allocation-free abstraction over 2D memory areas. @@ -22,7 +24,7 @@ - Ref<T>: a stack-only struct that can store a reference to a value of a specified type. - NullableRef<T>: a stack-only struct similar to Ref<T>, which also supports nullable references. - Windows;Community;Toolkit;WCT;UWP;core;standard;unsafe;span;memory;string;array;stream;buffer;extensions;helpers;parallel;performance + Parallel;Performance;Unsafe;Span;Memory;String;StringPool;Array;Stream;Buffer;Extensions;Helpers diff --git a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj index 96a98b6ee07..93ac0794922 100644 --- a/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj +++ b/Microsoft.Toolkit.Mvvm/Microsoft.Toolkit.Mvvm.csproj @@ -1,11 +1,13 @@ - netstandard2.0;netstandard2.1;net5.0 - 9.0 - enable + Enable true - Windows Community Toolkit MVVM Toolkit + netstandard2.0;netstandard2.1;net5.0 + + + + Windows Community Toolkit - MVVM (.NET Standard) This package includes a .NET Standard MVVM library with helpers such as: - ObservableObject: a base class for objects implementing the INotifyPropertyChanged interface. @@ -17,7 +19,7 @@ - StrongReferenceMessenger: a high-performance messaging system that trades weak references for speed. - Ioc: a helper class to configure dependency injection service containers. - Windows;Community;Toolkit;WCT;UWP;WinUI;WPF;Xamarin;Forms;Uno;Platform;MVVM;Toolkit;MVVMToolkit;INotifyPropertyChanged;observable;Ioc;dependency injection;services;extensions;helpers + MVVM;Toolkit;MVVMToolkit;INotifyPropertyChanged;Observable;IOC;DI;Dependency Injection;Object Messaging;Extensions;Helpers diff --git a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj index 4000f5e402d..4cd3b1c28d4 100644 --- a/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj +++ b/Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj @@ -2,9 +2,12 @@ uap10.0.17763 - Windows Community Toolkit Devices + + + + Windows Community Toolkit - Devices This library enables easier consumption of connectivity Devices/Peripherals and handle its connection to Windows devices. It contains BluetoothLE and Network connectivity helpers. - Windows;Community;Toolkit;WCT;UWP;Devices;Bluetooth;LE;BluetoothLE;BLE;Networking + Devices;Bluetooth;LE;BluetoothLE;BLE;Networking diff --git a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj index 04334239afc..c5d5838785f 100644 --- a/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj +++ b/Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj @@ -2,27 +2,21 @@ uap10.0.17763 - Windows Community Toolkit Developer Tools - This library provides XAML user controls and services to help developers build their app. It is part of the Windows Community Toolkit. + + + + Windows Community Toolkit - Developer Tools + This library provides XAML user controls and services to help developers build their app. It is a part of the Windows Community Toolkit. -AligmentGrid : Displays a Grid that helps align the controls. -FocusTrackerControl : The FocusTracker Control is a feature that can be used to display information about the current focused XAML element. -Themes : Provides the source path of the resource dictionaries for the FocusTracker. - Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Developer;Tools;Accessibility;Alignment;Grid;AlignmentGrid + Controls;XAML;Developer;Tools;Accessibility;Alignment;Grid;AlignmentGrid - - - - - - - - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj index 83d3666219c..0acc2d6fe2a 100644 --- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj +++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/Microsoft.Toolkit.Uwp.Input.GazeInteraction.csproj @@ -1,12 +1,16 @@ - uap10.0.17134 - Windows Community Toolkit Eye Gaze Library - A library to integrate gaze interactions using eye trackers into UWP applications - Windows;Community;Toolkit;WCT;UWP;Gaze;Eye;Tracker;EyeTracker + uap10.0.17134 + Microsoft.Toolkit.Uwp.Input 10.0.19041.0 10.0.17134.0 + + Windows Community Toolkit - Input - Gaze Interaction (w. Eye Tracker) + A library to integrate gaze interactions using eye trackers into UWP applications + Input;Gaze;Eye;Tracker;EyeTracker + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index 7acbaf2ca1d..c53fc9b2dc1 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -8,7 +8,6 @@ 10.0.19041.0 - 16299 10.0.16299.0 @@ -26,7 +25,6 @@ UAP,Version=v10.0 uap10.0 10.0.19041.0 - 10240 10.0.10240.0 $(DefineConstants);WINDOWS_UWP;WINRT false diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec index 7e85c64d8cc..22a597a87df 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec @@ -6,18 +6,18 @@ Microsoft.Toolkit,dotnetfoundation true MIT - https://github.com/windows-toolkit/WindowsCommunityToolkit - https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png - images\nuget.png + https://github.com/CommunityToolkit/WindowsCommunityToolkit + https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png + Icon.png The official way to send toast notifications on Windows 10 via code rather than XML, with the help of IntelliSense. Supports all C# app types, including WPF, UWP, WinForms, and Console, even without packaging your app as MSIX. Also supports C++ UWP apps. Additionally, generate notification payloads from your ASP.NET web server to send as push notifications, or generate notification payloads from class libraries. For UWP/MSIX apps, you can also generate tile and badge notifications. - https://github.com/windows-toolkit/WindowsCommunityToolkit/releases + https://github.com/CommunityToolkit/WindowsCommunityToolkit/releases (c) .NET Foundation and Contributors. All rights reserved. notifications win10 windows 10 tile tiles toast toasts badge xml uwp c# csharp c++ wpf winforms - + @@ -52,7 +52,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml b/Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml index dd9ceac8093..aa05dabb3d9 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml +++ b/Microsoft.Toolkit.Uwp.Notifications/Properties/Microsoft.Toolkit.Uwp.Notifications.rd.xml @@ -1,7 +1,7 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs index 715a6668d06..dc8271a7a49 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/Controls/SampleAppMarkdownRenderer.cs @@ -270,44 +270,46 @@ protected override void RenderQuote(QuoteBlock element, IRenderContext context) else if (firstInline is TextRunInline textRunInline) { var key = textRunInline.Text.Split(' ').FirstOrDefault(); - if (styles.TryGetValue(key, out var style) && !style.Ignore) + if (styles.TryGetValue(key, out var style)) { - noteType = style; - header = style.IdentifierReplacement; - symbolGlyph = style.Glyph; + if (!style.Ignore) + { + noteType = style; + header = style.IdentifierReplacement; + symbolGlyph = style.Glyph; - // Removes the identifier from the text - textRunInline.Text = textRunInline.Text.Replace(key, string.Empty); + // Removes the identifier from the text + textRunInline.Text = textRunInline.Text.Replace(key, string.Empty); - if (theme == ElementTheme.Light) - { - localForeground = style.LightForeground; - localBackground = style.LightBackground; - } - else - { - localForeground = new SolidColorBrush(Colors.White); - localBackground = style.DarkBackground; - } + if (theme == ElementTheme.Light) + { + localForeground = style.LightForeground; + localBackground = style.LightBackground; + } + else + { + localForeground = new SolidColorBrush(Colors.White); + localBackground = style.DarkBackground; + } - // Apply special formatting context. - if (noteType != null) - { - if (localContext?.Clone() is UIElementCollectionRenderContext newContext) + // Apply special formatting context. + if (noteType != null) { - localContext = newContext; + if (localContext?.Clone() is UIElementCollectionRenderContext newContext) + { + localContext = newContext; - localContext.TrimLeadingWhitespace = true; - QuoteForeground = Foreground; - LinkForeground = localForeground; + localContext.TrimLeadingWhitespace = true; + QuoteForeground = Foreground; + LinkForeground = localForeground; + } } } - } - - if (style.Ignore) - { - // Blank entire block - textRunInline.Text = string.Empty; + else + { + // Blank entire block + textRunInline.Text = string.Empty; + } } } } diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index c5287b6b82c..6f48f7891bf 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -20,13 +20,12 @@ x86|x64|arm|arm64 MiddleClickScrolling-CursorType.res false - 8.0 + $(NoWarn);2008 true bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x86 false @@ -38,7 +37,6 @@ bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true - ;2008 pdbonly x86 false @@ -53,7 +51,6 @@ true bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM false @@ -64,7 +61,6 @@ bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true - ;2008 pdbonly ARM false @@ -79,7 +75,6 @@ true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x64 false @@ -90,7 +85,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true - ;2008 pdbonly x64 false @@ -439,7 +433,7 @@ - + @@ -626,6 +620,7 @@ + @@ -1475,7 +1470,6 @@ Visual C++ 2015 Runtime for Universal Windows Platform Apps - 14.0 @@ -1483,7 +1477,6 @@ true bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 true full ARM64 @@ -1496,7 +1489,6 @@ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true true - ;2008 true pdbonly ARM64 @@ -1540,14 +1532,6 @@ - - - - - - - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs index f57a430d307..9a55745ea11 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs @@ -23,6 +23,7 @@ using Microsoft.Toolkit.Uwp.Helpers; using Microsoft.Toolkit.Uwp.Input.GazeInteraction; using Microsoft.Toolkit.Uwp.SampleApp.Models; +using Microsoft.Toolkit.Uwp.UI; using Microsoft.Toolkit.Uwp.UI.Animations; using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.Toolkit.Uwp.UI.Media; @@ -118,7 +119,7 @@ public string CodeUrl #if !REMOTE_DOCS _codeUrl = value; #else - var regex = new Regex("^https://github.com/windows-toolkit/WindowsCommunityToolkit/(tree|blob)/(?.+?)/(?.*)"); + var regex = new Regex("^https://github.com/CommunityToolkit/WindowsCommunityToolkit/(tree|blob)/(?.+?)/(?.*)"); var docMatch = regex.Match(value); var branch = string.Empty; @@ -674,8 +675,9 @@ private static Type LookForTypeByName(string typeName) // TODO Reintroduce graph controls // typeof(UserToPersonConverter)) // Search in Microsoft.Toolkit.Graph.Controls + ScrollItemPlacement.Default.GetType(), // Search in Microsoft.Toolkit.Uwp.UI EasingType.Default.GetType(), // Microsoft.Toolkit.Uwp.UI.Animations - ImageBlendMode.Multiply.GetType(), // Search in Microsoft.Toolkit.Uwp.UI + ImageBlendMode.Multiply.GetType(), // Search in Microsoft.Toolkit.Uwp.UI.Media Interaction.Enabled.GetType(), // Microsoft.Toolkit.Uwp.Input.GazeInteraction DataGridGridLinesVisibility.None.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.DataGrid GridSplitter.GridResizeDirection.Auto.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Layout diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml b/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml index 1182c415d85..f037f6220b2 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Properties/Default.rd.xml @@ -23,7 +23,7 @@ - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/ReadMe.md b/Microsoft.Toolkit.Uwp.SampleApp/ReadMe.md index 6fca2b6e133..6a059b6c637 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/ReadMe.md +++ b/Microsoft.Toolkit.Uwp.SampleApp/ReadMe.md @@ -1,4 +1,4 @@ -For the latest info, [visit the wiki article here](https://github.com/windows-toolkit/WindowsCommunityToolkit/wiki/Sample-Development). +For the latest info, [visit the wiki article here](https://github.com/CommunityToolkit/WindowsCommunityToolkit/wiki/Sample-Development). # How to add new samples @@ -92,7 +92,7 @@ Therefore, for any new control/extension, you should still have a simplified sni ## 4. For Events/Resource Templates: Have your sample page implement the **IXamlRendererListener** interface -This gets called whenever the template gets parsed (due to loading or user modification). Here you can use the [LogicalTree](https://github.com/windows-toolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp.UI/Extensions/Tree/LogicalTree.cs) extensions to grab named controls in the template and register their events. **Check for null first** as the developer may have removed the name from the element. +This gets called whenever the template gets parsed (due to loading or user modification). Here you can use the [LogicalTree](https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp.UI/Extensions/Tree/LogicalTree.cs) extensions to grab named controls in the template and register their events. **Check for null first** as the developer may have removed the name from the element. ```csharp var markdownText = control.FindChild("MarkdownText") as MarkdownTextBlock; @@ -148,9 +148,9 @@ Select the category where you want your page to be listed and add the following "Name": "AdaptiveGridView", "Type": "AdaptiveGridViewPage", "About": "The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the total display available space. It reacts to changes in the layout as well as the content so it can adapt to different form factors automatically. The number and the width of items are calculated based on the screen resolution in order to fully leverage the available screen space. The property ItemsHeight define the items fixed height and the property DesiredWidth sets the minimum width for the elements to add a new column.", - "CodeUrl": "https://github.com/windows-toolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar", + "CodeUrl": "https://github.com/CommunityToolkit/WindowsCommunityToolkit/tree/main/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar", "XamlCodeFile": "AdaptiveGridViewCode.bind", - "DocumentationUrl": "https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/docs/controls/AdaptiveGridView.md" + "DocumentationUrl": "https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/docs/controls/AdaptiveGridView.md" } ] } @@ -159,7 +159,7 @@ Select the category where you want your page to be listed and add the following ## Thumbnail Images -> NOTE: If creating a new icon, follow the [Thumbnail Style Guide and templates](https://github.com/windows-toolkit/WindowsCommunityToolkit-design-assets) +> NOTE: If creating a new icon, follow the [Thumbnail Style Guide and templates](https://github.com/CommunityToolkit/WindowsCommunityToolkit-design-assets) ## Restricting Samples to Specific API Sets diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoSelectBehavior/AutoSelectBehaviorXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoSelectBehavior/AutoSelectBehaviorXaml.bind index 79ec1b15a17..8da8941ae78 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoSelectBehavior/AutoSelectBehaviorXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AutoSelectBehavior/AutoSelectBehaviorXaml.bind @@ -1,4 +1,4 @@ - + - - - - +using Microsoft.Toolkit.Uwp.UI; - - - - +// Scrolling with index +await MyGridView.SmoothScrollIntoViewWithIndexAsync(index: int, itemPlacement: ScrollItemPlacement, disableAnimation: bool, scrollIfVisibile: bool, additionalHorizontalOffset: int, additionalVerticalOffset: int); - - - - - - \ No newline at end of file +// Scrolling with item +await MyGridView.SmoothScrollIntoViewWithItemAsync(item: object, itemPlacement: ScrollItemPlacement, disableAnimation: bool, scrollIfVisibile: bool, additionalHorizontalOffset: int, additionalVerticalOffset: int); diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml index 48841b7fa69..625285f44be 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml @@ -2,31 +2,68 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.SamplePages" xmlns:ui="using:Microsoft.Toolkit.Uwp.UI" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"> + + - + - + + + + + + + + - + + + + + Default + Left + Top + Center + Right + Bottom + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs index 474fe362382..b79849ef196 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs @@ -3,9 +3,8 @@ // See the LICENSE file in the project root for more information. using System; +using System.Collections.ObjectModel; using System.Windows.Input; -using Microsoft.Toolkit.Uwp.SampleApp.Common; -using Microsoft.Toolkit.Uwp.SampleApp.Data; using Microsoft.Toolkit.Uwp.UI; using Windows.UI.Popups; using Windows.UI.Xaml; @@ -15,29 +14,93 @@ namespace Microsoft.Toolkit.Uwp.SampleApp.SamplePages { public sealed partial class ListViewExtensionsPage : Page, IXamlRenderListener { + private ListView sampleListView; + public ListViewExtensionsPage() { this.InitializeComponent(); + Load(); } - public ICommand SampleCommand => new DelegateCommand(OnExecuteSampleCommand); - - public async void OnXamlRendered(FrameworkElement control) + public void OnXamlRendered(FrameworkElement control) { - var sampleListView = control.FindChild("SampleListView") as ListView; + sampleListView = control.FindChild("SampleListView") as ListView; if (sampleListView != null) { - sampleListView.ItemsSource = await new Data.PhotosDataSource().GetItemsAsync(); + sampleListView.ItemsSource = GetOddEvenSource(201); } // Transfer Data Context so we can access SampleCommand control.DataContext = this; } - private async void OnExecuteSampleCommand(PhotoDataItem item) + private void Load() + { + SampleController.Current.RegisterNewCommand("Start Smooth Scroll", (sender, args) => + { + var index = int.TryParse(IndexInput.Text, out var i) ? i : 0; + var itemPlacement = ItemPlacementInput.SelectedItem switch + { + "Default" => ScrollItemPlacement.Default, + "Left" => ScrollItemPlacement.Left, + "Top" => ScrollItemPlacement.Top, + "Center" => ScrollItemPlacement.Center, + "Right" => ScrollItemPlacement.Right, + "Bottom" => ScrollItemPlacement.Bottom, + _ => ScrollItemPlacement.Default + }; + + var disableAnimation = DisableAnimationInput.IsChecked ?? false; + var scrollIfVisibile = ScrollIfVisibileInput.IsChecked ?? true; + var additionalHorizontalOffset = int.TryParse(AdditionalHorizontalOffsetInput.Text, out var ho) ? ho : 0; + var additionalVerticalOffset = int.TryParse(AdditionalVerticalOffsetInput.Text, out var vo) ? vo : 0; + sampleListView.SmoothScrollIntoViewWithIndexAsync(index, itemPlacement, disableAnimation, scrollIfVisibile, additionalHorizontalOffset, additionalVerticalOffset); + }); + + if (sampleListView != null) + { + sampleListView.ItemsSource = GetOddEvenSource(500); + } + } + + private ObservableCollection GetOddEvenSource(int count) + { + var oddEvenSource = new ObservableCollection(); + + for (int number = 0; number < count; number++) + { + var item = (number % 2) == 0 ? $"{number} - Even" : $"{number} - Odd"; + oddEvenSource.Add(item); + } + + return oddEvenSource; + } + } + +#pragma warning disable SA1402 // File may only contain a single class + internal class SampleCommand : ICommand +#pragma warning restore SA1402 // File may only contain a single class + { + event EventHandler ICommand.CanExecuteChanged + { + add { } + remove { } + } + + public bool CanExecute(object parameter) => true; + + public void Execute(object parameter) + { + if (parameter is string s) + { + OnExecuteSampleCommand(s); + } + } + + private static async void OnExecuteSampleCommand(string item) { - await new MessageDialog($"You clicked {item.Title} via the 'ListViewExtensions.Command' binding", "Item Clicked").ShowAsync(); + await new MessageDialog($"You clicked {item} via the 'ListViewExtensions.Command' binding", "Item Clicked").ShowAsync(); } } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsXaml.bind new file mode 100644 index 00000000000..0c3c8ea384b --- /dev/null +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsXaml.bind @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md index 9027f9965fa..79935db11d7 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MarkdownTextBlock/InitialContent.md @@ -376,11 +376,11 @@ To add an image, it is almost like a link. You just need to add a \! before. So inline image syntax looks like this: ->\!\[Helpers Image](https\://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/Microsoft.Toolkit.Uwp.SampleApp/Assets/Helpers.png) +>\!\[Helpers Image](https\://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/Microsoft.Toolkit.Uwp.SampleApp/Assets/Helpers.png) which renders in: -![Helpers Image](https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/Microsoft.Toolkit.Uwp.SampleApp/Assets/Helpers.png) +![Helpers Image](https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/Microsoft.Toolkit.Uwp.SampleApp/Assets/Helpers.png) Rendering Images is now supported through prefix. use property **UriPrefix** @@ -412,11 +412,11 @@ which renders in: MarkdownTextblock supports links wrapped with Images. ->\[!\[image](https\://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png)](https\://docs.microsoft.com/windows/uwpcommunitytoolkit/) +>\[!\[image](https\://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png)](https\://docs.microsoft.com/windows/uwpcommunitytoolkit/) will render into -[![image](https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png)](https://docs.microsoft.com/windows/uwpcommunitytoolkit/) +[![image](https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png)](https://docs.microsoft.com/windows/uwpcommunitytoolkit/) and when clicked will go to the Linked Page. @@ -425,7 +425,7 @@ MarkdownTextBlock also supports Reference based links. ``` [![image][1]][2] -[1]:https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png +[1]:https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png [2]:https://docs.microsoft.com/windows/uwpcommunitytoolkit/ ``` @@ -434,7 +434,7 @@ will render into [![image][1]][2] -[1]:https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/main/build/nuget.png +[1]:https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png [2]:https://docs.microsoft.com/windows/uwpcommunitytoolkit/ ***** diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MetadataControl/MetadataControlCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MetadataControl/MetadataControlCode.bind index a0b052eb012..9910fd39131 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MetadataControl/MetadataControlCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/MetadataControl/MetadataControlCode.bind @@ -1,4 +1,4 @@ -512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} false - false + $(NoWarn);2008 AnyCPU @@ -42,7 +42,6 @@ true bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x86 false @@ -53,7 +52,6 @@ bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x86 false @@ -64,7 +62,6 @@ true bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM false @@ -75,7 +72,6 @@ bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM false @@ -86,7 +82,6 @@ true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x64 false @@ -97,7 +92,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x64 false @@ -128,7 +122,6 @@ true bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM64 false @@ -138,7 +131,6 @@ bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM64 false diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj index 2ea01d4ebbe..c514502375d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Microsoft.Toolkit.Uwp.UI.Animations.csproj @@ -2,9 +2,12 @@ uap10.0.17763 - Windows Community Toolkit Animations + + + + Windows Community Toolkit - UI Animations - This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is part of the Windows Community Toolkit. + This library provides helpers and extensions on top of Windows Composition and XAML storyboards. It is a part of the Windows Community Toolkit. Namespace: - CompositionAnimations: @@ -14,8 +17,7 @@ - Expressions: ExpressionNodes, ExpressionValues, ReferenceNodes, CompositionExtensions, ExpressionFunctions, OperationType - AnimationExtensions: Blur, Fade, Light, Offset, Rotate, Saturation, Scale - Windows;Community;Toolkit;WCT;UWP;Animations;Composition;Connected;Implicit;XAML - 9.0 + UI;XAML;Animations;Composition;Connected;Implicit;Expressions;Extensions diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/BehaviorBase.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/BehaviorBase.cs index 418b1044f16..8bf21567b00 100644 --- a/Microsoft.Toolkit.Uwp.UI.Behaviors/BehaviorBase.cs +++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/BehaviorBase.cs @@ -15,7 +15,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Behaviors /// The type of the associated object. /// /// - /// For more info, see https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/1008. + /// For more info, see https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/1008. /// public abstract class BehaviorBase : Behavior where T : UIElement diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj b/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj index 4df1835eb14..340d4c4fb69 100644 --- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Microsoft.Toolkit.Uwp.UI.Behaviors.csproj @@ -1,11 +1,14 @@ - uap10.0.17763 - 9.0 - Windows Community Toolkit UI Behaviors + true + uap10.0.17763 + + + + Windows Community Toolkit - UI Behaviors - This library provides UI behaviors built on the XAML behaviors SDK. It is part of the Windows Community Toolkit. + This library provides UI behaviors built on the XAML behaviors SDK. It is a part of the Windows Community Toolkit. Behaviors: - BehaviorBase: Helper for building Behaviors @@ -14,9 +17,7 @@ - ViewportBehavior: Listening for element to enter or exit the ScrollViewer viewport - FadeHeaderBehavior, QuickReturnHeaderBehavior, StickyHeaderBehavior: Helpers for ListViewBase Header Behavior - Windows;Community;Toolkit;WCT;UWP;UI;Behaviors;Interactivity;Interaction;XAML - - true + UI;XAML;Behaviors;Interactivity;Interaction;Focus;Header;Viewport diff --git a/Microsoft.Toolkit.Uwp.UI.Behaviors/Select/AutoSelectBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Behaviors/Select/AutoSelectBehavior.cs index 7ee4860900a..656629de985 100644 --- a/Microsoft.Toolkit.Uwp.UI.Behaviors/Select/AutoSelectBehavior.cs +++ b/Microsoft.Toolkit.Uwp.UI.Behaviors/Select/AutoSelectBehavior.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj index cb6cb5624f2..203fa4c3487 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj @@ -53,6 +53,7 @@ + False False $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd @@ -64,12 +65,12 @@ - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd WindowsRuntime False - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd WindowsRuntime False diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MetadataControl/MetadataControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MetadataControl/MetadataControl.cs index 184ca44ba27..d7ad8026ccb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MetadataControl/MetadataControl.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MetadataControl/MetadataControl.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MetadataControl/MetadataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MetadataControl/MetadataItem.cs index a8a5024167e..215062a2036 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/MetadataControl/MetadataItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MetadataControl/MetadataItem.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj index 7531d4fb22d..c183de922ca 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj @@ -2,9 +2,13 @@ uap10.0.17763 - Windows Community Toolkit Controls + Microsoft.Toolkit.Uwp.UI.Controls + + + + Windows Community Toolkit - Common Controls - This library provides XAML templated controls. It is part of the Windows Community Toolkit. + This library provides XAML templated controls. It is a part of the Windows Community Toolkit. Controls: - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source. @@ -19,47 +23,30 @@ - TileControl: A ContentControl that show an image repeated many times. - Windows;Community;Toolkit;WCT;UWP;Controls;XAML; + Controls;XAML;UI; Camera;Preview ;CameraPreview ; Drop;Shadow;Panel ;DropShadowPanel ;DropShadow ; Image;Ex ;ImageEx ; In;App;Notification;InAppNotification;InApp ; Loading ; - Menu ; Radial;Progress;Bar;RadialProgressBar;ProgressBar ; Rotator;Tile ;RotatorTile ; Tabbed;Command;Bar ;TabbedCommandBar ;CommandBar ; - Text;Tool;Bar ;TextToolBar ;ToolBar ;Markdown; + Text;Tool;Bar ;TextToolBar ;ToolBar ; + Markdown ;RTF ; Tile;Control ;TileControl ; - 9.0 - - - - - - - - - - - + - + + - - - - - - - - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj index d5e62cbc6e2..2a21fa70bd4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj @@ -52,6 +52,7 @@ + False False $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd @@ -63,12 +64,12 @@ - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd WindowsRuntime False - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd WindowsRuntime False diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj index 095d16a7e1b..6552d8fcd47 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj @@ -2,23 +2,16 @@ uap10.0.17763 - Windows Community Toolkit Controls DataGrid - - This library provides a XAML DataGrid control. It is part of the Windows Community Toolkit. - - - Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Data;Grid;DataGrid Microsoft.Toolkit.Uwp.UI.Controls - - - - - - - - + + Windows Community Toolkit - DataGrid Control + + This library provides a XAML DataGrid control. It is a part of the Windows Community Toolkit. + + Controls;XAML;UI;Data;Grid;DataGrid + @@ -35,13 +28,6 @@ - - - - - - - - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj index 0b4b3c839c6..bea936c0671 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj @@ -53,6 +53,7 @@ + False False $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd @@ -64,12 +65,12 @@ - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd WindowsRuntime False - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd WindowsRuntime False diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj index 536296b3b50..292a821d980 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj @@ -2,9 +2,13 @@ uap10.0.17763 - Windows Community Toolkit Controls + Microsoft.Toolkit.Uwp.UI.Controls + + + + Windows Community Toolkit - Input Controls - This library provides XAML templated controls. It is part of the Windows Community Toolkit. + This library provides XAML templated controls. It is a part of the Windows Community Toolkit. Controls: - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version. @@ -14,42 +18,28 @@ - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags. - Windows;Community;Toolkit;WCT;UWP;Controls;XAML; + Controls;XAML;UI; Color;Picker;Button ;ColorPickerButton ;ColorPicker ; Radial;Gauge ;RadialGauge ; Range;Selector ;RangeSelector ; Remote;Device;Picker;RemoteDevicePicker;DevicePicker;RemoteDevice; Tokenizing;Text;Box ;TokenizingTextBox ;TextBox ; - 8.0 - - - - - - - + - + - - - - - - - - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj index 47c18c830e9..8a2b8b57ae4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj @@ -53,6 +53,7 @@ + False False $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd @@ -64,12 +65,12 @@ - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd WindowsRuntime False - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd + $(MSBuildProgramFiles32)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd WindowsRuntime False diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs index 1b5b0b44228..48828ac6c6d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/BladeView/BladeView.cs @@ -152,7 +152,7 @@ private async void BladeOnVisibilityChanged(object sender, Visibility visibility ActiveBlades.Add(blade); UpdateLayout(); - // Need to do this because of touch. See more information here: https://github.com/windows-toolkit/WindowsCommunityToolkit/issues/760#issuecomment-276466464 + // Need to do this because of touch. See more information here: https://github.com/CommunityToolkit/WindowsCommunityToolkit/issues/760#issuecomment-276466464 var dispatcherQueue = DispatcherQueue.GetForCurrentThread(); await dispatcherQueue.EnqueueAsync( () => diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml index 2b98ce6be8d..451e054d16f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/GridSplitter/GridSplitter.xaml @@ -4,29 +4,37 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UITests/UITests.Tests.Shared/Controls/GridSplitterTestPage.xaml.cs b/UITests/UITests.Tests.Shared/Controls/GridSplitterTestPage.xaml.cs new file mode 100644 index 00000000000..39c39b82dfd --- /dev/null +++ b/UITests/UITests.Tests.Shared/Controls/GridSplitterTestPage.xaml.cs @@ -0,0 +1,20 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; + +namespace UITests.App.Pages +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public sealed partial class GridSplitterTestPage : Page + { + public GridSplitterTestPage() + { + this.InitializeComponent(); + } + } +} diff --git a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs index a5d5641d387..9306a8d793c 100644 --- a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs +++ b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTest.cs @@ -1,4 +1,4 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. diff --git a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTestPage.xaml b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTestPage.xaml index 934b6b4e4f7..7599467b67f 100644 --- a/UITests/UITests.Tests.Shared/Controls/RangeSelectorTestPage.xaml +++ b/UITests/UITests.Tests.Shared/Controls/RangeSelectorTestPage.xaml @@ -1,4 +1,4 @@ -("InitialValueTextBlock").GetText(); + var textBox = FindElement.ById("TextBox"); + + Verify.AreEqual(initialValue, textBox.GetText()); + + var setEmptyButton = FindElement.ById