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/Directory.Build.props b/Directory.Build.props index 3aaaa7b3b0a..63fd9d141d7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,63 +1,65 @@ - Microsoft.Toolkit - true - true - https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png - images\nuget.png - https://github.com/CommunityToolkit/WindowsCommunityToolkit - MIT - https://github.com/CommunityToolkit/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/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 814608f9f46..22a597a87df 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.nuspec @@ -8,7 +8,7 @@ MIT https://github.com/CommunityToolkit/WindowsCommunityToolkit https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/main/build/nuget.png - images\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. @@ -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 2d5e88e0559..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,6 +1,6 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 696298e3c8f..6f48f7891bf 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1,4 +1,4 @@ - + Debug @@ -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 @@ -1476,7 +1470,6 @@ Visual C++ 2015 Runtime for Universal Windows Platform Apps - 14.0 @@ -1484,7 +1477,6 @@ true bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 true full ARM64 @@ -1497,7 +1489,6 @@ TRACE;NETFX_CORE;WINDOWS_UWP;REMOTE_DOCS true true - ;2008 true pdbonly ARM64 @@ -1541,14 +1532,6 @@ - - - - - - - - \ No newline at end of file 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 @@ -\!\[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: @@ -412,7 +412,7 @@ 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 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/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/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj index c0f50de8576..488c2b80257 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj @@ -2,9 +2,13 @@ uap10.0.17763 - Windows Community Toolkit Layout + Microsoft.Toolkit.Uwp.UI.Controls + + + + Windows Community Toolkit - Layout Controls - This library provides XAML layout controls. It is part of the Windows Community Toolkit. + This library provides XAML layout controls. It is a part of the Windows Community Toolkit. Controls: - BladeView: Provides a horizontal collection of blades for drilling into detailed scenarios. @@ -18,7 +22,7 @@ - OrbitView: Positions items in a circle around a center element and supports orbits and anchors. - Windows;Community;Toolkit;WCT; + Controls;XAML;UI; Blade;View ;BladeView ; Carousel ; Expander ; @@ -29,35 +33,20 @@ List;Details;View ;ListDetailsView ;ListDetails ; Orbit;View ;OrbitView ; - Microsoft.Toolkit.Uwp.UI.Controls - 8.0 - - - - - - - + - + - - - - - - - - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj index d8c03a2e87e..1402810bf0b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.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.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj index 429caee440f..111e7a153c8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj @@ -2,50 +2,41 @@ uap10.0.17763 - Windows Community Toolkit Controls Markdown - - This library provides a XAML MarkdownTextBlock control, an efficient and extensible control that can parse and render markdown. It is part of the Windows Community Toolkit. + Microsoft.Toolkit.Uwp.UI.Controls + + + Windows Community Toolkit - Markdown Control + + This library provides a XAML MarkdownTextBlock control, an efficient and extensible control that can parse and render markdown. It is a part of the Windows Community Toolkit. - Windows;Community;Toolkit;WCT;UWP;Controls;XAML;Markdown;Text;Block;MarkdownTextBlock - Microsoft.Toolkit.Uwp.UI.Controls + Controls;XAML;UI;Markdown;Text;Block;MarkdownTextBlock - - + + - - - - - - - - - - - + - - + + - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj index a9ab931313f..57cd0b890fd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj @@ -2,9 +2,13 @@ uap10.0.17763 - Windows Community Toolkit Media Controls + Microsoft.Toolkit.Uwp.UI.Controls + + + + Windows Community Toolkit - Media Controls - This library provides controls backed by win2d for use in XAML. It is part of the Windows Community Toolkit. + This library provides controls backed by win2d for use in XAML. It is a part of the Windows Community Toolkit. Controls: - Eyedropper: Eyedropper allows user to pick up a color from anywhere in there application. @@ -12,18 +16,16 @@ - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export & Import. - Windows;Community;Toolkit;WCT;UWP;Controls;XAML; + Controls;XAML;UI; Eye;Dropper ;EyeDropper ; Image;Cropper ;ImageCropper ;Crop; Infinite;Canvas;InfiniteCanvas; - 8.0 - - - + + @@ -31,18 +33,9 @@ - - - + + + - - - - - - - - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj index 7aca094937b..281073e59c6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.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.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj index f0d0e06e8e3..d290863d468 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj @@ -2,9 +2,13 @@ uap10.0.17763 - Windows Community Toolkit Primitive Controls + Microsoft.Toolkit.Uwp.UI.Controls + + + + Windows Community Toolkit - Primitive Controls - This library provides controls for use in XAML which don't provide their own style. It is part of the Windows Community Toolkit. + This library provides controls for use in XAML which don't provide their own style. It is a part of the Windows Community Toolkit. Controls: - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space. @@ -17,7 +21,7 @@ - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line. - Windows;Community;Toolkit;WCT;UWP;Controls;XAML; + Controls;XAML;UI; Adaptive;Grid;View;AdaptiveGridView;GridView ;AdaptiveGrid ; Dock;Panel ;DockPanel ; Staggered;Layout ;StaggeredLayout ; @@ -27,31 +31,12 @@ Wrap;Layout ;WrapLayout ; Wrap;Panel ;WrapPanel ; - 8.0 - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj index ced5a073978..7d2ab48bad5 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj @@ -1,18 +1,24 @@ + false uap10.0.17763 - Windows Community Toolkit Controls + + + + Windows Community Toolkit - UI Controls - This library provides Controls, Panels, ItemsRepeater Layouts, and various other classes & helpers for XAML UI development with UWP. It is part of the Windows Community Toolkit. + This library provides Controls, Panels, ItemsRepeater Layouts, and various other classes & helpers for XAML UI development with UWP. It is a part of the Windows Community Toolkit. - This package provides no actual code and is only an aggregate of its dependencies. You can find out how to optimize your app after development at https://aka.ms/wct/optimize + This package is only an aggregate of its dependencies, meaning it's a meta-package and has no assemblies. You can find out how to optimize your app after development at https://aka.ms/wct/optimize - false + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj index 0a502cd7b2b..36de7eb8828 100644 --- a/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Media/Microsoft.Toolkit.Uwp.UI.Media.csproj @@ -1,11 +1,13 @@ - uap10.0.17763 - 9.0 - Windows Community Toolkit UI Media + uap10.0.17763 + + + + Windows Community Toolkit - UI Media - This library provides UI brushes. It is part of the Windows Community Toolkit. + This library provides UI brushes. It is a part of the Windows Community Toolkit. Media: - AcrylicBrush: A custom Brush that that implements an acrylic effect with full control over all parameters. @@ -39,7 +41,7 @@ Geometry: - CanvasPathGeometry: A class that parses Win2d Path Mini Language and converts it to CanvasGeometry, CanvasBrush, CanvasStroke, CanvasStrokeStyle or Color. - Windows;Community;Toolkit;WCT;UWP;UI;XAML;brushes;blur;effects;animations + UI;XAML;Acrylic;Brushes;Blur;Effects;Canvas;Geometry diff --git a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj index be4e51718fd..aa8d9c21ba4 100644 --- a/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj +++ b/Microsoft.Toolkit.Uwp.UI/Microsoft.Toolkit.Uwp.UI.csproj @@ -1,11 +1,15 @@ + true + true uap10.0.17763 - 9.0 - Windows Community Toolkit UI + + + + Windows Community Toolkit - UI - This library provides UI components, such as XAML extensions, helpers, converters and more. It is part of the Windows Community Toolkit. + This library provides UI components, such as XAML extensions, helpers, converters and more. It is a part of the Windows Community Toolkit. AdvancedCollectionView: It's a collection view implementation that support filtering, sorting and incremental loading. It's meant to be used in a viewmodel. @@ -39,9 +43,7 @@ - DependencyPropertyWatcher: Used to Track Changes of a Dependency Property - ThemeListener: Class which listens for changes to Application Theme or High Contrast Modes and Signals an Event when they occur. - Windows;Community;Toolkit;WCT;UWP;UI;Converters;XAML;extensions;helpers - true - true + UI;XAML;ApplicationView;FrameworkElement;SurfaceDial;Matrix;Mouse;TextBoxMask;TitleBar;VisualTree;Converters;Extensions;Helpers diff --git a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj index 5bff98a70e6..0183e9525fb 100644 --- a/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj +++ b/Microsoft.Toolkit.Uwp/Microsoft.Toolkit.Uwp.csproj @@ -2,10 +2,12 @@ uap10.0.17763 - Windows Community Toolkit + + + + Windows Community Toolkit - Common (UWP) This package includes code only helpers such as Colors conversion tool, Storage file handling, a Stream helper class, etc. - Windows;Community;Toolkit;WCT;UWP - 9.0 + Storage;File;Folder;Color;Conversion;Stream;Helpers;Extensions diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj index 75a6ab8feee..b72dca46f0c 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj +++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject/Microsoft.Toolkit.Win32.WpfCore.SampleApp.PackagingProject.wapproj @@ -50,7 +50,7 @@ 54349ab0-9e41-4aa6-849c-ec9ce80cdd2a - 10.0.18362.0 + 10.0.19041.0 10.0.17763.0 en-US false diff --git a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj index f7293860889..4a6de004eaf 100644 --- a/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj +++ b/Microsoft.Toolkit.Win32.WpfCore.SampleApp/Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj @@ -1,19 +1,18 @@ - WinExe - netcoreapp3.1 true + WinExe ToolkitIcon.ico - false + netcoreapp3.1 - + - + \ No newline at end of file diff --git a/Microsoft.Toolkit.Win32/README.md b/Microsoft.Toolkit.Win32/ReadMe.md similarity index 100% rename from Microsoft.Toolkit.Win32/README.md rename to Microsoft.Toolkit.Win32/ReadMe.md diff --git a/Microsoft.Toolkit/Microsoft.Toolkit.csproj b/Microsoft.Toolkit/Microsoft.Toolkit.csproj index 8b428ac2652..29cc25a881d 100644 --- a/Microsoft.Toolkit/Microsoft.Toolkit.csproj +++ b/Microsoft.Toolkit/Microsoft.Toolkit.csproj @@ -1,17 +1,19 @@ - netstandard1.4;netstandard2.0;netstandard2.1;net5.0 - 9.0 + Enable true - enable - Windows Community Toolkit .NET Standard + netstandard1.4;netstandard2.0;netstandard2.1;net5.0 + + + + Windows Community Toolkit - Common (.NET Standard) This package includes .NET Standard code only helpers such as: - IncrementalLoadingCollection: Simplifies the definition and usage of collections whose items can be loaded incrementally only when needed by the view. - String extensions and array extensions: These extensions make working with string and arrays easier. - Windows;Community;Toolkit;WCT;UWP;Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;extensions;helpers + Incremental;Loading;Collection;IncrementalLoadingCollection;String;Array;Extensions;Helpers diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index f06f20c2188..b7ddd6a6de8 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -30,7 +30,7 @@ Always StoreUpload $(Platform) - ;2008;SA0001;SA1601 + $(NoWarn);2008;SA1601 true prompt false @@ -123,10 +123,10 @@ - - + + - + diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index 60a18ffc54b..d9a87784a71 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -18,6 +18,7 @@ Microsoft.Toolkit.Uwp.UI; Microsoft.Toolkit.Uwp.UI.Animations; Microsoft.Toolkit.Uwp.UI.Behaviors; + Microsoft.Toolkit.Uwp.UI.Media; Microsoft.Toolkit.Uwp.UI.Controls; Microsoft.Toolkit.Uwp.UI.Controls.Core; Microsoft.Toolkit.Uwp.UI.Controls.DataGrid; @@ -26,7 +27,6 @@ Microsoft.Toolkit.Uwp.UI.Controls.Markdown; Microsoft.Toolkit.Uwp.UI.Controls.Media; Microsoft.Toolkit.Uwp.UI.Controls.Primitives; - Microsoft.Toolkit.Uwp.UI.Media; @@ -52,7 +52,7 @@ Properties="CurrentProject=%(ProjectsToBuild.Identity);Configuration=%(ProjectsToBuild.Configuration);Platform=%(ProjectsToBuild.Platform);NuGetPackageVersion=$(NuGetPackageVersion)" /> - + @@ -80,14 +80,14 @@ - + - $(MSBuildThisFileDirectory)..\bin\nupkg\*.nupkg + $(MSBuildThisFileDirectory)..\bin\nupkg - + - + \ No newline at end of file diff --git a/UITests/UITests.App/HomePage.xaml b/UITests/UITests.App/HomePage.xaml index b6ac8106881..1caafab1c43 100644 --- a/UITests/UITests.App/HomePage.xaml +++ b/UITests/UITests.App/HomePage.xaml @@ -1,4 +1,4 @@ - diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index 21515c4f9b8..d0eb10b9c05 100644 --- a/UITests/UITests.App/UITests.App.csproj +++ b/UITests/UITests.App/UITests.App.csproj @@ -26,14 +26,13 @@ SHA256 true True + $(NoWarn);2008 true - 9.0 true bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x86 false @@ -44,7 +43,6 @@ bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x86 false @@ -56,7 +54,6 @@ true bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM false @@ -67,7 +64,6 @@ bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM false @@ -79,7 +75,6 @@ true bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM64 false @@ -91,7 +86,6 @@ bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM64 false @@ -103,7 +97,6 @@ true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x64 false @@ -114,7 +107,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x64 false diff --git a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj index c1133a0ad15..291ee5c76ad 100644 --- a/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj +++ b/UITests/UITests.Tests.MSTest/UITests.Tests.MSTest.csproj @@ -1,37 +1,33 @@ - + - - netcoreapp3.1 - .NETCoreApp - v3.1 - win10-x86 - 9.0 - - true - x86 Exe - false + win10-x86 + netcoreapp3.1 + + true + true - - - - + - + + + + + + - + - + + \ No newline at end of file diff --git a/UITests/UITests.Tests.Shared/Controls/GridSplitterTestPage.xaml b/UITests/UITests.Tests.Shared/Controls/GridSplitterTestPage.xaml index 074df833eb2..09236488742 100644 --- a/UITests/UITests.Tests.Shared/Controls/GridSplitterTestPage.xaml +++ b/UITests/UITests.Tests.Shared/Controls/GridSplitterTestPage.xaml @@ -1,4 +1,4 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true @@ -11,7 +11,7 @@ - + @@ -19,25 +19,39 @@ + + + + + + + + + + + - - + + + %(RecursiveDir)%(FileName)%(Extension) + + + + + + + + + - - - - - - - - - - - \ No newline at end of file diff --git a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj index 09efc634dce..7a53aad9440 100644 --- a/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj +++ b/UITests/UITests.Tests.Shared/UITests.Tests.Shared.shproj @@ -4,9 +4,9 @@ 14.0 - - + + - + \ No newline at end of file diff --git a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj index 18dc3731d9a..70718b662e4 100644 --- a/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj +++ b/UITests/UITests.Tests.TAEF/UITests.Tests.TAEF.csproj @@ -1,24 +1,38 @@ - - netcoreapp3.1 - .NETCoreApp - v3.1 - 9.0 - - $(PkgTAEF_Redist_Wlk)\build\Binaries\x86\CoreClr\ - true - x86 - $(DefineConstants);USING_TAEF Exe + x86 win10-x86 - false - false + netcoreapp3.1 + + true + false + true + $(DefineConstants);USING_TAEF + $(PkgTAEF_Redist_Wlk)\build\Binaries\$(PlatformTarget)\CoreClr\ + + + + + + + + + + + + + + UITests.App.dependencies.txt + PreserveNewest + + + $(TaefRootDirectory)TE.Managed.dll @@ -39,38 +53,16 @@ - - - - + - + + - - - - - - - - - - - - - - - - UITests.App.dependencies.txt - PreserveNewest - - - UITests.App.dependencies.txt - PreserveNewest - + + + + \ No newline at end of file diff --git a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj index 68c1befb2bf..2e002b16083 100644 --- a/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj +++ b/UnitTests/UnitTests.HighPerformance.NetCore/UnitTests.HighPerformance.NetCore.csproj @@ -1,25 +1,23 @@ - netcoreapp2.1;netcoreapp3.1;net5.0 - 8.0 true - false + netcoreapp2.1;netcoreapp3.1;net5.0 - - - + + - + - - + + + diff --git a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.shproj b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.shproj index a48ae579e4e..68b653d1cc2 100644 --- a/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.shproj +++ b/UnitTests/UnitTests.HighPerformance.Shared/UnitTests.HighPerformance.Shared.shproj @@ -4,9 +4,9 @@ 14.0 - - + + - + \ No newline at end of file diff --git a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj index b565a8fb36e..fcf28c49033 100644 --- a/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj +++ b/UnitTests/UnitTests.HighPerformance.UWP/UnitTests.HighPerformance.UWP.csproj @@ -18,13 +18,12 @@ $(VisualStudioVersion) false true - 8.0 + $(NoWarn);2008 true bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x86 false @@ -35,7 +34,6 @@ bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x86 false @@ -47,7 +45,6 @@ true bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM false @@ -58,7 +55,6 @@ bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM false @@ -70,7 +66,6 @@ true bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM64 false @@ -82,7 +77,6 @@ bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM64 false @@ -94,7 +88,6 @@ true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x64 false @@ -105,7 +98,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x64 false diff --git a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj index 668fa700842..32b82e9bf13 100644 --- a/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj +++ b/UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj @@ -2,15 +2,19 @@ netcoreapp2.1;netcoreapp3.1;net5.0 - false - 8.0 + + + + + + - + @@ -19,12 +23,6 @@ - - - - - - \ No newline at end of file diff --git a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj index 8a58ca86305..18a400e4adb 100644 --- a/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj +++ b/UnitTests/UnitTests.Notifications.NetCore/UnitTests.Notifications.NetCore.csproj @@ -1,26 +1,19 @@ - netcoreapp2.1 - - false - - ;CS8002 - + netcoreapp2.1 - - - + - + + + - - - + \ No newline at end of file diff --git a/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.shproj b/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.shproj index 6c83cf4ed25..f23c7e4782b 100644 --- a/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.shproj +++ b/UnitTests/UnitTests.Notifications.Shared/UnitTests.Notifications.Shared.shproj @@ -4,9 +4,9 @@ 14.0 - - + + - + \ No newline at end of file diff --git a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj index 4ff0203765f..a97ae435d52 100644 --- a/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj +++ b/UnitTests/UnitTests.Notifications.UWP/UnitTests.Notifications.UWP.csproj @@ -17,12 +17,12 @@ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(VisualStudioVersion) 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;CS8002 pdbonly x86 false @@ -46,7 +45,6 @@ true bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM false @@ -57,7 +55,6 @@ bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008;CS8002 pdbonly ARM false @@ -70,7 +67,6 @@ true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x64 false @@ -81,7 +77,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008;CS8002 pdbonly x64 false @@ -97,7 +92,6 @@ true bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM64 false @@ -108,7 +102,6 @@ bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008;CS8002 pdbonly ARM64 false diff --git a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj index 9bfb0fd19f3..ff993c99800 100644 --- a/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj +++ b/UnitTests/UnitTests.Notifications.WinRT/UnitTests.Notifications.WinRT.csproj @@ -17,12 +17,12 @@ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(VisualStudioVersion) false + $(NoWarn);2008 true bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT - ;2008 full x86 false @@ -33,7 +33,6 @@ bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;WINRT true - ;2008;CS8002 pdbonly x86 false @@ -46,7 +45,6 @@ true bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT - ;2008 full ARM false @@ -57,7 +55,6 @@ bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true - ;2008;CS8002 pdbonly ARM false @@ -70,7 +67,6 @@ true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT - ;2008 full x64 false @@ -81,7 +77,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true - ;2008;CS8002 pdbonly x64 false @@ -97,7 +92,6 @@ true bin\ARM64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;WINRT - ;2008 full ARM64 false @@ -108,7 +102,6 @@ bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP;WINRT true - ;2008;CS8002 pdbonly ARM64 false diff --git a/UnitTests/UnitTests.Shared/UnitTests.Shared.shproj b/UnitTests/UnitTests.Shared/UnitTests.Shared.shproj index 0a7e9637716..ac39578b12e 100644 --- a/UnitTests/UnitTests.Shared/UnitTests.Shared.shproj +++ b/UnitTests/UnitTests.Shared/UnitTests.Shared.shproj @@ -4,9 +4,9 @@ 14.0 - - + + - + \ No newline at end of file diff --git a/UnitTests/UnitTests.UWP/Behaviors/Test_AutoSelectBehavior.cs b/UnitTests/UnitTests.UWP/Behaviors/Test_AutoSelectBehavior.cs index c2774d06c17..84260916b29 100644 --- a/UnitTests/UnitTests.UWP/Behaviors/Test_AutoSelectBehavior.cs +++ b/UnitTests/UnitTests.UWP/Behaviors/Test_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/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index e099b3c440c..0323d553a9a 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -17,13 +17,12 @@ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(VisualStudioVersion) false - 9.0 + $(NoWarn);2008 true bin\x86\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x86 false @@ -34,7 +33,6 @@ bin\x86\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008;CS8002 pdbonly x86 false @@ -48,7 +46,6 @@ true bin\ARM\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full ARM false @@ -59,7 +56,6 @@ bin\ARM\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008;CS8002 pdbonly ARM false @@ -69,11 +65,34 @@ true $(OutputPath)$(AssemblyName).xml + + true + bin\ARM64\Debug\ + DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + true + full + ARM64 + false + prompt + true + + + bin\ARM64\Release\ + CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS + true + true + true + pdbonly + ARM64 + false + prompt + $(OutputPath)$(AssemblyName).xml + true + true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x64 false @@ -84,7 +103,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008;CS8002 pdbonly x64 false @@ -327,7 +345,6 @@ true bin\x86\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - ;2008 true full x86 @@ -339,7 +356,6 @@ true bin\ARM\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - ;2008 true full ARM @@ -351,7 +367,6 @@ true bin\x64\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - ;2008 true full x64 @@ -363,7 +378,6 @@ true bin\x86\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - ;2008 true full x86 @@ -375,7 +389,6 @@ true bin\ARM\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - ;2008 true full ARM @@ -387,7 +400,6 @@ true bin\x64\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - ;2008 true full x64 @@ -400,7 +412,6 @@ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true - ;2008 true pdbonly x86 @@ -413,7 +424,6 @@ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true - ;2008 true pdbonly ARM @@ -426,7 +436,6 @@ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true - ;2008 true pdbonly x64 @@ -439,7 +448,6 @@ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true - ;2008 true pdbonly x86 @@ -452,7 +460,6 @@ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true - ;2008 true pdbonly ARM @@ -465,7 +472,6 @@ CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS true true - ;2008 true pdbonly x64 @@ -473,37 +479,10 @@ prompt true - - true - bin\ARM64\Debug\ - DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - ;2008 - true - full - ARM64 - false - prompt - true - - - bin\ARM64\Release\ - CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS - true - true - ;2008;CS8002 - true - pdbonly - ARM64 - false - prompt - $(OutputPath)$(AssemblyName).xml - true - true bin\ARM64\Debug %28Version 1511%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS - ;2008 true full ARM64 @@ -515,7 +494,6 @@ true bin\ARM64\Debug %28Anniversary Update%29\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS - ;2008 true full ARM64 @@ -528,7 +506,6 @@ CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true true - ;2008 true pdbonly ARM64 @@ -541,7 +518,6 @@ CODE_ANALYSIS;CODE_ANALYSIS;TRACE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS;CODE_ANALYSIS true true - ;2008 true pdbonly ARM64 diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index 950b4b4691b..55651aaeaab 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.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 @@ -80,7 +76,6 @@ bin\ARM64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly ARM64 false @@ -92,7 +87,6 @@ true bin\x64\Debug\ DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP - ;2008 full x64 false @@ -103,7 +97,6 @@ bin\x64\Release\ TRACE;NETFX_CORE;WINDOWS_UWP true - ;2008 pdbonly x64 false @@ -170,9 +163,9 @@ 6.1.2 diff --git a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj index bb21f6cab1b..9e48643d0ce 100644 --- a/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj +++ b/UnitTests/UnitTests.XamlIslands/UnitTests.XamlIslands.csproj @@ -2,21 +2,23 @@ WinExe - netcoreapp3.1 - x64;x86 - win-x64;win-x86 true + netcoreapp3.1 + win-x64;win-x86 + + + uap10.0.19041 app.manifest UnitTests.XamlIslands.Program - + - + \ No newline at end of file diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index b931ba9a493..991177c199b 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29230.61 @@ -166,6 +165,7 @@ Global UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{5524523e-db0f-41f7-a0d4-43128422a342}*SharedItemsImports = 4 UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{5f720475-e263-4a5a-8c88-2b805b45b5bc}*SharedItemsImports = 5 UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{7878cd00-85e8-4d02-9757-8a43db4c6510}*SharedItemsImports = 5 + UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{94994424-5f60-4cd8-aba2-101779066208}*SharedItemsImports = 5 UnitTests\UnitTests.Notifications.Shared\UnitTests.Notifications.Shared.projitems*{982cc826-aacd-4855-9075-430bb6ce40a9}*SharedItemsImports = 13 UnitTests\UnitTests.HighPerformance.Shared\UnitTests.HighPerformance.Shared.projitems*{9b3a94a6-0d29-4523-880b-6938e2efeef7}*SharedItemsImports = 13 UnitTests\UnitTests.Shared\UnitTests.Shared.projitems*{a139968e-ad78-4e8c-93b8-9a5523bcac89}*SharedItemsImports = 4 @@ -187,8 +187,6 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.ActiveCfg = Debug|x86 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Build.0 = Debug|x86 - {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|Any CPU.Deploy.0 = Debug|x86 {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.ActiveCfg = Debug|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Build.0 = Debug|ARM {719C43C6-8753-4395-ADAA-2FCC70F76BF3}.Debug|ARM.Deploy.0 = Debug|ARM @@ -371,7 +369,6 @@ Global {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|x86.Build.0 = Release|x86 {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD}.Release|x86.Deploy.0 = Release|x86 {1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Debug|Any CPU.Build.0 = Debug|Any CPU {1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Debug|ARM.ActiveCfg = Debug|ARM {1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Debug|ARM.Build.0 = Debug|ARM {1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -723,23 +720,21 @@ Global {5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.ActiveCfg = Release|x86 {5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.Build.0 = Release|x86 {5524523E-DB0F-41F7-A0D4-43128422A342}.Release|x86.Deploy.0 = Release|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|x64 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|x64 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|x64 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|x64 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|x86 - {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|x86 + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM.ActiveCfg = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.ActiveCfg = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x64.Build.0 = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.ActiveCfg = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Debug|x86.Build.0 = Debug|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM.ActiveCfg = Release|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|ARM64.ActiveCfg = Release|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.ActiveCfg = Release|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|Any CPU + {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|Any CPU {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x86 - {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.Build.0 = Debug|x86 - {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.Deploy.0 = Debug|x86 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.ActiveCfg = Debug|ARM {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Build.0 = Debug|ARM {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Deploy.0 = Debug|ARM @@ -824,7 +819,6 @@ Global {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.ActiveCfg = Release|x86 {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.Build.0 = Release|x86 {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|Any CPU.Build.0 = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM.ActiveCfg = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM.Build.0 = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -843,8 +837,6 @@ Global {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.ActiveCfg = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|x86.Build.0 = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.ActiveCfg = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Build.0 = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|ARM.Deploy.0 = Debug|Any CPU @@ -872,7 +864,6 @@ Global {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|Any CPU {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Build.0 = Debug|x86 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.Deploy.0 = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.ActiveCfg = Debug|ARM {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Build.0 = Debug|ARM {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Deploy.0 = Debug|ARM @@ -1020,27 +1011,43 @@ Global {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.ActiveCfg = Release|Any CPU {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.Build.0 = Release|Any CPU {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|Any CPU.ActiveCfg = Debug|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|Any CPU.Build.0 = Debug|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM.ActiveCfg = Debug|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM.Build.0 = Debug|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM64.ActiveCfg = Debug|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM64.Build.0 = Debug|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x64.ActiveCfg = Debug|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x64.Build.0 = Debug|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x86.ActiveCfg = Debug|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x86.Build.0 = Debug|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|Any CPU.ActiveCfg = Release|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|Any CPU.Build.0 = Release|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.ActiveCfg = Release|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM.Build.0 = Release|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.ActiveCfg = Release|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.Build.0 = Release|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.ActiveCfg = Release|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.Build.0 = Release|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.ActiveCfg = Release|x86 {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.Build.0 = Release|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|Any CPU.ActiveCfg = Debug|x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|Any CPU.Build.0 = Debug|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.ActiveCfg = Debug|x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM.Build.0 = Debug|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.ActiveCfg = Debug|x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|ARM64.Build.0 = Debug|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.ActiveCfg = Debug|x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x64.Build.0 = Debug|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.ActiveCfg = Debug|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Debug|x86.Build.0 = Debug|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|Any CPU.ActiveCfg = Release|x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|Any CPU.Build.0 = Release|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.ActiveCfg = Release|x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM.Build.0 = Release|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.ActiveCfg = Release|x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|ARM64.Build.0 = Release|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.ActiveCfg = Release|x86 + {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.Build.0 = Release|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.ActiveCfg = Release|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.Build.0 = Release|x86 {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -1064,15 +1071,23 @@ Global {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.ActiveCfg = Release|Any CPU {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.Build.0 = Release|Any CPU {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|Any CPU.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|Any CPU.Build.0 = Debug|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.Build.0 = Debug|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.Build.0 = Debug|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.Build.0 = Debug|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.ActiveCfg = Debug|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.Build.0 = Debug|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|Any CPU.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|Any CPU.Build.0 = Release|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.Build.0 = Release|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.Build.0 = Release|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.Build.0 = Release|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|x86 {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.Build.0 = Release|x86 {099B60FD-DAD6-4648-9DE2-8DBF9DCD9557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/build/Windows.Toolkit.Common.props b/build/Windows.Toolkit.Common.props new file mode 100644 index 00000000000..29fb8f9015a --- /dev/null +++ b/build/Windows.Toolkit.Common.props @@ -0,0 +1,47 @@ + + + + .NET Foundation + Microsoft.Toolkit + Windows Community Toolkit + Windows;Community;Toolkit;WCT + MIT + true + (c) .NET Foundation and Contributors. All rights reserved. + https://github.com/CommunityToolkit/WindowsCommunityToolkit + https://github.com/CommunityToolkit/WindowsCommunityToolkit/releases + Icon.png + https://raw.githubusercontent.com/CommunityToolkit/WindowsCommunityToolkit/master/build/nuget.png + + + + Strict + Disable + Latest + en-US + true + + + + 10.0 + 19041 + 17763 + + + + $(MSBuildProjectName.Contains('.Design')) + $(MSBuildProjectName.Contains('.Sample')) + $(MSBuildProjectName.Contains('Test')) + $(MSBuildProjectName.Contains('.Uwp')) + False + False + True + + + + true + true + $(TF_BUILD) + + + \ No newline at end of file diff --git a/build/Windows.Toolkit.Common.targets b/build/Windows.Toolkit.Common.targets new file mode 100644 index 00000000000..b73fa48f26a --- /dev/null +++ b/build/Windows.Toolkit.Common.targets @@ -0,0 +1,24 @@ + + + + + $(Product) Asset + + + + $(CommonTags);.NET + $(CommonTags);UWP + $(CommonTags);$(PackageTags) + $(CommonTags) + + + + + + + + + + + + \ No newline at end of file diff --git a/build/Windows.Toolkit.Uwp.Build.targets b/build/Windows.Toolkit.UWP.Build.targets similarity index 100% rename from build/Windows.Toolkit.Uwp.Build.targets rename to build/Windows.Toolkit.UWP.Build.targets diff --git a/build/Windows.Toolkit.UWP.Controls.targets b/build/Windows.Toolkit.UWP.Controls.targets new file mode 100644 index 00000000000..27089aa0fc7 --- /dev/null +++ b/build/Windows.Toolkit.UWP.Controls.targets @@ -0,0 +1,38 @@ + + + + + + + + + + + + $(TargetsForTfmSpecificBuildOutput);_IncludeDesignToolsInPackage + $(IncludeBuildOutput) + + + + + + $(OutputPath)Design + $(DesignToolsOutputPath)\ + + + + + + + + + + + + $([System.IO.Path]::Combine('%(PackagePath)', '%(Filename)%(Extension)')) + %(FullPath) + + + + + \ No newline at end of file diff --git a/build/Windows.Toolkit.Workarounds.Xaml.targets b/build/Windows.Toolkit.Workarounds.Xaml.targets new file mode 100644 index 00000000000..ae7dc1a56ea --- /dev/null +++ b/build/Windows.Toolkit.Workarounds.Xaml.targets @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file