From 6956c733fa0211dc2db0b1632e4ed9118ea89e33 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Thu, 10 Dec 2020 16:16:28 -0500 Subject: [PATCH 01/84] Move some controls to Primitives. --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 4 ++ .../AdaptiveGridView.Properties.cs | 0 .../AdaptiveGridView/AdaptiveGridView.cs | 0 .../AdaptiveHeightValueConverter.cs | 0 .../DockPanel/Dock.cs | 0 .../DockPanel/DockPanel.Properties.cs | 0 .../DockPanel/DockPanel.cs | 0 ....Toolkit.Uwp.UI.Controls.Primitives.csproj | 46 +++++++++++++++++++ ....UI.Controls.Primitives.csproj.DotSettings | 3 ++ .../Properties/AssemblyInfo.cs | 13 ++++++ .../StaggeredPanel/StaggeredPanel.cs | 0 .../SwitchPresenter/Case.cs | 0 .../SwitchPresenter/CaseCollection.cs | 0 .../SwitchPresenter/SwitchPresenter.cs | 0 .../UniformGrid/TakenSpotsReferenceHolder.cs | 0 .../UniformGrid/UniformGrid.Helpers.cs | 0 .../UniformGrid/UniformGrid.Properties.cs | 0 .../UniformGrid/UniformGrid.cs | 0 .../VisualStudioToolsManifest.xml | 11 +++++ .../WrapPanel/StretchChild.cs | 0 .../WrapPanel/WrapPanel.Data.cs | 0 .../WrapPanel/WrapPanel.cs | 0 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 8 +--- ...Toolkit.Uwp.UI.Controls.csproj.DotSettings | 1 - .../VisualStudioToolsManifest.xml | 5 -- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 4 ++ Windows Community Toolkit.sln | 23 ++++++++++ 27 files changed, 106 insertions(+), 12 deletions(-) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/AdaptiveGridView/AdaptiveGridView.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/AdaptiveGridView/AdaptiveGridView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/AdaptiveGridView/AdaptiveHeightValueConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/DockPanel/Dock.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/DockPanel/DockPanel.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/DockPanel/DockPanel.cs (100%) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj.DotSettings create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/StaggeredPanel/StaggeredPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/SwitchPresenter/Case.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/SwitchPresenter/CaseCollection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/SwitchPresenter/SwitchPresenter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/UniformGrid/TakenSpotsReferenceHolder.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/UniformGrid/UniformGrid.Helpers.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/UniformGrid/UniformGrid.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/UniformGrid/UniformGrid.cs (100%) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapPanel/StretchChild.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapPanel/WrapPanel.Data.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Primitives}/WrapPanel/WrapPanel.cs (100%) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index d89fc02aa6b..e0bb1401acd 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1498,6 +1498,10 @@ {6fedf199-b052-49dd-8f3e-2a9224998e0f} Microsoft.Toolkit.Uwp.UI.Controls.Markdown + + {84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a} + Microsoft.Toolkit.Uwp.UI.Controls.Primitives + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveGridView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveHeightValueConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/AdaptiveGridView/AdaptiveHeightValueConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/Dock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/Dock.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/DockPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/DockPanel.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/DockPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DockPanel/DockPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs 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 new file mode 100644 index 00000000000..a8f1f2508b6 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj @@ -0,0 +1,46 @@ + + + + uap10.0.17763 + Windows Community Toolkit Controls + + This library provides XAML templated controls. It is part of the Windows Community Toolkit. + + Controls: + - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space. + - DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other. + - StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space. + - UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space. + - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line. + + UWP Toolkit Windows Controls XAML WrapPanel Adaptive DockPanel StaggeredPanel Staggered UniformGrid Uniform Grid + + false + 8.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj.DotSettings new file mode 100644 index 00000000000..195f02ce511 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj.DotSettings @@ -0,0 +1,3 @@ + + True + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..cd5fbb60e47 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs @@ -0,0 +1,13 @@ +// 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 System.Resources; +using System.Runtime.CompilerServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: InternalsVisibleTo("UnitTests.UWP")] +[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")] +[assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/StaggeredPanel/StaggeredPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/StaggeredPanel/StaggeredPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/Case.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/Case.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/CaseCollection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/SwitchPresenter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/SwitchPresenter/SwitchPresenter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/TakenSpotsReferenceHolder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/TakenSpotsReferenceHolder.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.Helpers.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/UniformGrid/UniformGrid.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml new file mode 100644 index 00000000000..fa884a8a5e8 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/StretchChild.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/StretchChild.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.Data.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/WrapPanel/WrapPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs 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 793d9571766..884d8427e87 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 @@ -7,12 +7,10 @@ This library provides XAML templated controls. It is part of the Windows Community Toolkit. Controls: - - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space. - BladeView: Provides a horizontal collection of blades for master-detail scenarios. - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source. - Carousel: Presents items in a carousel control. - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version. - - DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other. - DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup. - Expander: Expander allows user to show/hide content based on a boolean state. - GridSplitter: A the control that redistributes space between columns or rows of a Grid control. @@ -32,14 +30,11 @@ - RemoteDevicePicker: Remote Device Picker Control for Project Rome. - RotatorTile: Rotates through a set of items one-by-one like a live-tile. - ScrollHeader: A UI control that works as a ListView or GridView header control with quick return, sticky, and fade behavior. - - StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space. - TextToolbar: A Toolbar for Editing Text attached to a RichEditBox. It can format RTF, Markdown, or use a Custom Formatter. - TileControl: A ContentControl that show an image repeated many times. - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags. - - UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space. - - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line. - UWP Toolkit Windows Controls XAML Range WrapPanel Adaptive Markdown BladeView Blade CameraPreview Camera Carousel DockPanel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader StaggeredPanel Staggered Tile Tokenizing TextBox UniformGrid Uniform Grid + UWP Toolkit Windows Controls XAML Range Markdown BladeView Blade CameraPreview Camera Carousel DropShadow Expander GridSplitter HeaderedContent ImageEx InAppNotification InfiniteCanvas Master Details MasterDetails Orbit Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox false 8.0 @@ -52,6 +47,7 @@ + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings index 8a263d98309..fefa011eb69 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings +++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings @@ -1,5 +1,4 @@  - True True True True diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml index b952e2ec958..43ffe06715a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml @@ -1,13 +1,11 @@ - - @@ -30,11 +28,8 @@ - - - \ No newline at end of file diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index b7adf88cfc3..10e4e0b4cd1 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -238,6 +238,10 @@ {b1e850ff-dde6-44d5-a830-34250e97a687} Microsoft.Toolkit.Uwp.Connectivity + + {84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a} + Microsoft.Toolkit.Uwp.UI.Controls.Primitives + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index 17df1370cd3..d9b251ac032 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -135,6 +135,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.TAEF", "UITes EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UITests\UITests.Tests.Shared\UITests.Tests.Shared.shproj", "{1D8B0260-5C17-41DA-9C38-1E37441B3925}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj", "{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4 @@ -956,6 +958,26 @@ Global {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x64.Build.0 = Release|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.ActiveCfg = Release|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.Build.0 = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM.ActiveCfg = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM.Build.0 = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|ARM64.Build.0 = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|x64.ActiveCfg = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|x64.Build.0 = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|x86.ActiveCfg = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Debug|x86.Build.0 = Debug|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|Any CPU.Build.0 = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|ARM.ActiveCfg = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|ARM.Build.0 = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|ARM64.ActiveCfg = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|ARM64.Build.0 = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x64.ActiveCfg = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x64.Build.0 = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.ActiveCfg = Release|Any CPU + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -997,6 +1019,7 @@ Global {5F720475-E263-4A5A-8C88-2B805B45B5BC} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345} From e885c1014da4c149ad9fc2ecef35945edc990fa1 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Thu, 10 Dec 2020 16:26:45 -0500 Subject: [PATCH 02/84] Update Primiative controls ns --- .../Pages/About.xaml | 3 ++- .../Pages/SampleController.xaml | 3 ++- .../AdaptiveGridViewCode.bind | 2 +- .../AdaptiveGridViewPage.xaml.cs | 2 +- .../SamplePages/DockPanel/DockPanel.bind | 2 +- .../SamplePages/DockPanel/DockPanelPage.xaml | 2 +- .../DockPanel/DockPanelPage.xaml.cs | 2 +- .../HeaderedItemsControlXaml.bind | 3 ++- .../SamplePages/LiveTile/LiveTilePage.xaml | 2 +- .../SamplePages/Loading/LoadingCode.bind | 3 ++- .../SamplePages/Loading/LoadingPage.xaml | 3 ++- .../SamplePages/Loading/LoadingPage.xaml.cs | 1 + .../StaggeredPanel/StaggeredPanel.bind | 2 +- .../StaggeredPanel/StaggeredPanelPage.xaml | 2 +- .../ThemeListener/ThemeListenerPage.xaml | 2 +- .../UniformGrid/UniformGridXaml.bind | 2 +- .../WeatherLiveTileAndToastPage.xaml | 2 +- .../SamplePages/WrapPanel/WrapPanel.bind | 2 +- .../SamplePages/WrapPanel/WrapPanelPage.xaml | 2 +- .../WrapPanel/WrapPanelPage.xaml.cs | 2 +- .../AdaptiveGridView.Properties.cs | 2 +- .../AdaptiveGridView/AdaptiveGridView.cs | 2 +- .../AdaptiveHeightValueConverter.cs | 2 +- .../DockPanel/Dock.cs | 2 +- .../DockPanel/DockPanel.Properties.cs | 2 +- .../DockPanel/DockPanel.cs | 2 +- .../StaggeredPanel/StaggeredPanel.cs | 2 +- .../SwitchPresenter/Case.cs | 2 +- .../SwitchPresenter/CaseCollection.cs | 2 +- .../SwitchPresenter/SwitchPresenter.cs | 2 +- .../UniformGrid/TakenSpotsReferenceHolder.cs | 2 +- .../UniformGrid/UniformGrid.Helpers.cs | 2 +- .../UniformGrid/UniformGrid.Properties.cs | 2 +- .../UniformGrid/UniformGrid.cs | 2 +- .../VisualStudioToolsManifest.xml | 10 +++++----- .../WrapPanel/StretchChild.cs | 2 +- .../WrapPanel/WrapPanel.Data.cs | 2 +- .../WrapPanel/WrapPanel.cs | 2 +- .../ColorPicker/ColorPicker.xaml | 19 ++++++++++--------- .../Menu/Menu.Events.cs | 1 + .../Menu/Menu.cs | 1 + .../Menu/Menu.xaml | 4 ++-- .../TokenizingTextBox/TokenizingTextBox.xaml | 3 ++- .../Test_AdaptiveHeightValueConverter.cs | 2 +- .../Controls/Test_UniformGrid_AutoLayout.cs | 18 +++++++++--------- .../Controls/Test_UniformGrid_Dimensions.cs | 14 +++++++------- .../UI/Controls/Test_UniformGrid_FreeSpots.cs | 2 +- .../Test_UniformGrid_RowColDefinitions.cs | 18 +++++++++--------- UnitTests/UnitTests.UWP/UnitTestApp.xaml | 2 +- .../XamlIslandsTest_WrapPanel.cs | 2 +- 50 files changed, 92 insertions(+), 82 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml index 0607623cd30..8d4d4d8ea2a 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml @@ -4,6 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp" xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages" @@ -61,7 +62,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml index f0ad630fd1a..9848a797f25 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml @@ -3,6 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" xmlns:controlsLocal="using:Microsoft.Toolkit.Uwp.SampleApp.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations" @@ -125,7 +126,7 @@ Margin="10,10,0,0"> - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind index 8e2fc5394c8..b85e74eb7f2 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind @@ -1,7 +1,7 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs index 45e6f47a270..5cdcd94b3b0 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs @@ -6,7 +6,7 @@ using System.Collections.ObjectModel; using System.Linq; using Microsoft.Toolkit.Uwp.SampleApp.Data; -using Microsoft.Toolkit.Uwp.UI.Controls; +using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Popups; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind index 169df1ab3e4..760fd3c287f 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind @@ -1,7 +1,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml index 5391882742c..c03056d33d5 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:visualizer="using:NotificationsVisualizerLibrary" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind index 3f731b56e19..0950ecfc643 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind @@ -3,6 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" xmlns:brushes="using:Microsoft.Toolkit.Uwp.UI.Media" mc:Ignorable="d"> @@ -50,7 +51,7 @@ His audiam deserunt in, eum ubique voluptatibus te. In reque dicta usu. Ne rebum dissentiet eam, vim omnis deseruisse id. Ullum deleniti vituperata at quo, insolens complectitur te eos, ea pri dico munere propriae. Vel ferri facilis ut, qui paulo ridens praesent ad. Possim alterum qui cu. Accusamus consulatu ius te, cu decore soleat appareat usu. - - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs index a6b3b57aa53..47c4179d850 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using Microsoft.Toolkit.Uwp.UI.Controls; +using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind index d39434e7e77..69fa097aa42 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml index da5ae9e798d..9d40597e74e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml index 39d02c41c6a..ef6d2aeb989 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml index ed96ad629fb..71d1e315b0d 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:visualizer="using:NotificationsVisualizerLibrary" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind index bb3f26c22d7..c26c7ac2271 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml index 4ea1953192d..2f408f72cc3 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs index 2d7825629d0..9607ba4b3c3 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs @@ -5,7 +5,7 @@ using System; using System.Collections.ObjectModel; using Microsoft.Toolkit.Uwp.SampleApp.Data; -using Microsoft.Toolkit.Uwp.UI.Controls; +using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs index a93a4287263..8f0d5639d5c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs index 7b77af7119e..05842e3d73a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs index e2bbba9044e..4c9fd299914 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { internal class AdaptiveHeightValueConverter : IValueConverter { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs index 8c8afb44951..d256fe88e1c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// Specifies the Dock position of a child element that is inside a . diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs index 72931ee3d90..3d7cbe077c8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs @@ -4,7 +4,7 @@ using Windows.UI.Xaml; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// Defines an area where you can arrange child elements either horizontally or vertically, relative to each other. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs index 8f395f01bf1..9aeb4155a8f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// Defines an area where you can arrange child elements either horizontally or vertically, relative to each other. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs index e148430bb91..0299df1d9c5 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// Arranges child elements into a staggered grid pattern where items are added to the column that has used least amount of space. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs index 7829abc2a8f..e9162b58f60 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs @@ -6,7 +6,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Markup; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// is the value container for the . diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs index d1f3ee96187..9dafd3604ea 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// An collection of to help with XAML interop. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs index 0d1202e0bb7..2c07fcdb905 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Markup; using Windows.UI.Xaml.Media; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// The is a which can allow a developer to mimic a switch statement within XAML. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs index 9474082e25e..e8dda6e0094 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs @@ -6,7 +6,7 @@ using System.Drawing; using Microsoft.Toolkit.Diagnostics; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// Referencable class object we can use to have a reference shared between diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs index 9d16b5cd986..0130b7f16ee 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// The UniformGrid control presents information within a Grid with even spacing. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs index 9bcf6286416..5a29c496106 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// The UniformGrid spaces items evenly. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs index a638a1db26c..ac141216249 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs @@ -9,7 +9,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// The UniformGrid control presents information within a Grid with even spacing. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml index fa884a8a5e8..42613caa37c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml @@ -1,11 +1,11 @@ - - - - - + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs index fba7e723a83..2e6aed4b146 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// Options for how to calculate the layout of items. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs index c3112d9bd96..764339bf1ff 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs @@ -8,7 +8,7 @@ using Windows.Foundation; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width/ max height is received a new row(in case of horizontal) or column (in case of vertical) is created to fit new controls. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs index b416c50cba4..e94664f252d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs @@ -9,7 +9,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls +namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives { /// /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width / max height is reached a new row (in case of horizontal) or column (in case of vertical) is created to fit new controls. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml index 3e32331d4d7..bc6b698ff12 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml @@ -1,6 +1,7 @@  - - + - - + + - @@ -177,8 +178,8 @@ - - + + @@ -375,8 +376,8 @@ AutomationProperties.Name="Alpha Channel" DefaultForeground="{ThemeResource TextControlForeground}" /> - - + + @@ -86,7 +86,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml index 8245896155c..341c88373e6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml @@ -1,6 +1,7 @@  @@ -51,7 +52,7 @@ - diff --git a/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs index 9d10b9f199e..15147e4a048 100644 --- a/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs +++ b/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Toolkit.Uwp.UI.Controls; +using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using Windows.UI.Xaml; diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs index b24c51b2439..8616f7f19b5 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using Microsoft.Toolkit.Uwp.UI.Controls; +using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; @@ -24,7 +24,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSingle() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -86,7 +86,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementZeroZeroSpecial() xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xmlns:ex=""using:Microsoft.Toolkit.Uwp.UI.Extensions"" - xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -147,7 +147,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSquare() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -207,7 +207,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement_FixedPosition() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -254,7 +254,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -301,7 +301,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -348,7 +348,7 @@ public void Test_UniformGrid_AutoLayout_LargeElement() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -396,7 +396,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement_FixedPosition() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs index a8e43606e31..6e280cfdff9 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using Microsoft.Toolkit.Uwp.UI.Controls; +using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; @@ -22,7 +22,7 @@ public void Test_UniformGrid_GetDimensions_NoElements() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> ") as FrameworkElement; @@ -50,7 +50,7 @@ public void Test_UniformGrid_GetDimensions_AllVisible() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -86,7 +86,7 @@ public void Test_UniformGrid_GetDimensions_SomeVisible() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -127,7 +127,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumn() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -163,7 +163,7 @@ public void Test_UniformGrid_GetDimensions_ElementLarger() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -199,7 +199,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumnEqualsColumns() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs index 9b6bfb31cd5..b0ba511535e 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs @@ -4,7 +4,7 @@ using System.Linq; using Microsoft.Toolkit.Extensions; -using Microsoft.Toolkit.Uwp.UI.Controls; +using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs index bf6539aea5f..8fbcfb323b3 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Toolkit.Uwp.UI.Controls; +using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; @@ -21,7 +21,7 @@ public void Test_UniformGrid_SetupRowDefinitions_AllAutomatic() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -92,7 +92,7 @@ public void Test_UniformGrid_SetupRowDefinitions_FirstFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -187,7 +187,7 @@ public void Test_UniformGrid_SetupRowDefinitions_MiddleFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -287,7 +287,7 @@ public void Test_UniformGrid_SetupRowDefinitions_MiddleAndEndFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -422,7 +422,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_AllAutomatic() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -493,7 +493,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_FirstFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -588,7 +588,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_MiddleFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> @@ -690,7 +690,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_FirstAndEndFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> diff --git a/UnitTests/UnitTests.UWP/UnitTestApp.xaml b/UnitTests/UnitTests.UWP/UnitTestApp.xaml index 38a0254edea..8e4bb57cb53 100644 --- a/UnitTests/UnitTests.UWP/UnitTestApp.xaml +++ b/UnitTests/UnitTests.UWP/UnitTestApp.xaml @@ -1,7 +1,7 @@  { var xamlItemsPanelTemplate = @" + xmlns:controls='using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives'> From 2fdcbe6bfde8904b6b2dfdc7f66a898666dc241a Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Wed, 6 Jan 2021 17:13:30 -0500 Subject: [PATCH 03/84] Apply change for platform uno compatiblity #3651 --- .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a8f1f2508b6..3cb5a2dff4e 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 @@ -1,7 +1,7 @@  - uap10.0.17763 + uap10.0.17763 Windows Community Toolkit Controls This library provides XAML templated controls. It is part of the Windows Community Toolkit. From 7431e17c194d38e7bf0ce38030f633eab659d5ad Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 8 Jan 2021 13:50:51 -0500 Subject: [PATCH 04/84] Update Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj Co-authored-by: Michael Hawker MSFT (XAML Llama) <24302614+michael-hawker@users.noreply.github.com> --- .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3cb5a2dff4e..37c86715cf5 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 @@ -4,7 +4,7 @@ uap10.0.17763 Windows Community Toolkit Controls - This library provides XAML templated controls. 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 part of the Windows Community Toolkit. Controls: - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space. From 1e34abfc40f0414a55c8161d0ccdfb5b47762f48 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 8 Jan 2021 13:58:34 -0500 Subject: [PATCH 05/84] Remove System.ValueTuple from Controls.Primitives --- .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 4 ---- 1 file changed, 4 deletions(-) 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 37c86715cf5..9f20cac2069 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 @@ -19,10 +19,6 @@ 8.0 - - - - From ac71f641111803ea004ea1e5b7d0163f821f302f Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 8 Jan 2021 14:01:47 -0500 Subject: [PATCH 06/84] Added SwitchPresenter in description of Control.Primitives project --- .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 1 + 1 file changed, 1 insertion(+) 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 9f20cac2069..c000c19e1c1 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 @@ -10,6 +10,7 @@ - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space. - DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other. - StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space. + - SwitchPresenter: A presenter which can act as a switch statement for layout providing alternate layouts based on a value. - UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space. - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line. From b6bc173b4bdcf3f15c0c4c08c1f49bc8b72659c5 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 8 Jan 2021 14:06:10 -0500 Subject: [PATCH 07/84] Revert "Update Primiative controls ns" This reverts commit e885c1014da4c149ad9fc2ecef35945edc990fa1. --- .../Pages/About.xaml | 3 +-- .../Pages/SampleController.xaml | 3 +-- .../AdaptiveGridViewCode.bind | 2 +- .../AdaptiveGridViewPage.xaml.cs | 2 +- .../SamplePages/DockPanel/DockPanel.bind | 2 +- .../SamplePages/DockPanel/DockPanelPage.xaml | 2 +- .../DockPanel/DockPanelPage.xaml.cs | 2 +- .../HeaderedItemsControlXaml.bind | 3 +-- .../SamplePages/LiveTile/LiveTilePage.xaml | 2 +- .../SamplePages/Loading/LoadingCode.bind | 3 +-- .../SamplePages/Loading/LoadingPage.xaml | 3 +-- .../SamplePages/Loading/LoadingPage.xaml.cs | 1 - .../StaggeredPanel/StaggeredPanel.bind | 2 +- .../StaggeredPanel/StaggeredPanelPage.xaml | 2 +- .../ThemeListener/ThemeListenerPage.xaml | 2 +- .../UniformGrid/UniformGridXaml.bind | 2 +- .../WeatherLiveTileAndToastPage.xaml | 2 +- .../SamplePages/WrapPanel/WrapPanel.bind | 2 +- .../SamplePages/WrapPanel/WrapPanelPage.xaml | 2 +- .../WrapPanel/WrapPanelPage.xaml.cs | 2 +- .../AdaptiveGridView.Properties.cs | 2 +- .../AdaptiveGridView/AdaptiveGridView.cs | 2 +- .../AdaptiveHeightValueConverter.cs | 2 +- .../DockPanel/Dock.cs | 2 +- .../DockPanel/DockPanel.Properties.cs | 2 +- .../DockPanel/DockPanel.cs | 2 +- .../StaggeredPanel/StaggeredPanel.cs | 2 +- .../SwitchPresenter/Case.cs | 2 +- .../SwitchPresenter/CaseCollection.cs | 2 +- .../SwitchPresenter/SwitchPresenter.cs | 2 +- .../UniformGrid/TakenSpotsReferenceHolder.cs | 2 +- .../UniformGrid/UniformGrid.Helpers.cs | 2 +- .../UniformGrid/UniformGrid.Properties.cs | 2 +- .../UniformGrid/UniformGrid.cs | 2 +- .../VisualStudioToolsManifest.xml | 10 +++++----- .../WrapPanel/StretchChild.cs | 2 +- .../WrapPanel/WrapPanel.Data.cs | 2 +- .../WrapPanel/WrapPanel.cs | 2 +- .../ColorPicker/ColorPicker.xaml | 19 +++++++++---------- .../Menu/Menu.Events.cs | 1 - .../Menu/Menu.cs | 1 - .../Menu/Menu.xaml | 4 ++-- .../TokenizingTextBox/TokenizingTextBox.xaml | 3 +-- .../Test_AdaptiveHeightValueConverter.cs | 2 +- .../Controls/Test_UniformGrid_AutoLayout.cs | 18 +++++++++--------- .../Controls/Test_UniformGrid_Dimensions.cs | 14 +++++++------- .../UI/Controls/Test_UniformGrid_FreeSpots.cs | 2 +- .../Test_UniformGrid_RowColDefinitions.cs | 18 +++++++++--------- UnitTests/UnitTests.UWP/UnitTestApp.xaml | 2 +- .../XamlIslandsTest_WrapPanel.cs | 2 +- 50 files changed, 82 insertions(+), 92 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml index 8d4d4d8ea2a..0607623cd30 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml @@ -4,7 +4,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" - xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions" xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp" xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages" @@ -62,7 +61,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml index 9848a797f25..f0ad630fd1a 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/Pages/SampleController.xaml @@ -3,7 +3,6 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" - xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" xmlns:controlsLocal="using:Microsoft.Toolkit.Uwp.SampleApp.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations" @@ -126,7 +125,7 @@ Margin="10,10,0,0"> - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind index b85e74eb7f2..8e2fc5394c8 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewCode.bind @@ -1,7 +1,7 @@ diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs index 5cdcd94b3b0..45e6f47a270 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/AdaptiveGridView/AdaptiveGridViewPage.xaml.cs @@ -6,7 +6,7 @@ using System.Collections.ObjectModel; using System.Linq; using Microsoft.Toolkit.Uwp.SampleApp.Data; -using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; +using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Popups; using Windows.UI.Xaml; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind index 760fd3c287f..169df1ab3e4 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/DockPanel/DockPanel.bind @@ -1,7 +1,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml index c03056d33d5..5391882742c 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/LiveTile/LiveTilePage.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:visualizer="using:NotificationsVisualizerLibrary" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind index 0950ecfc643..3f731b56e19 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind @@ -3,7 +3,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" - xmlns:primitiveControls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" xmlns:brushes="using:Microsoft.Toolkit.Uwp.UI.Media" mc:Ignorable="d"> @@ -51,7 +50,7 @@ His audiam deserunt in, eum ubique voluptatibus te. In reque dicta usu. Ne rebum dissentiet eam, vim omnis deseruisse id. Ullum deleniti vituperata at quo, insolens complectitur te eos, ea pri dico munere propriae. Vel ferri facilis ut, qui paulo ridens praesent ad. Possim alterum qui cu. Accusamus consulatu ius te, cu decore soleat appareat usu. - - + diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs index 47c4179d850..a6b3b57aa53 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingPage.xaml.cs @@ -4,7 +4,6 @@ using System.Threading.Tasks; using Microsoft.Toolkit.Uwp.UI.Controls; -using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind index 69fa097aa42..d39434e7e77 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml index 9d40597e74e..da5ae9e798d 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanelPage.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml index ef6d2aeb989..39d02c41c6a 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ThemeListener/ThemeListenerPage.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml index 71d1e315b0d..ed96ad629fb 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WeatherLiveTileAndToast/WeatherLiveTileAndToastPage.xaml @@ -4,7 +4,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:visualizer="using:NotificationsVisualizerLibrary" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind index c26c7ac2271..bb3f26c22d7 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanel.bind @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml index 2f408f72cc3..4ea1953192d 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives" + xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" mc:Ignorable="d"> diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs index 9607ba4b3c3..2d7825629d0 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/WrapPanel/WrapPanelPage.xaml.cs @@ -5,7 +5,7 @@ using System; using System.Collections.ObjectModel; using Microsoft.Toolkit.Uwp.SampleApp.Data; -using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; +using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.Toolkit.Uwp.UI.Extensions; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs index 8f0d5639d5c..a93a4287263 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.Properties.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs index 05842e3d73a..7b77af7119e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveGridView.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// The AdaptiveGridView control allows to present information within a Grid View perfectly adjusting the diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs index 4c9fd299914..e2bbba9044e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/AdaptiveGridView/AdaptiveHeightValueConverter.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { internal class AdaptiveHeightValueConverter : IValueConverter { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs index d256fe88e1c..8c8afb44951 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/Dock.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// Specifies the Dock position of a child element that is inside a . diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs index 3d7cbe077c8..72931ee3d90 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.Properties.cs @@ -4,7 +4,7 @@ using Windows.UI.Xaml; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// Defines an area where you can arrange child elements either horizontally or vertically, relative to each other. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs index 9aeb4155a8f..8f395f01bf1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/DockPanel/DockPanel.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// Defines an area where you can arrange child elements either horizontally or vertically, relative to each other. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs index 0299df1d9c5..e148430bb91 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredPanel/StaggeredPanel.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// Arranges child elements into a staggered grid pattern where items are added to the column that has used least amount of space. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs index e9162b58f60..7829abc2a8f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/Case.cs @@ -6,7 +6,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Markup; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// is the value container for the . diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs index 9dafd3604ea..d1f3ee96187 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/CaseCollection.cs @@ -6,7 +6,7 @@ using System.Collections; using System.Collections.Generic; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// An collection of to help with XAML interop. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs index 2c07fcdb905..0d1202e0bb7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/SwitchPresenter/SwitchPresenter.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Markup; using Windows.UI.Xaml.Media; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// The is a which can allow a developer to mimic a switch statement within XAML. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs index e8dda6e0094..9474082e25e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/TakenSpotsReferenceHolder.cs @@ -6,7 +6,7 @@ using System.Drawing; using Microsoft.Toolkit.Diagnostics; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// Referencable class object we can use to have a reference shared between diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs index 0130b7f16ee..9d16b5cd986 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Helpers.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// The UniformGrid control presents information within a Grid with even spacing. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs index 5a29c496106..9bcf6286416 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.Properties.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Data; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// The UniformGrid spaces items evenly. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs index ac141216249..a638a1db26c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/UniformGrid/UniformGrid.cs @@ -9,7 +9,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// The UniformGrid control presents information within a Grid with even spacing. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml index 42613caa37c..fa884a8a5e8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml @@ -1,11 +1,11 @@ - - - - - + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs index 2e6aed4b146..fba7e723a83 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/StretchChild.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// Options for how to calculate the layout of items. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs index 764339bf1ff..c3112d9bd96 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.Data.cs @@ -8,7 +8,7 @@ using Windows.Foundation; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width/ max height is received a new row(in case of horizontal) or column (in case of vertical) is created to fit new controls. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs index e94664f252d..b416c50cba4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs @@ -9,7 +9,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Primitives +namespace Microsoft.Toolkit.Uwp.UI.Controls { /// /// WrapPanel is a panel that position child control vertically or horizontally based on the orientation and when max width / max height is reached a new row (in case of horizontal) or column (in case of vertical) is created to fit new controls. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml index bc6b698ff12..3e32331d4d7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml @@ -1,7 +1,6 @@  - - + - - + + - @@ -178,8 +177,8 @@ - - + + @@ -376,8 +375,8 @@ AutomationProperties.Name="Alpha Channel" DefaultForeground="{ThemeResource TextControlForeground}" /> - - + + @@ -86,7 +86,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml index 341c88373e6..8245896155c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml @@ -1,7 +1,6 @@  @@ -52,7 +51,7 @@ - diff --git a/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs b/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs index 15147e4a048..9d10b9f199e 100644 --- a/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs +++ b/UnitTests/UnitTests.UWP/Converters/Test_AdaptiveHeightValueConverter.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; +using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; using Windows.UI.Xaml; diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs index 8616f7f19b5..b24c51b2439 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_AutoLayout.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; +using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; @@ -24,7 +24,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSingle() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -86,7 +86,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementZeroZeroSpecial() xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xmlns:ex=""using:Microsoft.Toolkit.Uwp.UI.Extensions"" - xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives""> + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -147,7 +147,7 @@ public void Test_UniformGrid_AutoLayout_FixedElementSquare() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -207,7 +207,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement_FixedPosition() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -254,7 +254,7 @@ public void Test_UniformGrid_AutoLayout_VerticalElement() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -301,7 +301,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -348,7 +348,7 @@ public void Test_UniformGrid_AutoLayout_LargeElement() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -396,7 +396,7 @@ public void Test_UniformGrid_AutoLayout_HorizontalElement_FixedPosition() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs index 6e280cfdff9..a8e43606e31 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_Dimensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Linq; -using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; +using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; @@ -22,7 +22,7 @@ public void Test_UniformGrid_GetDimensions_NoElements() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> ") as FrameworkElement; @@ -50,7 +50,7 @@ public void Test_UniformGrid_GetDimensions_AllVisible() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -86,7 +86,7 @@ public void Test_UniformGrid_GetDimensions_SomeVisible() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -127,7 +127,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumn() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -163,7 +163,7 @@ public void Test_UniformGrid_GetDimensions_ElementLarger() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -199,7 +199,7 @@ public void Test_UniformGrid_GetDimensions_FirstColumnEqualsColumns() var treeRoot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs index b0ba511535e..9b6bfb31cd5 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_FreeSpots.cs @@ -4,7 +4,7 @@ using System.Linq; using Microsoft.Toolkit.Extensions; -using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; +using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs index 8fbcfb323b3..bf6539aea5f 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_UniformGrid_RowColDefinitions.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Toolkit.Uwp.UI.Controls.Primitives; +using Microsoft.Toolkit.Uwp.UI.Controls; using Microsoft.Toolkit.Uwp.UI.Extensions; using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer; @@ -21,7 +21,7 @@ public void Test_UniformGrid_SetupRowDefinitions_AllAutomatic() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -92,7 +92,7 @@ public void Test_UniformGrid_SetupRowDefinitions_FirstFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -187,7 +187,7 @@ public void Test_UniformGrid_SetupRowDefinitions_MiddleFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -287,7 +287,7 @@ public void Test_UniformGrid_SetupRowDefinitions_MiddleAndEndFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -422,7 +422,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_AllAutomatic() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -493,7 +493,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_FirstFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -588,7 +588,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_MiddleFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> @@ -690,7 +690,7 @@ public void Test_UniformGrid_SetupColumnDefinitions_FirstAndEndFixed() var treeroot = XamlReader.Load(@" + xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls""> diff --git a/UnitTests/UnitTests.UWP/UnitTestApp.xaml b/UnitTests/UnitTests.UWP/UnitTestApp.xaml index 8e4bb57cb53..38a0254edea 100644 --- a/UnitTests/UnitTests.UWP/UnitTestApp.xaml +++ b/UnitTests/UnitTests.UWP/UnitTestApp.xaml @@ -1,7 +1,7 @@  { var xamlItemsPanelTemplate = @" + xmlns:controls='using:Microsoft.Toolkit.Uwp.UI.Controls'> From 04869f4118df1549e657542f5382a573ce746ef2 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 8 Jan 2021 14:22:02 -0500 Subject: [PATCH 08/84] Add SwitchPresenter tag to Controls.Primitives --- .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c000c19e1c1..063bc6ef4cb 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 @@ -14,7 +14,7 @@ - UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space. - WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line. - UWP Toolkit Windows Controls XAML WrapPanel Adaptive DockPanel StaggeredPanel Staggered UniformGrid Uniform Grid + UWP Toolkit Windows Controls XAML WrapPanel Adaptive DockPanel StaggeredPanel Staggered SwitchPresenter UniformGrid Uniform Grid false 8.0 From b6ca5afa694d8f12237ee53a4abdd6ae88c1fd12 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 8 Jan 2021 16:40:01 -0500 Subject: [PATCH 09/84] Split out primitives design project --- ...Toolkit.Uwp.UI.Controls.DesignTools.csproj | 4 - .../Properties/Resources.Designer.cs | 9 -- .../Properties/Resources.resx | 3 - .../Controls/AdaptiveGridView.Metadata.cs | 0 .../Controls/AdaptiveGridView.Typedata.cs | 0 .../Controls/WrapPanel.Metadata.cs | 0 .../Controls/WrapPanel.Typedata.cs | 0 ....UI.Controls.Primitives.DesignTools.csproj | 109 +++++++++++++++ .../Properties/AssemblyInfo.cs | 32 +++++ .../Properties/Resources.Designer.cs | 81 +++++++++++ .../Properties/Resources.resx | 126 ++++++++++++++++++ Windows Community Toolkit.sln | 18 +++ 12 files changed, 366 insertions(+), 16 deletions(-) rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design}/Controls/AdaptiveGridView.Metadata.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design}/Controls/AdaptiveGridView.Typedata.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design}/Controls/WrapPanel.Metadata.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls.Design => Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design}/Controls/WrapPanel.Typedata.cs (100%) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj index cb7387f0f66..a318c0dacc9 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj @@ -79,8 +79,6 @@ - - @@ -123,8 +121,6 @@ - - Code diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs index e160035a377..092409a1a4a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs @@ -105,15 +105,6 @@ internal static string CategoryInteractions { } } - /// - /// Looks up a localized string similar to Layout. - /// - internal static string CategoryLayout { - get { - return ResourceManager.GetString("CategoryLayout", resourceCulture); - } - } - /// /// Looks up a localized string similar to Markdown Style - Code. /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx index e8903ef43b7..56bca35d53f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx @@ -132,9 +132,6 @@ Interactions - - Layout - Markdown Style - Code diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Controls/WrapPanel.Typedata.cs 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 new file mode 100644 index 00000000000..e654a64149a --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj @@ -0,0 +1,109 @@ + + + + + Debug + x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A} + Library + Properties + Microsoft.Toolkit.Uwp.UI.Controls.Design + Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools + 512 + 8.1 + v4.7.2 + false + + + true + ..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Debug\uap10.0.17763\Design\ + full + false + TRACE;DEBUG + x86 + + + ..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Release\uap10.0.17763\Design\ + pdbonly + x86 + true + TRACE + + + $(AssetTargetFallback);uap10.0.17763 + + + + + + + + False + False + + + False + False + + + + + + + + + + False + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd + + + + + + + + + + $(ProgramFiles)\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 + WindowsRuntime + False + + + + + + + + + + + + + Code + + + + Resources.resx + True + True + + + + + Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml + False + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..1189ff8f3b7 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs @@ -0,0 +1,32 @@ +// 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 System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Windows Community Toolkit Controls Primitives (Design)")] +[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitives Controls")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Windows Community Toolkit")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2020")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US English +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs new file mode 100644 index 00000000000..bad69d9bf25 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs @@ -0,0 +1,81 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Common. + /// + internal static string CategoryCommon { + get { + return ResourceManager.GetString("CategoryCommon", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Layout. + /// + internal static string CategoryLayout { + get { + return ResourceManager.GetString("CategoryLayout", resourceCulture); + } + } + } +} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx new file mode 100644 index 00000000000..550ed935b51 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Common + + + Layout + + \ No newline at end of file diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index d9b251ac032..622e132db51 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -137,6 +137,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UIT EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj", "{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj", "{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}" + ProjectSection(ProjectDependencies) = postProject + {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} + EndProjectSection +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4 @@ -978,6 +983,18 @@ Global {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}.Release|x64.Build.0 = Release|Any CPU {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|ARM.ActiveCfg = Debug|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|ARM64.ActiveCfg = Debug|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Debug|x64.ActiveCfg = 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|ARM.ActiveCfg = Release|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|ARM64.ActiveCfg = Release|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x64.ActiveCfg = Release|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.ActiveCfg = Release|x86 + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1020,6 +1037,7 @@ Global {C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} + {AF5045DE-0D13-45C2-AC33-50CF5FDB333A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345} From 06a982274a5d77a8835d52872e462316a96a425c Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Mon, 11 Jan 2021 13:04:55 -0500 Subject: [PATCH 10/84] Fix primitives deisgn tools ref --- ...rosoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e654a64149a..470bf4c5e0f 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 @@ -94,7 +94,7 @@ - + Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml False From 96e1aba56cd4c603e80641fd33b5a3aafff57afb Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 10:41:05 -0500 Subject: [PATCH 11/84] Fix finding desing output for controls.primitives --- .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 063bc6ef4cb..e5d0f923bd7 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 @@ -27,7 +27,7 @@ - + From 3fb905382d720950f35a7045da7d50764829c518 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 11:42:33 -0500 Subject: [PATCH 12/84] Add smoke test for Controls.Primitivs --- .../MainPage.xaml | 24 +++++++++++++++++++ .../MainPage.xaml.cs | 14 +++++++++++ SmokeTests/SmokeTests.proj | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml.cs diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml new file mode 100644 index 00000000000..9936b5d90cd --- /dev/null +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml @@ -0,0 +1,24 @@ + + + + + + + + + + + diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml.cs new file mode 100644 index 00000000000..65e09322217 --- /dev/null +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/MainPage.xaml.cs @@ -0,0 +1,14 @@ +// 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. + +namespace SmokeTest +{ + public sealed partial class MainPage + { + public MainPage() + { + InitializeComponent(); + } + } +} diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index e4f08260c42..f91a2662a89 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -4,7 +4,7 @@ x86 Release - UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown + UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Controls.Primitives;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown From 4f83e089f6413f36180463a7c94c42658aafc04b Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 12:29:36 -0500 Subject: [PATCH 13/84] List SwitchPresenter for DesignTools --- .../VisualStudioToolsManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml index fa884a8a5e8..da08ea53fd9 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/VisualStudioToolsManifest.xml @@ -4,6 +4,7 @@ + From 0043ecd4aca74b76eb4589fb0047d7ac21d57386 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 13:07:18 -0500 Subject: [PATCH 14/84] Better wording for titles and descriptions around primitivs package --- .../Properties/AssemblyInfo.cs | 4 ++-- .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs index 1189ff8f3b7..9fd890b71a6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Windows Community Toolkit Controls Primitives (Design)")] -[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitives Controls")] +[assembly: AssemblyTitle("Windows Community Toolkit Primitive Controls (Design)")] +[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitive Controls")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Windows Community Toolkit")] 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 e5d0f923bd7..d958e168f5e 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,7 +2,7 @@ uap10.0.17763 - Windows Community Toolkit 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. From 3cc5a648224bfbf6309c518dd58c22c71fa618a5 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 14:05:36 -0500 Subject: [PATCH 15/84] Remove exposing internals to xmalisland test, not needed. Remove NeutralResourcesLanguage on attribute on assembly, no resources or language specific code. --- .../Properties/AssemblyInfo.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs index cd5fbb60e47..996b6308daf 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/Properties/AssemblyInfo.cs @@ -2,12 +2,9 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Resources; using System.Runtime.CompilerServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: InternalsVisibleTo("UnitTests.UWP")] -[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")] -[assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file From c7630491622f8a917598b440911c9a701b5e5ce9 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 16:13:24 -0500 Subject: [PATCH 16/84] WIP: move Eyedropper, ImageCropper, InfiniteCanvas to Microsoft.Toolkit.Uwp.UI.Controls.Media Issue: coped ControlHelpers.XamlHost.cs Controls -> Controls.Media --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 4 ++ .../ControlHelpers.XamlHost.cs | 14 +++++++ .../Eyedropper/Eyedropper.Logic.cs | 0 .../Eyedropper/Eyedropper.Properties.cs | 0 .../Eyedropper/Eyedropper.cs | 0 .../Eyedropper/Eyedropper.xaml | 0 .../EyedropperColorChangedEventArgs.cs | 0 .../EyedropperToolButton.Properties.cs | 0 .../Eyedropper/EyedropperToolButton.cs | 0 .../Eyedropper/EyedropperToolButton.xaml | 0 .../ImageCropper/BitmapFileFormat.cs | 0 .../ImageCropper/CropShape.cs | 0 .../ImageCropper/ImageCropper.Animations.cs | 0 .../ImageCropper/ImageCropper.Constants.cs | 0 .../ImageCropper/ImageCropper.Events.cs | 0 .../ImageCropper/ImageCropper.Helpers.cs | 0 .../ImageCropper/ImageCropper.Logic.cs | 0 .../ImageCropper/ImageCropper.Properties.cs | 0 .../ImageCropper/ImageCropper.cs | 0 .../ImageCropper/ImageCropper.xaml | 0 .../ImageCropper/ImageCropperThumb.cs | 0 .../ImageCropper/ImageCropperThumb.xaml | 0 .../ImageCropper/ThumbPlacement.cs | 0 .../ImageCropper/ThumbPosition.cs | 0 .../Commands/IInfiniteCanvasCommand.cs | 0 .../Commands/InfiniteCanvasClearAllCommand.cs | 0 .../InfiniteCanvasCreateInkCommand.cs | 0 .../InfiniteCanvasCreateTextBoxCommand.cs | 0 .../Commands/InfiniteCanvasEraseInkCommand.cs | 0 .../InfiniteCanvasRemoveTextBoxCommand.cs | 0 .../InfiniteCanvasUpdateTextColorCommand.cs | 0 .../InfiniteCanvasUpdateTextCommand.cs | 0 ...InfiniteCanvasUpdateTextFontSizeCommand.cs | 0 .../InfiniteCanvasUpdateTextStyleCommand.cs | 0 .../InfiniteCanvasUpdateTextWeightCommand.cs | 0 .../Controls/InfiniteCanvasTextBox.cs | 0 ...iteCanvasVirtualDrawingSurface.Commands.cs | 0 ...InfiniteCanvasVirtualDrawingSurface.Ink.cs | 0 ...initeCanvasVirtualDrawingSurface.Render.cs | 0 ...niteCanvasVirtualDrawingSurface.TextBox.cs | 0 .../InfiniteCanvasVirtualDrawingSurface.cs | 0 .../InfiniteCanvas/Drawables/IDrawable.cs | 0 .../InfiniteCanvas/Drawables/InkDrawable.cs | 0 .../InfiniteCanvas/Drawables/TextDrawable.cs | 0 .../InfiniteCanvas/InfiniteCanvas.Events.cs | 0 .../InfiniteCanvas/InfiniteCanvas.TextBox.cs | 0 .../InfiniteCanvas/InfiniteCanvas.cs | 0 .../InfiniteCanvas/InfiniteCanvas.xaml | 0 .../CustomInkDrawingAttribute.cs | 0 .../JsonConverters/IDrawableConverter.cs | 0 .../JsonConverters/InkCanvasExportModel.cs | 0 .../JsonConverters/Matrix3x2Converter.cs | 0 .../JsonConverters/SerializablePoint.cs | 0 .../JsonConverters/SerializableStroke.cs | 0 .../SerializableStrokeConverter.cs | 0 ...osoft.Toolkit.Uwp.UI.Controls.Media.csproj | 42 +++++++++++++++++++ .../Properties/AssemblyInfo.cs | 13 ++++++ .../Microsoft.Toolkit.Uwp.UI.Controls.rd.xml | 0 .../Themes/Generic.xaml | 10 +++++ .../VisualStudioToolsManifest.xml | 7 ++++ .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 2 - .../Themes/Generic.xaml | 7 ---- .../VisualStudioToolsManifest.xml | 1 - UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 4 ++ .../UnitTests.XamlIslands.UWPApp.csproj | 4 ++ Windows Community Toolkit.sln | 23 ++++++++++ 66 files changed, 121 insertions(+), 10 deletions(-) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/Eyedropper.Logic.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/Eyedropper.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/Eyedropper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/Eyedropper.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/EyedropperColorChangedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/EyedropperToolButton.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/EyedropperToolButton.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Eyedropper/EyedropperToolButton.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/BitmapFileFormat.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/CropShape.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Animations.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Constants.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Helpers.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Logic.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropper.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropperThumb.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ImageCropperThumb.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ThumbPlacement.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/ImageCropper/ThumbPosition.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Drawables/IDrawable.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Drawables/InkDrawable.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/Drawables/TextDrawable.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/InfiniteCanvas.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/InfiniteCanvas.TextBox.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/InfiniteCanvas.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/InfiniteCanvas.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/IDrawableConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/SerializablePoint.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/SerializableStroke.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs (100%) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/AssemblyInfo.cs rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Media}/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml (100%) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index d89fc02aa6b..c5f84bc533e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1498,6 +1498,10 @@ {6fedf199-b052-49dd-8f3e-2a9224998e0f} Microsoft.Toolkit.Uwp.UI.Controls.Markdown + + {43bd2a36-9e12-4788-80ae-2377e41e6d05} + Microsoft.Toolkit.Uwp.UI.Controls.Media + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs new file mode 100644 index 00000000000..90514de7cd6 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs @@ -0,0 +1,14 @@ +// 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. + +namespace Microsoft.Toolkit.Uwp.UI.Controls +{ + /// + /// Internal class used to provide helpers for controls + /// + internal static partial class ControlHelpers + { + internal static bool IsXamlRootAvailable { get; } = Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot"); + } +} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Logic.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Logic.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Logic.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/Eyedropper.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/Eyedropper.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperColorChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperColorChangedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperColorChangedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperColorChangedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Eyedropper/EyedropperToolButton.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Eyedropper/EyedropperToolButton.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/BitmapFileFormat.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/BitmapFileFormat.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/BitmapFileFormat.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/BitmapFileFormat.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/CropShape.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/CropShape.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/CropShape.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/CropShape.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Animations.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Animations.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Animations.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Helpers.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Helpers.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Helpers.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Logic.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Logic.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropper.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ImageCropperThumb.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropperThumb.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ThumbPlacement.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ThumbPlacement.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ThumbPlacement.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ThumbPlacement.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ThumbPosition.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ThumbPosition.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageCropper/ThumbPosition.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ThumbPosition.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/IInfiniteCanvasCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasClearAllCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasCreateInkCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasCreateTextBoxCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasEraseInkCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasRemoveTextBoxCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextColorCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextFontSizeCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextStyleCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Commands/InfiniteCanvasUpdateTextWeightCommand.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasTextBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Commands.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Ink.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.Render.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.TextBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Controls/InfiniteCanvasVirtualDrawingSurface.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/IDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/IDrawable.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/IDrawable.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/IDrawable.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/InkDrawable.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/InkDrawable.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/InkDrawable.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/TextDrawable.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/Drawables/TextDrawable.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/Drawables/TextDrawable.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.TextBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.TextBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.TextBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/InfiniteCanvas.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/InfiniteCanvas.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/CustomInkDrawingAttribute.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/IDrawableConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/InkCanvasExportModel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/Matrix3x2Converter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializablePoint.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializablePoint.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializablePoint.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializablePoint.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializableStroke.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStroke.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializableStroke.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/SerializableStrokeConverter.cs 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 new file mode 100644 index 00000000000..a8f4f65e4d7 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj @@ -0,0 +1,42 @@ + + + + uap10.0.17763 + Windows Community Toolkit Controls + + This library provides XAML templated controls. It is part of the Windows Community Toolkit. + + Controls: + - ImageCropper: ImageCropper control allows user to crop image freely. + - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export & Import. + + UWP Toolkit Windows Controls XAML InfiniteCanvas + + false + 8.0 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..cd5fbb60e47 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/AssemblyInfo.cs @@ -0,0 +1,13 @@ +// 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 System.Resources; +using System.Runtime.CompilerServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: InternalsVisibleTo("UnitTests.UWP")] +[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")] +[assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml rename to Microsoft.Toolkit.Uwp.UI.Controls.Media/Properties/Microsoft.Toolkit.Uwp.UI.Controls.rd.xml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml new file mode 100644 index 00000000000..479c663071b --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml new file mode 100644 index 00000000000..7e74146691b --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml @@ -0,0 +1,7 @@ + + + + + + + \ 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 793d9571766..03b9d0600bf 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 @@ -18,10 +18,8 @@ - GridSplitter: A the control that redistributes space between columns or rows of a Grid control. - HeaderedContentControl: Provides a header to content. - HeaderedItemsControl: Provides a header to items. - - ImageCropper: ImageCropper control allows user to crop image freely. - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache. - InAppNotification: Show local notifications in your application. - - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export & Import. - LayoutTransformControl: Support for transformations as if applied by LayoutTransform. - Loading: Helps to show content with animation to the user while the app is doing some calculation. - MasterDetailsView: Implements the Master/Details design pattern. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml index 6422f8690d2..da3ac143c6a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml @@ -12,11 +12,8 @@ - - - @@ -28,10 +25,6 @@ - - - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml index b952e2ec958..5dee0c75f66 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml @@ -16,7 +16,6 @@ - diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index b7adf88cfc3..9c5fa893d29 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -238,6 +238,10 @@ {b1e850ff-dde6-44d5-a830-34250e97a687} Microsoft.Toolkit.Uwp.Connectivity + + {43bd2a36-9e12-4788-80ae-2377e41e6d05} + Microsoft.Toolkit.Uwp.UI.Controls.Media + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index cc9fc72981e..bb54f37fd89 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -187,6 +187,10 @@ {5bf75694-798a-43a0-8150-415de195359c} Microsoft.Toolkit.Uwp.Input.GazeInteraction + + {43bd2a36-9e12-4788-80ae-2377e41e6d05} + Microsoft.Toolkit.Uwp.UI.Controls.Media + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index 17df1370cd3..c5e2d3686e3 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -135,6 +135,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UITests.Tests.TAEF", "UITes EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "UITests.Tests.Shared", "UITests\UITests.Tests.Shared\UITests.Tests.Shared.shproj", "{1D8B0260-5C17-41DA-9C38-1E37441B3925}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Media", "Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj", "{43BD2A36-9E12-4788-80AE-2377E41E6D05}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4 @@ -956,6 +958,26 @@ Global {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x64.Build.0 = Release|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.ActiveCfg = Release|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|x86.Build.0 = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM.ActiveCfg = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM.Build.0 = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|ARM64.Build.0 = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|x64.ActiveCfg = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|x64.Build.0 = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|x86.ActiveCfg = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Debug|x86.Build.0 = Debug|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|Any CPU.Build.0 = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|ARM.ActiveCfg = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|ARM.Build.0 = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|ARM64.ActiveCfg = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|ARM64.Build.0 = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x64.ActiveCfg = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x64.Build.0 = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x86.ActiveCfg = Release|Any CPU + {43BD2A36-9E12-4788-80AE-2377E41E6D05}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -997,6 +1019,7 @@ Global {5F720475-E263-4A5A-8C88-2B805B45B5BC} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {C8182EF0-77FB-4B43-A588-C71748A309C7} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {1D8B0260-5C17-41DA-9C38-1E37441B3925} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} + {43BD2A36-9E12-4788-80AE-2377E41E6D05} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345} From f66ae16776e4331a1db53658faa68d4661bb77fc Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 16:33:55 -0500 Subject: [PATCH 17/84] Controls.Media: Remove System.ValueTuple --- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 1 - 1 file changed, 1 deletion(-) 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 a8f4f65e4d7..152d68d520c 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 @@ -17,7 +17,6 @@ - From 89272018e0357254f6e2dd9af0b07d3321bbc691 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 16:37:08 -0500 Subject: [PATCH 18/84] Controls: Remove System.ValueTuple, System.Text.Json --- .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 5 ----- 1 file changed, 5 deletions(-) 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 03b9d0600bf..988389864a9 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 @@ -43,11 +43,6 @@ 8.0 - - - - - From 0869c79a40dfd344da75a3579cdf23ea6cf05958 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 16:59:23 -0500 Subject: [PATCH 19/84] Fix assemly name in test file --- .../UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json index 08a856e87a9..2882f6efcff 100644 --- a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json +++ b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json @@ -1,7 +1,7 @@ { "DrawableList": [ { - "$type": "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls", + "$type": "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls.Media", "SerializableStrokeList": [ { "DrawingAttributes": { From 3ffa9b56e8aaf3994b076380efc2cc64d2853e04 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 17:15:35 -0500 Subject: [PATCH 20/84] Remove unneded deps --- .../Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj | 1 - 1 file changed, 1 deletion(-) 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 d958e168f5e..aad78b95e6b 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 @@ -21,7 +21,6 @@ - From b298fd061417e2689afa791cbab7050831fe3f7a Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Wed, 13 Jan 2021 14:03:15 -0500 Subject: [PATCH 21/84] Controls.Media: ControlHelpers.XamlHost.cs, use file like in project instead of copy --- .../ControlHelpers.XamlHost.cs | 14 -------------- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs deleted file mode 100644 index 90514de7cd6..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/ControlHelpers.XamlHost.cs +++ /dev/null @@ -1,14 +0,0 @@ -// 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. - -namespace Microsoft.Toolkit.Uwp.UI.Controls -{ - /// - /// Internal class used to provide helpers for controls - /// - internal static partial class ControlHelpers - { - internal static bool IsXamlRootAvailable { get; } = Windows.Foundation.Metadata.ApiInformation.IsPropertyPresent("Windows.UI.Xaml.UIElement", "XamlRoot"); - } -} 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 152d68d520c..ae959da7cad 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 @@ -26,6 +26,7 @@ + From e4db504887227c4d09d7cdcb106df0ad045c7e51 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 15 Jan 2021 13:14:45 -0500 Subject: [PATCH 22/84] Handle V1 of InfiniteCanvasExport data, and regresion test for V2 --- .../JsonConverters/IDrawableConverter.cs | 4 +- .../Samples/InfiniteCanvasExportPreMedia.json | 102 ++++++++++++++++++ .../Test_InfiniteCanvas_Regression.cs | 7 +- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 3 +- 4 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExportPreMedia.json diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs index 19fdc0472b4..3db04df765a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs @@ -11,6 +11,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls { internal class IDrawableConverter : JsonConverter { + private const string OldDiscriminator = "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls"; + public override bool CanConvert(Type typeToConvert) => typeof(IDrawable).IsAssignableFrom(typeToConvert); public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) @@ -40,7 +42,7 @@ public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, Js var typeDiscriminator = reader.GetString(); IDrawable drawable; - if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable))) + if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable)) || typeDiscriminator == OldDiscriminator) { drawable = new InkDrawable(); } diff --git a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExportPreMedia.json b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExportPreMedia.json new file mode 100644 index 00000000000..08a856e87a9 --- /dev/null +++ b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExportPreMedia.json @@ -0,0 +1,102 @@ +{ + "DrawableList": [ + { + "$type": "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls", + "SerializableStrokeList": [ + { + "DrawingAttributes": { + "Color": { + "A": 255, + "R": 0, + "G": 0, + "B": 0 + }, + "FitToCurve": true, + "IgnorePressure": false, + "IgnoreTilt": true, + "Size": { + "Width": 4.0, + "Height": 4.0, + "IsEmpty": false + }, + "PenTip": 0, + "PenTipTransform": { + "M11": 1.0, + "M12": 0.0, + "M21": 0.0, + "M22": 1.0, + "M31": 0.0, + "M32": 0.0, + "IsIdentity": true, + "Translation": { + "X": 0.0, + "Y": 0.0 + } + }, + "DrawAsHighlighter": false + }, + "SerializableFinalPointList": [ + { + "Position": { + "X": 103.97531127929688, + "Y": 45.995269775390625 + }, + "Pressure": 0.5, + "TiltX": 0.0, + "TiltY": 0.0, + "Timestamp": 0 + }, + { + "Position": { + "X": 103.80825805664063, + "Y": 45.995269775390625 + }, + "Pressure": 0.5, + "TiltX": 0.0, + "TiltY": 0.0, + "Timestamp": 0 + }, + { + "Position": { + "X": 103.41259002685547, + "Y": 45.995269775390625 + }, + "Pressure": 0.5, + "TiltX": 0.0, + "TiltY": 0.0, + "Timestamp": 0 + } + ], + "SerializableDrawingAttributesKind": 0, + "SerializableDrawingAttributesPencilProperties": null, + "PointTransform": { + "M11": 1.0, + "M12": 0.0, + "M21": 0.0, + "M22": 1.0, + "M31": 0.0, + "M32": 0.0, + "IsIdentity": true, + "Translation": { + "X": 0.0, + "Y": 0.0 + } + } + } + ], + "Bounds": { + "X": 69.949455261230469, + "Y": 28.069997787475586, + "Width": 1668.2589111328125, + "Height": 280.38735961914062, + "Left": 69.949455261230469, + "Top": 28.069997787475586, + "Right": 1738.2083740234375, + "Bottom": 308.45736694335938, + "IsEmpty": false + }, + "IsActive": true + } + ], + "Version": 1 +} \ No newline at end of file diff --git a/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs b/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs index 5c52be75339..ddb9ae9dbbb 100644 --- a/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs +++ b/UnitTests/UnitTests.UWP/UI/Controls/Test_InfiniteCanvas_Regression.cs @@ -18,7 +18,10 @@ public class Test_InfiniteCanvas_Regression { [TestCategory("InfiniteCanvas")] [TestMethod] - public async Task Test_InfiniteCanvas_LoadsV1File() + [DataRow(@"Assets\Samples\InfiniteCanvasExportPreMedia.json", DisplayName = "Version1")] + [DataRow(@"Assets\Samples\InfiniteCanvasExport.json", DisplayName = "Version2")] + + public async Task Test_InfiniteCanvas_LoadsFile(string file) { var taskSource = new TaskCompletionSource(); await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync( @@ -26,7 +29,7 @@ await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync( { try { - string json = await StorageFileHelper.ReadTextFromPackagedFileAsync(@"Assets\Samples\InfiniteCanvasExport.json"); + string json = await StorageFileHelper.ReadTextFromPackagedFileAsync(file); InfiniteCanvasVirtualDrawingSurface.LoadJson(json).Should().NotBeEmpty(); diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 408ba208c6f..12d87dfb764 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -204,11 +204,12 @@ Designer + + Designer - From 8ee6b1a4c6e604939bcda477f668da0b52569058 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 15 Jan 2021 13:35:18 -0500 Subject: [PATCH 23/84] Controls.Media: Add smoke tests. --- .../MainPage.xaml | 13 +++++++++++++ .../MainPage.xaml.cs | 14 ++++++++++++++ SmokeTests/SmokeTests.proj | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml create mode 100644 SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml.cs diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml new file mode 100644 index 00000000000..7d7a726e88c --- /dev/null +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml @@ -0,0 +1,13 @@ + + + + + diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml.cs new file mode 100644 index 00000000000..65e09322217 --- /dev/null +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Media/MainPage.xaml.cs @@ -0,0 +1,14 @@ +// 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. + +namespace SmokeTest +{ + public sealed partial class MainPage + { + public MainPage() + { + InitializeComponent(); + } + } +} diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index f91a2662a89..c86dc27cd56 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -4,7 +4,7 @@ x86 Release - UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Controls.Primitives;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown + UWPBaseline;Microsoft.Toolkit;Microsoft.Toolkit.HighPerformance;Microsoft.Toolkit.Parsers;Microsoft.Toolkit.Mvvm;Microsoft.Toolkit.Services;Microsoft.Toolkit.Uwp;Microsoft.Toolkit.Uwp.Connectivity;Microsoft.Toolkit.Uwp.DeveloperTools;Microsoft.Toolkit.Uwp.Input.GazeInteraction;Microsoft.Toolkit.Uwp.Notifications;Microsoft.Toolkit.Uwp.UI;Microsoft.Toolkit.Uwp.UI.Animations;Microsoft.Toolkit.Uwp.UI.Controls;Microsoft.Toolkit.Uwp.UI.Controls.DataGrid;Microsoft.Toolkit.Uwp.UI.Controls.Layout;Microsoft.Toolkit.Uwp.UI.Controls.Primitives;Microsoft.Toolkit.Uwp.UI.Controls.Media;Microsoft.Toolkit.Uwp.UI.Media;Microsoft.Toolkit.Uwp.UI.Controls.Markdown From ddc7950ee0bf1401750507268bc4f1648e90d2a1 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 15 Jan 2021 14:18:26 -0500 Subject: [PATCH 24/84] Controls.Media: Eyedroper to Project description and Package Tags --- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ae959da7cad..d4bb0780da7 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 @@ -7,10 +7,11 @@ This library provides XAML templated controls. It is part of the Windows Community Toolkit. Controls: + - Eyedropper: Eyedropper allows user to pick up a color from anywhere in there application. - ImageCropper: ImageCropper control allows user to crop image freely. - InfiniteCanvas: Supports Infinite Scrolling, Ink, Text, Format Text, Zoom in/out, Redo, Undo, Export & Import. - UWP Toolkit Windows Controls XAML InfiniteCanvas + UWP Toolkit Windows Controls XAML InfiniteCanvas Eyedropper false 8.0 From 8f60463b405fae3436f182064463bd08f7ba59ae Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 15 Jan 2021 15:38:56 -0500 Subject: [PATCH 25/84] Controls.Media: change title to include Media --- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d4bb0780da7..656f733222d 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,7 +2,7 @@ uap10.0.17763 - Windows Community Toolkit Controls + Windows Community Toolkit Media Controls This library provides XAML templated controls. It is part of the Windows Community Toolkit. From 97dda4a7ce18f2ddd3719ad8f2cec58fb70c5a04 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 15 Jan 2021 15:41:24 -0500 Subject: [PATCH 26/84] Controls.Media: List Eyedropper and ImageCropper in VisualStudioToolsManifest.xml --- .../VisualStudioToolsManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml index 7e74146691b..627261189e7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml @@ -1,6 +1,8 @@ + + From fb228c3d1fdf309fbcc3d5fec00ad8b6401da1a7 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Fri, 15 Jan 2021 16:00:19 -0500 Subject: [PATCH 27/84] Controls.Media: Imporove description --- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 656f733222d..85beee41047 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 @@ -4,7 +4,7 @@ uap10.0.17763 Windows Community Toolkit Media Controls - This library provides XAML templated controls. It is part of the Windows Community Toolkit. + This library provides controls backed by win2d for use in XAML. It is part of the Windows Community Toolkit. Controls: - Eyedropper: Eyedropper allows user to pick up a color from anywhere in there application. From c61156dca3e3d93bd056f1285d4b0da38cab7d1d Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 19 Jan 2021 16:32:16 -0500 Subject: [PATCH 28/84] Fix usages of old assembly name --- .../Themes/Generic.xaml | 10 +++++----- .../VisualStudioToolsManifest.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml index 479c663071b..782ee42cd95 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Themes/Generic.xaml @@ -1,10 +1,10 @@  - - - - - + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml index 627261189e7..31b1259a180 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/VisualStudioToolsManifest.xml @@ -1,5 +1,5 @@ - + From 56609a06ce179de8d8b55a73a50074dd24d35be2 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 19 Jan 2021 17:00:21 -0500 Subject: [PATCH 29/84] Handel descirminator textDrawable from Control Assembly --- .../InfiniteCanvas/JsonConverters/IDrawableConverter.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs index 3db04df765a..9cadfd0da35 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/InfiniteCanvas/JsonConverters/IDrawableConverter.cs @@ -11,7 +11,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls { internal class IDrawableConverter : JsonConverter { - private const string OldDiscriminator = "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls"; + private const string OldInkDrawableDiscriminator = "Microsoft.Toolkit.Uwp.UI.Controls.InkDrawable, Microsoft.Toolkit.Uwp.UI.Controls"; + private const string OldTextDrawableDiscriminator = "Microsoft.Toolkit.Uwp.UI.Controls.TextDrawable, Microsoft.Toolkit.Uwp.UI.Controls"; public override bool CanConvert(Type typeToConvert) => typeof(IDrawable).IsAssignableFrom(typeToConvert); @@ -42,11 +43,11 @@ public override IDrawable Read(ref Utf8JsonReader reader, Type typeToConvert, Js var typeDiscriminator = reader.GetString(); IDrawable drawable; - if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable)) || typeDiscriminator == OldDiscriminator) + if (typeDiscriminator == GetDiscriminator(typeof(InkDrawable)) || typeDiscriminator == OldInkDrawableDiscriminator) { drawable = new InkDrawable(); } - else if (typeDiscriminator == GetDiscriminator(typeof(TextDrawable))) + else if (typeDiscriminator == GetDiscriminator(typeof(TextDrawable)) || typeDiscriminator == OldTextDrawableDiscriminator) { drawable = new TextDrawable(); } From 53344dc4ff8aede9f8733e318e3bf865177a55fb Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 19 Jan 2021 17:01:27 -0500 Subject: [PATCH 30/84] Test sample exported from inifinate canvase instead of modified from old sample. --- .../Assets/Samples/InfiniteCanvasExport.json | 50 ++++++++----------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json index 2882f6efcff..68b97e43b0a 100644 --- a/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json +++ b/UnitTests/UnitTests.UWP/Assets/Samples/InfiniteCanvasExport.json @@ -15,23 +15,18 @@ "IgnorePressure": false, "IgnoreTilt": true, "Size": { - "Width": 4.0, - "Height": 4.0, + "Width": 4, + "Height": 4, "IsEmpty": false }, "PenTip": 0, "PenTipTransform": { - "M11": 1.0, - "M12": 0.0, - "M21": 0.0, - "M22": 1.0, - "M31": 0.0, - "M32": 0.0, - "IsIdentity": true, - "Translation": { - "X": 0.0, - "Y": 0.0 - } + "M11": 1, + "M12": 0, + "M21": 0, + "M22": 1, + "M31": 0, + "M32": 0 }, "DrawAsHighlighter": false }, @@ -42,8 +37,8 @@ "Y": 45.995269775390625 }, "Pressure": 0.5, - "TiltX": 0.0, - "TiltY": 0.0, + "TiltX": 0, + "TiltY": 0, "Timestamp": 0 }, { @@ -52,8 +47,8 @@ "Y": 45.995269775390625 }, "Pressure": 0.5, - "TiltX": 0.0, - "TiltY": 0.0, + "TiltX": 0, + "TiltY": 0, "Timestamp": 0 }, { @@ -62,25 +57,20 @@ "Y": 45.995269775390625 }, "Pressure": 0.5, - "TiltX": 0.0, - "TiltY": 0.0, + "TiltX": 0, + "TiltY": 0, "Timestamp": 0 } ], "SerializableDrawingAttributesKind": 0, "SerializableDrawingAttributesPencilProperties": null, "PointTransform": { - "M11": 1.0, - "M12": 0.0, - "M21": 0.0, - "M22": 1.0, - "M31": 0.0, - "M32": 0.0, - "IsIdentity": true, - "Translation": { - "X": 0.0, - "Y": 0.0 - } + "M11": 1, + "M12": 0, + "M21": 0, + "M22": 1, + "M31": 0, + "M32": 0 } } ], From aed5068fe3cd62e8354fb0a8306f018cb06874c4 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Wed, 20 Jan 2021 13:13:03 -0500 Subject: [PATCH 31/84] TEMP: Remove usages of graph controls --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 16 ++++++++++++ .../Models/Sample.cs | 26 ++++++++++--------- .../SamplePages/samples.json | 2 ++ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index c39275376b9..c704c8cb80e 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -112,9 +112,11 @@ 10.1901.28001 + 2.4.2 @@ -278,8 +280,10 @@ + @@ -298,7 +302,9 @@ + @@ -490,9 +496,11 @@ Designer + Designer @@ -649,12 +657,14 @@ SampleController.xaml + AdvancedCollectionViewPage.xaml @@ -695,9 +705,11 @@ BackdropBlurBrushPage.xaml + DataGridPage.xaml @@ -1048,6 +1060,7 @@ Designer MSBuild:Compile + MSBuild:Compile Designer @@ -1140,10 +1154,12 @@ MSBuild:Compile Designer + MSBuild:Compile Designer diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs index 0707df494f7..ec05b29caea 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs +++ b/Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs @@ -16,8 +16,9 @@ using System.Text.Json.Serialization; using System.Text.RegularExpressions; using System.Threading.Tasks; -using Microsoft.Toolkit.Graph.Converters; -using Microsoft.Toolkit.Graph.Providers; +// TODO Reintroduce graph controls +// using Microsoft.Toolkit.Graph.Converters; +// using Microsoft.Toolkit.Graph.Providers; using Microsoft.Toolkit.Uwp.Helpers; using Microsoft.Toolkit.Uwp.Input.GazeInteraction; using Microsoft.Toolkit.Uwp.SampleApp.Models; @@ -659,17 +660,18 @@ private static Type LookForTypeByName(string typeName) } } - // Search in Microsoft.Toolkit.Graph.Controls - var graphControlsProxyType = typeof(UserToPersonConverter); - assembly = graphControlsProxyType.GetTypeInfo().Assembly; + // TODO Reintroduce graph controls + //// Search in Microsoft.Toolkit.Graph.Controls + //var graphControlsProxyType = typeof(UserToPersonConverter); + //assembly = graphControlsProxyType.GetTypeInfo().Assembly; - foreach (var typeInfo in assembly.ExportedTypes) - { - if (typeInfo.Name == typeName) - { - return typeInfo; - } - } + //foreach (var typeInfo in assembly.ExportedTypes) + //{ + // if (typeInfo.Name == typeName) + // { + // return typeInfo; + // } + //} // Search in Microsoft.Toolkit.Uwp.UI.Animations var animationsProxyType = EasingType.Default; diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json index b7d7a495ffd..075c1ea7b95 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json @@ -387,6 +387,7 @@ "Icon": "/SamplePages/Eyedropper/Eyedropper.png", "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/controls/Eyedropper.md" }, + /* TODO Reintroduce graph controls { "Name": "LoginButton", "Type": "LoginButtonPage", @@ -423,6 +424,7 @@ "DeprecatedWarning": "The PeoplePicker control is in preview. Find out more here: https://aka.ms/wgt", "DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/graph/controls/PeoplePicker.md" }, + */ { "Name": "AlignmentGrid", "Type": "AlignmentGridPage", From 704a3561f7da6d8247c6693f6381548e7f576797 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 19 Jan 2021 11:52:27 -0500 Subject: [PATCH 32/84] Move Controls to Controls.Core folder --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 2 +- .../BladeView/BladeItem.Events.cs | 0 .../BladeView/BladeItem.Properties.cs | 0 .../BladeView/BladeItem.cs | 0 .../BladeView/BladeItemAutomationPeer.cs | 0 .../BladeView/BladeMode.cs | 0 .../BladeView/BladeView.Events.cs | 0 .../BladeView/BladeView.Properties.cs | 0 .../BladeView/BladeView.cs | 0 .../BladeView/BladeView.xaml | 0 .../BladeView/BladeViewAutomationPeer.cs | 0 .../CameraPreview/CameraPreview.Constants.cs | 0 .../CameraPreview/CameraPreview.Events.cs | 0 .../CameraPreview/CameraPreview.Properties.cs | 0 .../CameraPreview/CameraPreview.cs | 0 .../CameraPreview/CameraPreview.xaml | 0 .../CameraPreview/PreviewFailedEventArgs.cs | 0 .../Carousel/Carousel.cs | 0 .../Carousel/Carousel.xaml | 0 .../Carousel/CarouselItem.cs | 0 .../Carousel/CarouselPanel.cs | 0 .../ColorPicker/ColorChannel.cs | 0 .../ColorPicker/ColorPicker.Properties.cs | 0 .../ColorPicker/ColorPicker.cs | 0 .../ColorPicker/ColorPicker.xaml | 0 .../ColorPicker/ColorPickerButton.cs | 0 .../ColorPicker/ColorPickerButton.xaml | 0 .../ColorPicker/ColorPickerRenderingHelpers.cs | 0 .../ColorPicker/ColorPickerSlider.Properties.cs | 0 .../ColorPicker/ColorPickerSlider.cs | 0 .../ColorPicker/ColorPickerSlider.xaml | 0 .../ColorPicker/ColorRepresentation.cs | 0 .../ColorPicker/ColorToColorShadeConverter.cs | 0 .../ColorPicker/ColorToHexConverter.cs | 0 .../ColorPicker/ContrastBrushConverter.cs | 0 .../ColorPicker/FluentColorPalette.cs | 0 .../ColorPicker/IColorPalette.cs | 0 .../ControlHelpers.Composition.cs | 0 .../ControlHelpers.Math.cs | 0 .../ControlHelpers.XamlHost.cs | 0 .../DropShadowPanel/DropShadowPanel.Properties.cs | 0 .../DropShadowPanel/DropShadowPanel.cs | 0 .../DropShadowPanel/DropShadowPanel.xaml | 0 .../Expander/ExpandDirection.cs | 0 .../Expander/Expander.Constants.cs | 0 .../Expander/Expander.Events.cs | 0 .../Expander/Expander.Properties.cs | 0 .../Expander/Expander.cs | 0 .../Expander/Expander.xaml | 0 .../Expander/ExpanderAutomationPeer.cs | 0 .../GridSplitter/GridSplitter.Data.cs | 0 .../GridSplitter/GridSplitter.Events.cs | 0 .../GridSplitter/GridSplitter.Helper.cs | 0 .../GridSplitter/GridSplitter.Options.cs | 0 .../GridSplitter/GridSplitter.cs | 0 .../GridSplitter/GridSplitter.xaml | 0 .../GridSplitter/GripperHoverWrapper.cs | 0 .../HeaderedContentControl/HeaderedContentControl.cs | 0 .../HeaderedContentControl/HeaderedContentControl.xaml | 0 .../HeaderedItemsControl/HeaderedItemsControl.cs | 0 .../HeaderedItemsControl/HeaderedItemsControl.xaml | 0 .../ImageEx/CachingStrategy.cs | 0 .../ImageEx/ImageEx.Members.cs | 0 .../ImageEx/ImageEx.cs | 0 .../ImageEx/ImageEx.xaml | 0 .../ImageEx/ImageExBase.Members.cs | 0 .../ImageEx/ImageExBase.Placeholder.cs | 0 .../ImageEx/ImageExBase.Source.cs | 0 .../ImageEx/ImageExBase.cs | 0 .../ImageEx/ImageExFailedEventArgs.cs | 0 .../ImageEx/ImageExOpenedEventArgs.cs | 0 .../InAppNotification/InAppNotification.AttachedProperties.cs | 0 .../InAppNotification/InAppNotification.Constants.cs | 0 .../InAppNotification/InAppNotification.Events.cs | 0 .../InAppNotification/InAppNotification.Properties.cs | 0 .../InAppNotification/InAppNotification.cs | 0 .../InAppNotification/InAppNotification.xaml | 0 .../InAppNotification/InAppNotificationClosedEventArgs.cs | 0 .../InAppNotification/InAppNotificationClosingEventArgs.cs | 0 .../InAppNotification/InAppNotificationDismissKind.cs | 0 .../InAppNotification/InAppNotificationOpeningEventArgs.cs | 0 .../InAppNotification/NotificationOptions.cs | 0 .../InAppNotification/StackMode.cs | 0 .../InAppNotification/Styles/MSEdgeNotificationStyle.xaml | 0 .../InAppNotification/Styles/VSCodeNotificationStyle.xaml | 0 .../InlineCollectionWrapper.cs | 0 .../LayoutTransformControl/LayoutTransformControl.Properties.cs | 0 .../LayoutTransformControl/LayoutTransformControl.cs | 0 .../LayoutTransformControl/LayoutTransformControl.xaml | 0 .../LayoutTransformControl/PropertyChangeEventSource.cs | 0 .../Loading/Loading.Properties.cs | 0 .../Loading/Loading.cs | 0 .../Loading/Loading.xaml | 0 .../MasterDetailsView/BackButtonBehavior.cs | 0 .../MasterDetailsView/MasterDetailsView.Events.cs | 0 .../MasterDetailsView/MasterDetailsView.Properties.cs | 0 .../MasterDetailsView/MasterDetailsView.cs | 0 .../MasterDetailsView/MasterDetailsView.xaml | 0 .../MasterDetailsView/MasterDetailsViewState.cs | 0 .../Menu/Menu.Events.cs | 0 .../Menu/Menu.Extensions.cs | 0 .../Menu/Menu.Logic.cs | 0 .../Menu/Menu.cs | 0 .../Menu/Menu.xaml | 0 .../Menu/MenuItem.cs | 0 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 0 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings | 0 .../OrbitView/OrbitView.cs | 0 .../OrbitView/OrbitView.xaml | 0 .../OrbitView/OrbitViewDataItem.cs | 0 .../OrbitView/OrbitViewDataItemCollection.cs | 0 .../OrbitView/OrbitViewElementProperties.cs | 0 .../OrbitView/OrbitViewItem.cs | 0 .../OrbitView/OrbitViewItemClickedEventArgs.cs | 0 .../OrbitView/OrbitViewPanel.cs | 0 .../OrbitView/OrbitViewPanelItemArrangedArgs.cs | 0 .../OrbitView/OrbitViewPanelItemsArrangedArgs.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RadialGauge/RadialGauge.cs | 0 .../RadialGauge/RadialGauge.xaml | 0 .../RadialGauge/RadialGaugeAutomationPeer.cs | 0 .../RadialProgressBar/RadialProgressBar.cs | 0 .../RadialProgressBar/RadialProgressBar.xaml | 0 .../RangeSelector/RangeChangedEventArgs.cs | 0 .../RangeSelector/RangeSelector.cs | 0 .../RangeSelector/RangeSelector.xaml | 0 .../RemoteDevicePicker/RemoteDevicePicker.cs | 0 .../RemoteDevicePicker/RemoteDevicePicker.xaml | 0 .../RemoteDevicePicker/RemoteDeviceSelectionMode.cs | 0 .../RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs | 0 .../RotatorTile/RotatorTile.cs | 0 .../RotatorTile/RotatorTile.xaml | 0 .../Strings/en-US/Resources.resw | 0 .../TextToolbar/EditorChangedArgs.cs | 0 .../TextToolbar/Formats/ButtonActions.cs | 0 .../TextToolbar/Formats/Formatter.cs | 0 .../TextToolbar/Formats/RichText/RichTextButtonActions.cs | 0 .../TextToolbar/Formats/RichText/RichTextFormatter.cs | 0 .../TextToolbar/ShortcutKeyRequestArgs.cs | 0 .../TextToolbar/Symbols/List.cs | 0 .../TextToolbar/Symbols/NumberedList.cs | 0 .../TextToolbar/Symbols/Symbol.cs | 0 .../TextToolbar/Symbols/Symbols.xaml | 0 .../TextToolbar/TextToolbar.Events.cs | 0 .../TextToolbar/TextToolbar.Methods.cs | 0 .../TextToolbar/TextToolbar.Properties.cs | 0 .../TextToolbar/TextToolbar.cs | 0 .../TextToolbar/TextToolbar.xaml | 0 .../TextToolbar/ToolbarItems/ButtonMap.cs | 0 .../TextToolbar/ToolbarItems/ButtonType.cs | 0 .../TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs | 0 .../TextToolbar/ToolbarItems/Common/CommonButtons.cs | 0 .../TextToolbar/ToolbarItems/DefaultButton.cs | 0 .../TextToolbar/ToolbarItems/DefaultButtonModificationList.cs | 0 .../TextToolbar/ToolbarItems/IToolbarItem.cs | 0 .../TextToolbar/ToolbarItems/ToolbarButton.cs | 0 .../TextToolbar/ToolbarItems/ToolbarButton.xaml | 0 .../TextToolbar/ToolbarItems/ToolbarSeparator.cs | 0 .../TextToolbar/ToolbarItems/ToolbarSeparator.xaml | 0 .../Themes/Generic.xaml | 0 .../TileControl/ImageAlignment.cs | 0 .../TileControl/ScrollOrientation.cs | 0 .../TileControl/TileControl.Properties.cs | 0 .../TileControl/TileControl.cs | 0 .../TileControl/TileControl.xaml | 0 .../TokenizingTextBox/ITokenStringContainer.cs | 0 .../TokenizingTextBox/InterspersedObservableCollection.cs | 0 .../TokenizingTextBox/PretokenStringContainer.cs | 0 .../TokenizingTextBox/TokenItemAddingEventArgs.cs | 0 .../TokenizingTextBox/TokenItemRemovingEventArgs.cs | 0 .../TokenizingTextBox/TokenizingTextBox.Events.cs | 0 .../TokenizingTextBox/TokenizingTextBox.Properties.cs | 0 .../TokenizingTextBox/TokenizingTextBox.Selection.cs | 0 .../TokenizingTextBox/TokenizingTextBox.cs | 0 .../TokenizingTextBox/TokenizingTextBox.xaml | 0 .../TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs | 0 .../TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml | 0 .../TokenizingTextBox/TokenizingTextBoxItem.Token.xaml | 0 .../TokenizingTextBox/TokenizingTextBoxItem.cs | 0 .../TokenizingTextBox/TokenizingTextBoxStyleSelector.cs | 0 .../VisualStudioToolsManifest.xml | 0 .../Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 2 +- UITests/UITests.App/UITests.App.csproj | 2 +- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 2 +- .../UnitTests.XamlIslands.UWPApp.csproj | 2 +- Windows Community Toolkit.sln | 2 +- 188 files changed, 8 insertions(+), 8 deletions(-) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItemAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeMode.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeViewAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Constants.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/PreviewFailedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/Carousel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/Carousel.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/CarouselItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/CarouselPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorChannel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerButton.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerButton.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerRenderingHelpers.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorRepresentation.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorToColorShadeConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorToHexConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ContrastBrushConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/FluentColorPalette.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/IColorPalette.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.Composition.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.Math.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.XamlHost.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/ExpandDirection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Constants.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/ExpanderAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Data.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Helper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Options.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GripperHoverWrapper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedContentControl/HeaderedContentControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedContentControl/HeaderedContentControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedItemsControl/HeaderedItemsControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedItemsControl/HeaderedItemsControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/CachingStrategy.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.Members.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Members.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Placeholder.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Source.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExFailedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExOpenedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.AttachedProperties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Constants.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationClosedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationClosingEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationDismissKind.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationOpeningEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/NotificationOptions.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/StackMode.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/Styles/MSEdgeNotificationStyle.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/Styles/VSCodeNotificationStyle.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InlineCollectionWrapper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/PropertyChangeEventSource.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/BackButtonBehavior.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsViewState.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Extensions.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Logic.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/MenuItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Microsoft.Toolkit.Uwp.UI.Controls.csproj (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewDataItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewDataItemCollection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewElementProperties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewItemClickedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanelItemArrangedArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanelItemsArrangedArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Properties/AssemblyInfo.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGauge.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGauge.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGaugeAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialProgressBar/RadialProgressBar.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialProgressBar/RadialProgressBar.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeChangedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeSelector.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeSelector.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDevicePicker.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDevicePicker.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDeviceSelectionMode.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RotatorTile/RotatorTile.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RotatorTile/RotatorTile.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Strings/en-US/Resources.resw (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/EditorChangedArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/ButtonActions.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/Formatter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/RichText/RichTextButtonActions.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/RichText/RichTextFormatter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ShortcutKeyRequestArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/List.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/NumberedList.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/Symbol.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/Symbols.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Methods.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ButtonMap.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ButtonType.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/Common/CommonButtons.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/DefaultButton.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/IToolbarItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarButton.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarButton.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarSeparator.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarSeparator.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Themes/Generic.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/ImageAlignment.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/ScrollOrientation.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/ITokenStringContainer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/InterspersedObservableCollection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/PretokenStringContainer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenItemAddingEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenItemRemovingEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Selection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/VisualStudioToolsManifest.xml (100%) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 3358e6eee51..550ccd02eb7 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1479,7 +1479,7 @@ {84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a} Microsoft.Toolkit.Uwp.UI.Controls.Primitives - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/PreviewFailedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/PreviewFailedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/PreviewFailedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/PreviewFailedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Composition.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Composition.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Composition.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Composition.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Math.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Math.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Math.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Math.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.XamlHost.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.XamlHost.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.XamlHost.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.XamlHost.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Data.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Helper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Helper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Options.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Options.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/CachingStrategy.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/CachingStrategy.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.Members.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.Members.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.Members.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Placeholder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Placeholder.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Placeholder.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Placeholder.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Source.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Source.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExFailedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExFailedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExFailedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExFailedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExOpenedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExOpenedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExOpenedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExOpenedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.AttachedProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.AttachedProperties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.AttachedProperties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.AttachedProperties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosingEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosingEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosingEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationDismissKind.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationDismissKind.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationDismissKind.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationDismissKind.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationOpeningEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationOpeningEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationOpeningEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationOpeningEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/NotificationOptions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/NotificationOptions.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/NotificationOptions.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/NotificationOptions.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/StackMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/StackMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/StackMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/StackMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InlineCollectionWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InlineCollectionWrapper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InlineCollectionWrapper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InlineCollectionWrapper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/BackButtonBehavior.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/BackButtonBehavior.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsViewState.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsViewState.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Extensions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Extensions.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Extensions.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Extensions.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Logic.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Logic.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Properties/AssemblyInfo.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Properties/AssemblyInfo.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Properties/AssemblyInfo.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/EditorChangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/EditorChangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/EditorChangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/EditorChangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/ButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/ButtonActions.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/ButtonActions.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/ButtonActions.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/Formatter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/Formatter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextButtonActions.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextButtonActions.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextButtonActions.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ShortcutKeyRequestArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ShortcutKeyRequestArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ShortcutKeyRequestArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ShortcutKeyRequestArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/List.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/List.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/List.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/List.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/NumberedList.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/NumberedList.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/NumberedList.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/NumberedList.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbol.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbol.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbol.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbol.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbols.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbols.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbols.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbols.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Methods.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Methods.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonMap.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonMap.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonMap.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonMap.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonType.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonType.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonType.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonType.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButton.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButton.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButton.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/IToolbarItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/IToolbarItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/IToolbarItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/IToolbarItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ImageAlignment.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ImageAlignment.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ImageAlignment.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ImageAlignment.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ScrollOrientation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ScrollOrientation.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ScrollOrientation.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ScrollOrientation.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj index a318c0dacc9..8412f2e5013 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj @@ -137,7 +137,7 @@ - + Microsoft.Toolkit.Uwp.UI.Controls.xml 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 9d8dfd8aa28..4154680ba7d 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 @@ -35,7 +35,7 @@ - + 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 85beee41047..294e7524498 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 @@ -27,7 +27,7 @@ - + diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index bcb7be34ecc..0c8da3c893c 100644 --- a/UITests/UITests.App/UITests.App.csproj +++ b/UITests/UITests.App/UITests.App.csproj @@ -226,7 +226,7 @@ {6fedf199-b052-49dd-8f3e-2a9224998e0f} Microsoft.Toolkit.Uwp.UI.Controls.Markdown - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 12d87dfb764..98e5a542e95 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -247,7 +247,7 @@ {84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a} Microsoft.Toolkit.Uwp.UI.Controls.Primitives - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index bb54f37fd89..a77570c8fd4 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -191,7 +191,7 @@ {43bd2a36-9e12-4788-80ae-2377e41e6d05} Microsoft.Toolkit.Uwp.UI.Controls.Media - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index ce6734c34cc..5ae2469baa9 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{F1AFFFA7-28FE- EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B30036C4-D514-4E5B-A323-587A061772CE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj", "{DAEB9CEC-C817-33B2-74B2-BC379380DB72}" EndProject From 41bb7e554f26cb714d9c6456a599f976ad65dad2 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 19 Jan 2021 15:35:16 -0500 Subject: [PATCH 33/84] Reanme controls package to controls.core --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 4 +- .../InAppNotificationXaml.bind | 4 +- .../BladeView/BladeItem.cs | 4 +- .../GridSplitter/GridSplitter.cs | 2 +- .../InAppNotification/InAppNotification.cs | 2 +- .../InAppNotification/InAppNotification.xaml | 4 +- ...osoft.Toolkit.Uwp.UI.Controls.Core.csproj} | 0 ...t.Uwp.UI.Controls.Core.csproj.DotSettings} | 0 .../Formats/RichText/RichTextFormatter.cs | 2 +- .../TextToolbar/TextToolbar.xaml | 6 +-- .../Common/CommonButtons.Events.cs | 18 +++---- .../ToolbarItems/Common/CommonButtons.cs | 12 ++--- .../Themes/Generic.xaml | 52 +++++++++---------- .../TokenizingTextBox/TokenizingTextBox.cs | 6 +-- .../TokenizingTextBox/TokenizingTextBox.xaml | 4 +- .../VisualStudioToolsManifest.xml | 2 +- ...Toolkit.Uwp.UI.Controls.DesignTools.csproj | 4 +- ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 6 +-- .../Formats/MarkDown/MarkDownButtonActions.cs | 4 +- .../Formats/MarkDown/MarkDownFormatter.cs | 8 +-- UITests/UITests.App/UITests.App.csproj | 4 +- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 4 +- .../UnitTests.XamlIslands.UWPApp.csproj | 4 +- .../XamlIslandsTest_StringExtensions.cs | 2 +- Windows Community Toolkit.sln | 2 +- 25 files changed, 80 insertions(+), 80 deletions(-) rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{Microsoft.Toolkit.Uwp.UI.Controls.csproj => Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings => Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings} (100%) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 550ccd02eb7..77d1b2ee9c8 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1479,9 +1479,9 @@ {84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a} Microsoft.Toolkit.Uwp.UI.Controls.Primitives - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} - Microsoft.Toolkit.Uwp.UI.Controls + Microsoft.Toolkit.Uwp.UI.Controls.Core {75f9ee44-3efa-47bc-aedd-351b9834a0af} diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind index 812d93e65cd..c9072cde030 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind @@ -12,8 +12,8 @@ - - + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs index 21202d4d9fe..b6683199794 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs @@ -70,7 +70,7 @@ protected override void OnExpanded(EventArgs args) { Width = _normalModeWidth; VisualStateManager.GoToState(this, "Expanded", true); - var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"); + var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); if (_enlargeButton != null) { AutomationProperties.SetName(_enlargeButton, name); @@ -86,7 +86,7 @@ protected override void OnCollapsed(EventArgs args) { Width = double.NaN; VisualStateManager.GoToState(this, "Collapsed", true); - var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"); + var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); if (_enlargeButton != null) { AutomationProperties.SetName(_enlargeButton, name); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs index facc3230bf7..edc0bab90c1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs @@ -168,7 +168,7 @@ public GridSplitter() { DefaultStyleKey = typeof(GridSplitter); Loaded += GridSplitter_Loaded; - string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"); + string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); AutomationProperties.SetName(this, automationName); } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs index 7f2fd97cbfc..3ccdb9020b4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs @@ -63,7 +63,7 @@ protected override void OnApplyTemplate() { _dismissButton.Visibility = ShowDismissButton ? Visibility.Visible : Visibility.Collapsed; _dismissButton.Click += DismissButton_Click; - AutomationProperties.SetName(_dismissButton, "WCT_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")); + AutomationProperties.SetName(_dismissButton, "WCT_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")); } if (_visualStateGroup != null) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml index 852ffaf2a63..8be0b25da05 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml @@ -3,8 +3,8 @@ xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls"> - - + + + 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 a53c32f0ce1..4537d59aaf6 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 @@ -39,7 +39,6 @@ - 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 60d209f7ce6..bb6df0fe9b1 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 @@ -22,20 +22,10 @@ - - - - - - - Designer - - - From 439b505a0df46c24fe18494fd584019881391651 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Mon, 1 Feb 2021 18:25:32 -0800 Subject: [PATCH 56/84] Fix Stylecop Issues --- Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs index d07bd6e574e..3f8f8a3a5ac 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs @@ -38,6 +38,7 @@ public class MenuItem : ItemsControl internal Button FlyoutButton { get; private set; } private Rect _bounds; + private object InternalHeader { set @@ -529,7 +530,6 @@ internal void Underline() InternalHeader = text; } - /// private static void OnHeaderChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) { if (d is MenuItem menuitem) From e0be87ff18133e3e2f95f10243d2ccb1f8c44032 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 2 Feb 2021 11:38:51 -0500 Subject: [PATCH 57/84] fix smoke tests for moved controls. --- .../MainPage.xaml | 115 +----------------- .../MainPage.xaml | 73 ++++++----- .../MainPage.xaml.cs | 22 ---- 3 files changed, 46 insertions(+), 164 deletions(-) diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml index d628d8c1bc0..2ad0f30edd2 100644 --- a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Core/MainPage.xaml @@ -1,5 +1,4 @@ - - - - - - - - - - - - - - - -