From 6956c733fa0211dc2db0b1632e4ed9118ea89e33 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Thu, 10 Dec 2020 16:16:28 -0500 Subject: [PATCH 01/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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 3ffa9b56e8aaf3994b076380efc2cc64d2853e04 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 12 Jan 2021 17:15:35 -0500 Subject: [PATCH 16/16] 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 @@ -