From 704a3561f7da6d8247c6693f6381548e7f576797 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 19 Jan 2021 11:52:27 -0500 Subject: [PATCH 01/19] Move Controls to Controls.Core folder --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 2 +- .../BladeView/BladeItem.Events.cs | 0 .../BladeView/BladeItem.Properties.cs | 0 .../BladeView/BladeItem.cs | 0 .../BladeView/BladeItemAutomationPeer.cs | 0 .../BladeView/BladeMode.cs | 0 .../BladeView/BladeView.Events.cs | 0 .../BladeView/BladeView.Properties.cs | 0 .../BladeView/BladeView.cs | 0 .../BladeView/BladeView.xaml | 0 .../BladeView/BladeViewAutomationPeer.cs | 0 .../CameraPreview/CameraPreview.Constants.cs | 0 .../CameraPreview/CameraPreview.Events.cs | 0 .../CameraPreview/CameraPreview.Properties.cs | 0 .../CameraPreview/CameraPreview.cs | 0 .../CameraPreview/CameraPreview.xaml | 0 .../CameraPreview/PreviewFailedEventArgs.cs | 0 .../Carousel/Carousel.cs | 0 .../Carousel/Carousel.xaml | 0 .../Carousel/CarouselItem.cs | 0 .../Carousel/CarouselPanel.cs | 0 .../ColorPicker/ColorChannel.cs | 0 .../ColorPicker/ColorPicker.Properties.cs | 0 .../ColorPicker/ColorPicker.cs | 0 .../ColorPicker/ColorPicker.xaml | 0 .../ColorPicker/ColorPickerButton.cs | 0 .../ColorPicker/ColorPickerButton.xaml | 0 .../ColorPicker/ColorPickerRenderingHelpers.cs | 0 .../ColorPicker/ColorPickerSlider.Properties.cs | 0 .../ColorPicker/ColorPickerSlider.cs | 0 .../ColorPicker/ColorPickerSlider.xaml | 0 .../ColorPicker/ColorRepresentation.cs | 0 .../ColorPicker/ColorToColorShadeConverter.cs | 0 .../ColorPicker/ColorToHexConverter.cs | 0 .../ColorPicker/ContrastBrushConverter.cs | 0 .../ColorPicker/FluentColorPalette.cs | 0 .../ColorPicker/IColorPalette.cs | 0 .../ControlHelpers.Composition.cs | 0 .../ControlHelpers.Math.cs | 0 .../ControlHelpers.XamlHost.cs | 0 .../DropShadowPanel/DropShadowPanel.Properties.cs | 0 .../DropShadowPanel/DropShadowPanel.cs | 0 .../DropShadowPanel/DropShadowPanel.xaml | 0 .../Expander/ExpandDirection.cs | 0 .../Expander/Expander.Constants.cs | 0 .../Expander/Expander.Events.cs | 0 .../Expander/Expander.Properties.cs | 0 .../Expander/Expander.cs | 0 .../Expander/Expander.xaml | 0 .../Expander/ExpanderAutomationPeer.cs | 0 .../GridSplitter/GridSplitter.Data.cs | 0 .../GridSplitter/GridSplitter.Events.cs | 0 .../GridSplitter/GridSplitter.Helper.cs | 0 .../GridSplitter/GridSplitter.Options.cs | 0 .../GridSplitter/GridSplitter.cs | 0 .../GridSplitter/GridSplitter.xaml | 0 .../GridSplitter/GripperHoverWrapper.cs | 0 .../HeaderedContentControl/HeaderedContentControl.cs | 0 .../HeaderedContentControl/HeaderedContentControl.xaml | 0 .../HeaderedItemsControl/HeaderedItemsControl.cs | 0 .../HeaderedItemsControl/HeaderedItemsControl.xaml | 0 .../ImageEx/CachingStrategy.cs | 0 .../ImageEx/ImageEx.Members.cs | 0 .../ImageEx/ImageEx.cs | 0 .../ImageEx/ImageEx.xaml | 0 .../ImageEx/ImageExBase.Members.cs | 0 .../ImageEx/ImageExBase.Placeholder.cs | 0 .../ImageEx/ImageExBase.Source.cs | 0 .../ImageEx/ImageExBase.cs | 0 .../ImageEx/ImageExFailedEventArgs.cs | 0 .../ImageEx/ImageExOpenedEventArgs.cs | 0 .../InAppNotification/InAppNotification.AttachedProperties.cs | 0 .../InAppNotification/InAppNotification.Constants.cs | 0 .../InAppNotification/InAppNotification.Events.cs | 0 .../InAppNotification/InAppNotification.Properties.cs | 0 .../InAppNotification/InAppNotification.cs | 0 .../InAppNotification/InAppNotification.xaml | 0 .../InAppNotification/InAppNotificationClosedEventArgs.cs | 0 .../InAppNotification/InAppNotificationClosingEventArgs.cs | 0 .../InAppNotification/InAppNotificationDismissKind.cs | 0 .../InAppNotification/InAppNotificationOpeningEventArgs.cs | 0 .../InAppNotification/NotificationOptions.cs | 0 .../InAppNotification/StackMode.cs | 0 .../InAppNotification/Styles/MSEdgeNotificationStyle.xaml | 0 .../InAppNotification/Styles/VSCodeNotificationStyle.xaml | 0 .../InlineCollectionWrapper.cs | 0 .../LayoutTransformControl/LayoutTransformControl.Properties.cs | 0 .../LayoutTransformControl/LayoutTransformControl.cs | 0 .../LayoutTransformControl/LayoutTransformControl.xaml | 0 .../LayoutTransformControl/PropertyChangeEventSource.cs | 0 .../Loading/Loading.Properties.cs | 0 .../Loading/Loading.cs | 0 .../Loading/Loading.xaml | 0 .../MasterDetailsView/BackButtonBehavior.cs | 0 .../MasterDetailsView/MasterDetailsView.Events.cs | 0 .../MasterDetailsView/MasterDetailsView.Properties.cs | 0 .../MasterDetailsView/MasterDetailsView.cs | 0 .../MasterDetailsView/MasterDetailsView.xaml | 0 .../MasterDetailsView/MasterDetailsViewState.cs | 0 .../Menu/Menu.Events.cs | 0 .../Menu/Menu.Extensions.cs | 0 .../Menu/Menu.Logic.cs | 0 .../Menu/Menu.cs | 0 .../Menu/Menu.xaml | 0 .../Menu/MenuItem.cs | 0 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 0 .../Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings | 0 .../OrbitView/OrbitView.cs | 0 .../OrbitView/OrbitView.xaml | 0 .../OrbitView/OrbitViewDataItem.cs | 0 .../OrbitView/OrbitViewDataItemCollection.cs | 0 .../OrbitView/OrbitViewElementProperties.cs | 0 .../OrbitView/OrbitViewItem.cs | 0 .../OrbitView/OrbitViewItemClickedEventArgs.cs | 0 .../OrbitView/OrbitViewPanel.cs | 0 .../OrbitView/OrbitViewPanelItemArrangedArgs.cs | 0 .../OrbitView/OrbitViewPanelItemsArrangedArgs.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../RadialGauge/RadialGauge.cs | 0 .../RadialGauge/RadialGauge.xaml | 0 .../RadialGauge/RadialGaugeAutomationPeer.cs | 0 .../RadialProgressBar/RadialProgressBar.cs | 0 .../RadialProgressBar/RadialProgressBar.xaml | 0 .../RangeSelector/RangeChangedEventArgs.cs | 0 .../RangeSelector/RangeSelector.cs | 0 .../RangeSelector/RangeSelector.xaml | 0 .../RemoteDevicePicker/RemoteDevicePicker.cs | 0 .../RemoteDevicePicker/RemoteDevicePicker.xaml | 0 .../RemoteDevicePicker/RemoteDeviceSelectionMode.cs | 0 .../RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs | 0 .../RotatorTile/RotatorTile.cs | 0 .../RotatorTile/RotatorTile.xaml | 0 .../Strings/en-US/Resources.resw | 0 .../TextToolbar/EditorChangedArgs.cs | 0 .../TextToolbar/Formats/ButtonActions.cs | 0 .../TextToolbar/Formats/Formatter.cs | 0 .../TextToolbar/Formats/RichText/RichTextButtonActions.cs | 0 .../TextToolbar/Formats/RichText/RichTextFormatter.cs | 0 .../TextToolbar/ShortcutKeyRequestArgs.cs | 0 .../TextToolbar/Symbols/List.cs | 0 .../TextToolbar/Symbols/NumberedList.cs | 0 .../TextToolbar/Symbols/Symbol.cs | 0 .../TextToolbar/Symbols/Symbols.xaml | 0 .../TextToolbar/TextToolbar.Events.cs | 0 .../TextToolbar/TextToolbar.Methods.cs | 0 .../TextToolbar/TextToolbar.Properties.cs | 0 .../TextToolbar/TextToolbar.cs | 0 .../TextToolbar/TextToolbar.xaml | 0 .../TextToolbar/ToolbarItems/ButtonMap.cs | 0 .../TextToolbar/ToolbarItems/ButtonType.cs | 0 .../TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs | 0 .../TextToolbar/ToolbarItems/Common/CommonButtons.cs | 0 .../TextToolbar/ToolbarItems/DefaultButton.cs | 0 .../TextToolbar/ToolbarItems/DefaultButtonModificationList.cs | 0 .../TextToolbar/ToolbarItems/IToolbarItem.cs | 0 .../TextToolbar/ToolbarItems/ToolbarButton.cs | 0 .../TextToolbar/ToolbarItems/ToolbarButton.xaml | 0 .../TextToolbar/ToolbarItems/ToolbarSeparator.cs | 0 .../TextToolbar/ToolbarItems/ToolbarSeparator.xaml | 0 .../Themes/Generic.xaml | 0 .../TileControl/ImageAlignment.cs | 0 .../TileControl/ScrollOrientation.cs | 0 .../TileControl/TileControl.Properties.cs | 0 .../TileControl/TileControl.cs | 0 .../TileControl/TileControl.xaml | 0 .../TokenizingTextBox/ITokenStringContainer.cs | 0 .../TokenizingTextBox/InterspersedObservableCollection.cs | 0 .../TokenizingTextBox/PretokenStringContainer.cs | 0 .../TokenizingTextBox/TokenItemAddingEventArgs.cs | 0 .../TokenizingTextBox/TokenItemRemovingEventArgs.cs | 0 .../TokenizingTextBox/TokenizingTextBox.Events.cs | 0 .../TokenizingTextBox/TokenizingTextBox.Properties.cs | 0 .../TokenizingTextBox/TokenizingTextBox.Selection.cs | 0 .../TokenizingTextBox/TokenizingTextBox.cs | 0 .../TokenizingTextBox/TokenizingTextBox.xaml | 0 .../TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs | 0 .../TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml | 0 .../TokenizingTextBox/TokenizingTextBoxItem.Token.xaml | 0 .../TokenizingTextBox/TokenizingTextBoxItem.cs | 0 .../TokenizingTextBox/TokenizingTextBoxStyleSelector.cs | 0 .../VisualStudioToolsManifest.xml | 0 .../Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 2 +- .../Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj | 2 +- UITests/UITests.App/UITests.App.csproj | 2 +- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 2 +- .../UnitTests.XamlIslands.UWPApp.csproj | 2 +- Windows Community Toolkit.sln | 2 +- 188 files changed, 8 insertions(+), 8 deletions(-) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeItemAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeMode.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/BladeView/BladeViewAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Constants.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/CameraPreview.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/CameraPreview/PreviewFailedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/Carousel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/Carousel.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/CarouselItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Carousel/CarouselPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorChannel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPicker.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerButton.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerButton.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerRenderingHelpers.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorPickerSlider.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorRepresentation.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorToColorShadeConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ColorToHexConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/ContrastBrushConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/FluentColorPalette.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ColorPicker/IColorPalette.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.Composition.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.Math.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ControlHelpers.XamlHost.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/DropShadowPanel/DropShadowPanel.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/ExpandDirection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Constants.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/Expander.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Expander/ExpanderAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Data.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Helper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.Options.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GridSplitter.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/GridSplitter/GripperHoverWrapper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedContentControl/HeaderedContentControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedContentControl/HeaderedContentControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedItemsControl/HeaderedItemsControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/HeaderedItemsControl/HeaderedItemsControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/CachingStrategy.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.Members.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageEx.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Members.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Placeholder.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.Source.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExBase.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExFailedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/ImageEx/ImageExOpenedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.AttachedProperties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Constants.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotification.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationClosedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationClosingEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationDismissKind.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/InAppNotificationOpeningEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/NotificationOptions.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/StackMode.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/Styles/MSEdgeNotificationStyle.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InAppNotification/Styles/VSCodeNotificationStyle.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/InlineCollectionWrapper.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/LayoutTransformControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/LayoutTransformControl/PropertyChangeEventSource.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Loading/Loading.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/BackButtonBehavior.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/MasterDetailsView/MasterDetailsViewState.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Extensions.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.Logic.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/Menu.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Menu/MenuItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Microsoft.Toolkit.Uwp.UI.Controls.csproj (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitView.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitView.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewDataItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewDataItemCollection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewElementProperties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewItemClickedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanel.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanelItemArrangedArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/OrbitView/OrbitViewPanelItemsArrangedArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Properties/AssemblyInfo.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGauge.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGauge.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialGauge/RadialGaugeAutomationPeer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialProgressBar/RadialProgressBar.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RadialProgressBar/RadialProgressBar.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeChangedEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeSelector.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RangeSelector/RangeSelector.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDevicePicker.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDevicePicker.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteDeviceSelectionMode.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RotatorTile/RotatorTile.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/RotatorTile/RotatorTile.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Strings/en-US/Resources.resw (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/EditorChangedArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/ButtonActions.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/Formatter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/RichText/RichTextButtonActions.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Formats/RichText/RichTextFormatter.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ShortcutKeyRequestArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/List.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/NumberedList.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/Symbol.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/Symbols/Symbols.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Methods.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/TextToolbar.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ButtonMap.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ButtonType.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/Common/CommonButtons.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/DefaultButton.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/IToolbarItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarButton.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarButton.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarSeparator.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TextToolbar/ToolbarItems/ToolbarSeparator.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/Themes/Generic.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/ImageAlignment.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/ScrollOrientation.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TileControl/TileControl.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/ITokenStringContainer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/InterspersedObservableCollection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/PretokenStringContainer.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenItemAddingEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenItemRemovingEventArgs.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Events.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Properties.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.Selection.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBox.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxItem.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs (100%) rename {Microsoft.Toolkit.Uwp.UI.Controls => Microsoft.Toolkit.Uwp.UI.Controls.Core}/VisualStudioToolsManifest.xml (100%) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 3358e6eee51..550ccd02eb7 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1479,7 +1479,7 @@ {84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a} Microsoft.Toolkit.Uwp.UI.Controls.Primitives - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeItemAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItemAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/BladeView/BladeViewAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeViewAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/CameraPreview.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/CameraPreview.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/PreviewFailedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/PreviewFailedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/CameraPreview/PreviewFailedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/CameraPreview/PreviewFailedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/Carousel.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/Carousel.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Carousel/CarouselPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Carousel/CarouselPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorChannel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPicker.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerButton.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerRenderingHelpers.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorPickerSlider.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorRepresentation.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToColorShadeConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ColorToHexConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/ContrastBrushConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/FluentColorPalette.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ColorPicker/IColorPalette.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Composition.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Composition.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Composition.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Composition.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Math.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Math.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.Math.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.Math.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.XamlHost.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.XamlHost.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ControlHelpers.XamlHost.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ControlHelpers.XamlHost.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/DropShadowPanel/DropShadowPanel.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/DropShadowPanel/DropShadowPanel.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpandDirection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpandDirection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/Expander.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/Expander.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Expander/ExpanderAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Expander/ExpanderAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Data.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Data.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Data.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Helper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Helper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Helper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Options.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.Options.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.Options.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GridSplitter.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/GridSplitter/GripperHoverWrapper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GripperHoverWrapper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedContentControl/HeaderedContentControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedContentControl/HeaderedContentControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/HeaderedItemsControl/HeaderedItemsControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/HeaderedItemsControl/HeaderedItemsControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/CachingStrategy.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/CachingStrategy.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/CachingStrategy.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.Members.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.Members.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.Members.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageEx.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Members.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Members.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Placeholder.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Placeholder.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Placeholder.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Placeholder.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Source.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.Source.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.Source.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExBase.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExBase.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExFailedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExFailedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExFailedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExFailedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExOpenedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExOpenedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageExOpenedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/ImageEx/ImageExOpenedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.AttachedProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.AttachedProperties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.AttachedProperties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.AttachedProperties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosingEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationClosingEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationClosingEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationDismissKind.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationDismissKind.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationDismissKind.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationDismissKind.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationOpeningEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationOpeningEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotificationOpeningEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotificationOpeningEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/NotificationOptions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/NotificationOptions.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/NotificationOptions.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/NotificationOptions.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/StackMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/StackMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/StackMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/StackMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/MSEdgeNotificationStyle.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/MSEdgeNotificationStyle.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/Styles/VSCodeNotificationStyle.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/Styles/VSCodeNotificationStyle.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/InlineCollectionWrapper.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InlineCollectionWrapper.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/InlineCollectionWrapper.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/InlineCollectionWrapper.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/LayoutTransformControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/LayoutTransformControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/LayoutTransformControl/PropertyChangeEventSource.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/LayoutTransformControl/PropertyChangeEventSource.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Loading/Loading.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Loading/Loading.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/BackButtonBehavior.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/BackButtonBehavior.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/BackButtonBehavior.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsViewState.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/MasterDetailsView/MasterDetailsViewState.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/MasterDetailsView/MasterDetailsViewState.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Extensions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Extensions.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Extensions.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Extensions.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Logic.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.Logic.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.Logic.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/Menu.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/Menu.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Menu/MenuItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Menu/MenuItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitView.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitView.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewDataItemCollection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewDataItemCollection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewElementProperties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewElementProperties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewItemClickedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewItemClickedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemArrangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemArrangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/OrbitView/OrbitViewPanelItemsArrangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/OrbitView/OrbitViewPanelItemsArrangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Properties/AssemblyInfo.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Properties/AssemblyInfo.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Properties/AssemblyInfo.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGaugeAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RadialProgressBar/RadialProgressBar.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialProgressBar/RadialProgressBar.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeChangedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDevicePicker.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteDeviceSelectionMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/RotatorTile/RotatorTile.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Strings/en-US/Resources.resw rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/EditorChangedArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/EditorChangedArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/EditorChangedArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/EditorChangedArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/ButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/ButtonActions.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/ButtonActions.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/ButtonActions.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/Formatter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/Formatter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/Formatter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextButtonActions.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextButtonActions.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextButtonActions.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextButtonActions.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Formats/RichText/RichTextFormatter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Formats/RichText/RichTextFormatter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ShortcutKeyRequestArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ShortcutKeyRequestArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ShortcutKeyRequestArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ShortcutKeyRequestArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/List.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/List.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/List.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/List.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/NumberedList.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/NumberedList.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/NumberedList.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/NumberedList.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbol.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbol.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbol.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbol.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbols.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbols.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/Symbols/Symbols.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/Symbols/Symbols.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Methods.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Methods.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Methods.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/TextToolbar.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/TextToolbar.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonMap.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonMap.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonMap.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonMap.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonType.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonType.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ButtonType.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ButtonType.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/Common/CommonButtons.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/Common/CommonButtons.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButton.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButton.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButton.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/DefaultButtonModificationList.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/IToolbarItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/IToolbarItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/IToolbarItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/IToolbarItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarButton.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarButton.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TextToolbar/ToolbarItems/ToolbarSeparator.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TextToolbar/ToolbarItems/ToolbarSeparator.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/Themes/Generic.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ImageAlignment.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ImageAlignment.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ImageAlignment.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ImageAlignment.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ScrollOrientation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ScrollOrientation.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/ScrollOrientation.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/ScrollOrientation.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TileControl/TileControl.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TileControl/TileControl.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/ITokenStringContainer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/InterspersedObservableCollection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/PretokenStringContainer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemAddingEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenItemRemovingEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.Selection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBox.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls/VisualStudioToolsManifest.xml rename to Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj index a318c0dacc9..8412f2e5013 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj @@ -137,7 +137,7 @@ - + Microsoft.Toolkit.Uwp.UI.Controls.xml False diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj index 9d8dfd8aa28..4154680ba7d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj @@ -35,7 +35,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj index 85beee41047..294e7524498 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj @@ -27,7 +27,7 @@ - + diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj index bcb7be34ecc..0c8da3c893c 100644 --- a/UITests/UITests.App/UITests.App.csproj +++ b/UITests/UITests.App/UITests.App.csproj @@ -226,7 +226,7 @@ {6fedf199-b052-49dd-8f3e-2a9224998e0f} Microsoft.Toolkit.Uwp.UI.Controls.Markdown - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 12d87dfb764..98e5a542e95 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -247,7 +247,7 @@ {84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a} Microsoft.Toolkit.Uwp.UI.Controls.Primitives - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index bb54f37fd89..a77570c8fd4 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -191,7 +191,7 @@ {43bd2a36-9e12-4788-80ae-2377e41e6d05} Microsoft.Toolkit.Uwp.UI.Controls.Media - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} Microsoft.Toolkit.Uwp.UI.Controls diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index ce6734c34cc..5ae2469baa9 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{F1AFFFA7-28FE- EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B30036C4-D514-4E5B-A323-587A061772CE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls", "Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.csproj", "{E9FAABFB-D726-42C1-83C1-CB46A29FEA81}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj", "{DAEB9CEC-C817-33B2-74B2-BC379380DB72}" EndProject From 41bb7e554f26cb714d9c6456a599f976ad65dad2 Mon Sep 17 00:00:00 2001 From: Rosario Pulella Date: Tue, 19 Jan 2021 15:35:16 -0500 Subject: [PATCH 02/19] Reanme controls package to controls.core --- .../Microsoft.Toolkit.Uwp.SampleApp.csproj | 4 +- .../InAppNotificationXaml.bind | 4 +- .../BladeView/BladeItem.cs | 4 +- .../GridSplitter/GridSplitter.cs | 2 +- .../InAppNotification/InAppNotification.cs | 2 +- .../InAppNotification/InAppNotification.xaml | 4 +- ...osoft.Toolkit.Uwp.UI.Controls.Core.csproj} | 0 ...t.Uwp.UI.Controls.Core.csproj.DotSettings} | 0 .../Formats/RichText/RichTextFormatter.cs | 2 +- .../TextToolbar/TextToolbar.xaml | 6 +-- .../Common/CommonButtons.Events.cs | 18 +++---- .../ToolbarItems/Common/CommonButtons.cs | 12 ++--- .../Themes/Generic.xaml | 52 +++++++++---------- .../TokenizingTextBox/TokenizingTextBox.cs | 6 +-- .../TokenizingTextBox/TokenizingTextBox.xaml | 4 +- .../VisualStudioToolsManifest.xml | 2 +- ...Toolkit.Uwp.UI.Controls.DesignTools.csproj | 4 +- ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 6 +-- .../Formats/MarkDown/MarkDownButtonActions.cs | 4 +- .../Formats/MarkDown/MarkDownFormatter.cs | 8 +-- UITests/UITests.App/UITests.App.csproj | 4 +- UnitTests/UnitTests.UWP/UnitTests.UWP.csproj | 4 +- .../UnitTests.XamlIslands.UWPApp.csproj | 4 +- .../XamlIslandsTest_StringExtensions.cs | 2 +- Windows Community Toolkit.sln | 2 +- 25 files changed, 80 insertions(+), 80 deletions(-) rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{Microsoft.Toolkit.Uwp.UI.Controls.csproj => Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Core/{Microsoft.Toolkit.Uwp.UI.Controls.csproj.DotSettings => Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings} (100%) diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 550ccd02eb7..77d1b2ee9c8 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1479,9 +1479,9 @@ {84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a} Microsoft.Toolkit.Uwp.UI.Controls.Primitives - + {e9faabfb-d726-42c1-83c1-cb46a29fea81} - Microsoft.Toolkit.Uwp.UI.Controls + Microsoft.Toolkit.Uwp.UI.Controls.Core {75f9ee44-3efa-47bc-aedd-351b9834a0af} diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind index 812d93e65cd..c9072cde030 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind +++ b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind @@ -12,8 +12,8 @@ - - + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs index 21202d4d9fe..b6683199794 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/BladeView/BladeItem.cs @@ -70,7 +70,7 @@ protected override void OnExpanded(EventArgs args) { Width = _normalModeWidth; VisualStateManager.GoToState(this, "Expanded", true); - var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"); + var name = "WCT_BladeView_ExpandButton_Collapsed".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); if (_enlargeButton != null) { AutomationProperties.SetName(_enlargeButton, name); @@ -86,7 +86,7 @@ protected override void OnCollapsed(EventArgs args) { Width = double.NaN; VisualStateManager.GoToState(this, "Collapsed", true); - var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"); + var name = "WCT_BladeView_ExpandButton_Expanded".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); if (_enlargeButton != null) { AutomationProperties.SetName(_enlargeButton, name); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs index facc3230bf7..edc0bab90c1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/GridSplitter/GridSplitter.cs @@ -168,7 +168,7 @@ public GridSplitter() { DefaultStyleKey = typeof(GridSplitter); Loaded += GridSplitter_Loaded; - string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources"); + string automationName = "WCT_GridSplitter_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources"); AutomationProperties.SetName(this, automationName); } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs index 7f2fd97cbfc..3ccdb9020b4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.cs @@ -63,7 +63,7 @@ protected override void OnApplyTemplate() { _dismissButton.Visibility = ShowDismissButton ? Visibility.Visible : Visibility.Collapsed; _dismissButton.Click += DismissButton_Click; - AutomationProperties.SetName(_dismissButton, "WCT_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls/Resources")); + AutomationProperties.SetName(_dismissButton, "WCT_InAppNotification_DismissButton_AutomationName".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources")); } if (_visualStateGroup != null) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml index 852ffaf2a63..8be0b25da05 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/InAppNotification/InAppNotification.xaml @@ -3,8 +3,8 @@ xmlns:local="using:Microsoft.Toolkit.Uwp.UI.Controls"> - - + +