diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj index 512146ac2fb..23cb14bd7ac 100644 --- a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj +++ b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj @@ -1463,6 +1463,10 @@ {daeb9cec-c817-33b2-74b2-bc379380db72} Microsoft.Toolkit.Uwp.UI.Controls.DataGrid + + {af1be4e9-e2e1-4729-b076-b3725d8e21ee} + Microsoft.Toolkit.Uwp.UI.Controls.Input + {cb444381-18ba-4a51-bb32-3a498bcc1e99} Microsoft.Toolkit.Uwp.UI.Controls.Layout diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj index be59d8d8b9c..d4aad29f577 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj @@ -91,12 +91,8 @@ - - - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj index c246a32ec0c..b604c5a7219 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj @@ -8,21 +8,16 @@ Controls: - CameraPreview: Easily preview video from camera sources and get realtime frames from the selected source. - - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version. - DropShadowPanel: DropShadowPanel control allows the creation of a DropShadow for any Xaml FrameworkElement in markup. - ImageEx: Images are downloaded asynchronously showing a load indicator and can be stored in a local cache. - InAppNotification: Show local notifications in your application. - Loading: Helps to show content with animation to the user while the app is doing some calculation. - - RadialGauge: Displays a value within a range, using a needle on a circular face. - RadialProgressBar: Displays progress as a circle getting filled. - - RangeSelector: "Double slider" control for range values. - - RemoteDevicePicker: Remote Device Picker Control for Project Rome. - RotatorTile: Rotates through a set of items one-by-one like a live-tile. - TextToolbar: A Toolbar for Editing Text attached to a RichEditBox. It can format RTF, Markdown, or use a Custom Formatter. - TileControl: A ContentControl that show an image repeated many times. - - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags. - UWP Toolkit Windows Controls XAML Range Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial Gauge RadiaGauge RadialProgressBar Scroll ScrollHeader Tile Tokenizing TextBox + UWP Toolkit Windows Controls XAML Markdown CameraPreview Camera DropShadow ImageEx InAppNotification InfiniteCanvas Radial RadialProgressBar Scroll ScrollHeader Tile false 8.0 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings index 781434d32a7..617208d52cd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj.DotSettings @@ -4,7 +4,5 @@ True True True - True - True True True \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw index 484e3eb498b..3ea9beab48c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Strings/en-US/Resources.resw @@ -201,12 +201,4 @@ Notification The landmark name for the InAppNotification control. It is said by the narrator when using landmark navigation. - - Remove - Label for TokenizingTextBox MenuFlyout 'Remove' option. - - - Select All - Label for TokenizingTextBox MenuFlyout 'Select All' option. - - \ No newline at end of file + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml index 9f6079cea14..948dca8dc42 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/Themes/Generic.xaml @@ -2,21 +2,14 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - - - - - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml index 69e15c84e1c..34f1bc813a9 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core/VisualStudioToolsManifest.xml @@ -9,9 +9,7 @@ - - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RadialGauge.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RadialGauge.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Metadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Typedata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Controls/RangeSelector.Typedata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Controls/RangeSelector.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj new file mode 100644 index 00000000000..2782bd400e5 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj @@ -0,0 +1,110 @@ + + + + + Debug + x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08} + Library + Properties + Microsoft.Toolkit.Uwp.UI.Controls.Design + Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools + 512 + 8.1 + v4.7.2 + false + + + true + ..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\Debug\uap10.0.17763\Design\ + full + false + TRACE;DEBUG + x86 + + + ..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\Release\uap10.0.17763\Design\ + pdbonly + x86 + true + TRACE + + + $(NoWarn);0618 + $(AssetTargetFallback);uap10.0.17763 + + + + + + + + False + False + + + False + False + + + + + + + + + + False + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd + + + + + + + + + + $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd + WindowsRuntime + False + + + $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd + WindowsRuntime + False + + + + + + + + + + + + + Code + + + True + True + Resources.resx + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + Microsoft.Toolkit.Uwp.UI.Controls.Input.xml + False + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..bfa162fde30 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs @@ -0,0 +1,32 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")] +[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Windows Community Toolkit")] +[assembly: AssemblyCopyright("Copyright © Microsoft 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +//In order to begin building localizable applications, set +//CultureYouAreCodingWith in your .csproj file +//inside a . For example, if you are using US English +//in your source files, set the to en-US. Then uncomment +//the NeutralResourceLanguage attribute below. Update the "en-US" in +//the line below to match the UICulture setting in the project file. + +//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs new file mode 100644 index 00000000000..a17591769f6 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs @@ -0,0 +1,90 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Appearance. + /// + internal static string CategoryAppearance { + get { + return ResourceManager.GetString("CategoryAppearance", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Brush. + /// + internal static string CategoryBrush { + get { + return ResourceManager.GetString("CategoryBrush", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Common. + /// + internal static string CategoryCommon { + get { + return ResourceManager.GetString("CategoryCommon", resourceCulture); + } + } + } +} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx new file mode 100644 index 00000000000..8a8f1b3f3ba --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Appearance + + + Brush + + + Common + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorChannel.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorChannel.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorChannel.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml similarity index 98% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml index 3e32331d4d7..9ad61cd3e4a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPicker.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml @@ -1,10 +1,10 @@  + xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters" + xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"> @@ -449,7 +449,7 @@ - - - - - - - - - - - + Color="Black"> Not too far off without it, maybe we can fake?--> + + + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerButton.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerButton.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerRenderingHelpers.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerRenderingHelpers.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerRenderingHelpers.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorPickerSlider.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPickerSlider.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorRepresentation.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorRepresentation.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorRepresentation.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToColorShadeConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToColorShadeConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToHexConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ColorToHexConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorToHexConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ContrastBrushConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/ContrastBrushConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ContrastBrushConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/FluentColorPalette.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/FluentColorPalette.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/FluentColorPalette.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/IColorPalette.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/ColorPicker/IColorPalette.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/IColorPalette.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj new file mode 100644 index 00000000000..628a40d06b1 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj @@ -0,0 +1,45 @@ + + + + uap10.0.17763 + Windows Community Toolkit Controls + + This library provides XAML templated controls. It is part of the Windows Community Toolkit. + + Controls: + - ColorPicker/ColorPickerButton: Improved ColorPicker and DropDownButton version. + - RadialGauge: Displays a value within a range, using a needle on a circular face. + - RangeSelector: "Double slider" control for range values. + - RemoteDevicePicker: Remote Device Picker Control for Project Rome. + - TokenizingTextBox: An AutoSuggestBox like control which places entered input into easily removed containers for contacts or tags. + + UWP Toolkit Windows Controls XAML Range Radial Gauge RadiaGauge Tokenizing TextBox + + false + 8.0 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj.DotSettings b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj.DotSettings new file mode 100644 index 00000000000..645b28a5324 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj.DotSettings @@ -0,0 +1,3 @@ + + True + True \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..cd5fbb60e47 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Properties/AssemblyInfo.cs @@ -0,0 +1,13 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using System.Resources; +using System.Runtime.CompilerServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: InternalsVisibleTo("UnitTests.UWP")] +[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")] +[assembly: NeutralResourcesLanguage("en-US")] \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGauge.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGauge.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGaugeAutomationPeer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RadialGauge/RadialGaugeAutomationPeer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RadialGauge/RadialGaugeAutomationPeer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeChangedEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeChangedEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeChangedEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RangeSelector/RangeSelector.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RangeSelector/RangeSelector.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDevicePicker.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDevicePicker.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDeviceSelectionMode.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteDeviceSelectionMode.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteDeviceSelectionMode.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/RemoteDevicePicker/RemoteSystemKindToSymbolConverter.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw new file mode 100644 index 00000000000..09770976e63 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Strings/en-US/Resources.resw @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Remove + Label for TokenizingTextBox MenuFlyout 'Remove' option. + + + Select All + Label for TokenizingTextBox MenuFlyout 'Select All' option. + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml new file mode 100644 index 00000000000..85ed781a95e --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/Themes/Generic.xaml @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/ITokenStringContainer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/ITokenStringContainer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/ITokenStringContainer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/InterspersedObservableCollection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/InterspersedObservableCollection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/InterspersedObservableCollection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/PretokenStringContainer.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/PretokenStringContainer.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/PretokenStringContainer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemAddingEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemAddingEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenItemRemovingEventArgs.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenItemRemovingEventArgs.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Events.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Events.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Events.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Properties.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Properties.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Properties.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.Selection.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.Selection.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs similarity index 99% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs index d46f9f24b17..2b47f16b2f6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.cs @@ -185,7 +185,7 @@ protected override void OnApplyTemplate() var selectAllMenuItem = new MenuFlyoutItem { - Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources") + Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Input/Resources") }; selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText(); var menuFlyout = new MenuFlyout(); @@ -349,7 +349,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element var removeMenuItem = new MenuFlyoutItem { - Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources") + Text = "WCT_TokenizingTextBoxItem_MenuFlyout_Remove".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Input/Resources") }; removeMenuItem.Click += (s, e) => TokenizingTextBoxItem_ClearClicked(tokenitem, null); @@ -361,7 +361,7 @@ protected override void PrepareContainerForItemOverride(DependencyObject element var selectAllMenuItem = new MenuFlyoutItem { - Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Core/Resources") + Text = "WCT_TokenizingTextBox_MenuFlyout_SelectAll".GetLocalized("Microsoft.Toolkit.Uwp.UI.Controls.Input/Resources") }; selectAllMenuItem.Click += (s, e) => this.SelectAllTokensAndText(); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml similarity index 98% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml index dca7c0f5617..7f81a6d8fbb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBox.xaml +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml @@ -3,8 +3,8 @@ xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"> - - + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxItem.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxStyleSelector.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml new file mode 100644 index 00000000000..c6f210468c2 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input/VisualStudioToolsManifest.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml new file mode 100644 index 00000000000..ee5ee98d8c9 --- /dev/null +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml.cs b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml.cs new file mode 100644 index 00000000000..65e09322217 --- /dev/null +++ b/SmokeTests/Microsoft.Toolkit.Uwp.UI.Controls.Input/MainPage.xaml.cs @@ -0,0 +1,14 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +namespace SmokeTest +{ + public sealed partial class MainPage + { + public MainPage() + { + InitializeComponent(); + } + } +} diff --git a/SmokeTests/SmokeTests.proj b/SmokeTests/SmokeTests.proj index c421f2b3e71..aa028c5375b 100644 --- a/SmokeTests/SmokeTests.proj +++ b/SmokeTests/SmokeTests.proj @@ -22,9 +22,10 @@ Microsoft.Toolkit.Uwp.UI.Controls.Core; Microsoft.Toolkit.Uwp.UI.Controls.DataGrid; Microsoft.Toolkit.Uwp.UI.Controls.Layout; + Microsoft.Toolkit.Uwp.UI.Controls.Input; Microsoft.Toolkit.Uwp.UI.Controls.Markdown; Microsoft.Toolkit.Uwp.UI.Controls.Media; - Microsoft.Toolkit.Uwp.UI.Controls.Primitives; + Microsoft.Toolkit.Uwp.UI.Controls.Primitives; Microsoft.Toolkit.Uwp.UI.Media; diff --git a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj index 7aca26493a3..c6504940378 100644 --- a/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj +++ b/UnitTests/UnitTests.UWP/UnitTests.UWP.csproj @@ -253,6 +253,10 @@ {cb444381-18ba-4a51-bb32-3a498bcc1e99} Microsoft.Toolkit.Uwp.UI.Controls.Layout + + {af1be4e9-e2e1-4729-b076-b3725d8e21ee} + Microsoft.Toolkit.Uwp.UI.Controls.Input + {43bd2a36-9e12-4788-80ae-2377e41e6d05} Microsoft.Toolkit.Uwp.UI.Controls.Media diff --git a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj index 3067971ab21..80e14268a0c 100644 --- a/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj +++ b/UnitTests/UnitTests.XamlIslands.UWPApp/UnitTests.XamlIslands.UWPApp.csproj @@ -187,6 +187,10 @@ {5bf75694-798a-43a0-8150-415de195359c} Microsoft.Toolkit.Uwp.Input.GazeInteraction + + {af1be4e9-e2e1-4729-b076-b3725d8e21ee} + Microsoft.Toolkit.Uwp.UI.Controls.Input + {43bd2a36-9e12-4788-80ae-2377e41e6d05} Microsoft.Toolkit.Uwp.UI.Controls.Media diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index da613e31f51..59f6693bb00 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -151,6 +151,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Co {CB444381-18BA-4A51-BB32-3A498BCC1E99} = {CB444381-18BA-4A51-BB32-3A498BCC1E99} EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input", "Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj", "{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Input.Design\Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj", "{3307BC1D-5D71-41C6-A1B3-B113B8242D08}" + ProjectSection(ProjectDependencies) = postProject + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} + EndProjectSection +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution UITests\UITests.Tests.Shared\UITests.Tests.Shared.projitems*{05c83067-fa46-45e2-bec4-edee84ad18d0}*SharedItemsImports = 4 @@ -1056,6 +1063,38 @@ Global {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x64.ActiveCfg = Release|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.ActiveCfg = Release|x86 {1B55A026-5BF8-4D04-B7C0-A82AB49BA017}.Release|x86.Build.0 = Release|x86 + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM.ActiveCfg = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM.Build.0 = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|ARM64.Build.0 = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|x64.ActiveCfg = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|x64.Build.0 = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|x86.ActiveCfg = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Debug|x86.Build.0 = Debug|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|Any CPU.Build.0 = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|ARM.ActiveCfg = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|ARM.Build.0 = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|ARM64.ActiveCfg = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|ARM64.Build.0 = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x64.ActiveCfg = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x64.Build.0 = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.ActiveCfg = Release|Any CPU + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}.Release|x86.Build.0 = Release|Any CPU + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|Any CPU.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|ARM64.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x64.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.ActiveCfg = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Debug|x86.Build.0 = Debug|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|Any CPU.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|ARM64.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x64.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.ActiveCfg = Release|x86 + {3307BC1D-5D71-41C6-A1B3-B113B8242D08}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1102,6 +1141,8 @@ Global {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {AF5045DE-0D13-45C2-AC33-50CF5FDB333A} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {1B55A026-5BF8-4D04-B7C0-A82AB49BA017} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} + {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} + {3307BC1D-5D71-41C6-A1B3-B113B8242D08} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5403B0C4-F244-4F73-A35C-FE664D0F4345}