From e53b0669108ef54584c65aa03effcebc1e530cc1 Mon Sep 17 00:00:00 2001 From: Morten Nielsen Date: Thu, 21 Sep 2017 23:28:47 -0700 Subject: [PATCH] Fixed compilation errors and metadata for several controls --- .../AdaptiveGridViewMetadata.cs | 53 +++++++++++++++ .../BladeItemMetadata.cs | 56 ++++++++++++++++ .../BladeViewMetadata.cs | 56 ++++++++++++++++ .../Common/MetadataRegistrationBase.cs | 17 +++-- .../Common/PlatformTypes.cs | 4 +- .../DropShadowPanelMetadata.cs | 66 +++++++++++++++++++ .../MenuItemMetadata.cs | 59 +++++++++++++++++ .../MenuMetadata.cs | 4 +- .../MetadataRegistration.cs | 2 +- ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 32 ++++----- .../Properties/AssemblyInfo.cs | 11 ---- UWP Community Toolkit.sln | 29 +++++--- 12 files changed, 340 insertions(+), 49 deletions(-) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/AdaptiveGridViewMetadata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeItemMetadata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeViewMetadata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/DropShadowPanelMetadata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuItemMetadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/AdaptiveGridViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/AdaptiveGridViewMetadata.cs new file mode 100644 index 000000000..5b8999713 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/AdaptiveGridViewMetadata.cs @@ -0,0 +1,53 @@ +// ****************************************************************** +// Copyright (c) Microsoft. All rights reserved. +// This code is licensed under the MIT License (MIT). +// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE. +// ****************************************************************** + +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Windows.Design; +using Microsoft.Windows.Design.Features; +using Microsoft.Windows.Design.Metadata; +using Microsoft.Windows.Design.Model; +using Microsoft.Windows.Design.PropertyEditing; +using System.ComponentModel; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ + internal class CustomDialogMetadata : AttributeTableBuilder + { + public CustomDialogMetadata() + : base() + { + AddCallback(typeof(AdaptiveGridView), + b => + { + b.AddCustomAttributes(nameof(AdaptiveGridView.DesiredWidth), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(AdaptiveGridView.ItemHeight), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(AdaptiveGridView.OneRowModeEnabled), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(AdaptiveGridView.StretchContentForSingleRow), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(AdaptiveGridView.ItemClickCommand), + new EditorBrowsableAttribute(EditorBrowsableState.Advanced), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + + b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); + } + ); + } + } +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeItemMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeItemMetadata.cs new file mode 100644 index 000000000..25d9bf5a1 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeItemMetadata.cs @@ -0,0 +1,56 @@ +// ****************************************************************** +// Copyright (c) Microsoft. All rights reserved. +// This code is licensed under the MIT License (MIT). +// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE. +// ****************************************************************** + +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Windows.Design; +using Microsoft.Windows.Design.Features; +using Microsoft.Windows.Design.Metadata; +using Microsoft.Windows.Design.Model; +using Microsoft.Windows.Design.PropertyEditing; +using System.ComponentModel; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ + + internal class BladeItemMetadata : AttributeTableBuilder + { + public BladeItemMetadata() + : base() + { + AddCallback(typeof(BladeItem), + b => + { + b.AddCustomAttributes(nameof(BladeItem.TitleBarVisibility), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(BladeItem.Title), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(BladeItem.IsOpen), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(BladeItem.TitleBarBackground), + new CategoryAttribute(Properties.Resources.CategoryBrush) + ); + b.AddCustomAttributes(nameof(BladeItem.CloseButtonBackground), + new CategoryAttribute(Properties.Resources.CategoryBrush) + ); + b.AddCustomAttributes(nameof(BladeItem.CloseButtonForeground), + new CategoryAttribute(Properties.Resources.CategoryBrush) + ); + + b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); + } + ); + } + } +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeViewMetadata.cs new file mode 100644 index 000000000..e568a89dc --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeViewMetadata.cs @@ -0,0 +1,56 @@ +// ****************************************************************** +// Copyright (c) Microsoft. All rights reserved. +// This code is licensed under the MIT License (MIT). +// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE. +// ****************************************************************** + +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Windows.Design; +using Microsoft.Windows.Design.Features; +using Microsoft.Windows.Design.Metadata; +using Microsoft.Windows.Design.Model; +using Microsoft.Windows.Design.PropertyEditing; +using System.ComponentModel; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ + + internal class BladeViewMetadata : AttributeTableBuilder + { + public BladeViewMetadata() + : base() + { + AddCallback(typeof(BladeView), + b => + { + b.AddCustomAttributes(nameof(BladeView.ActiveBlades), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(BladeView.BladeMode), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(BladeView.AutoCollapseCountThreshold), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(BladeView.Items), + new PropertyOrderAttribute(PropertyOrder.Early), + new CategoryAttribute(Properties.Resources.CategoryCommon), + //The following is necessary because this is a collection of an abstract type, so we help + //the designer with populating supported types that can be added to the collection + new NewItemTypesAttribute(new System.Type[] { + typeof(BladeItem), + }), + new AlternateContentPropertyAttribute() + ); + b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); + } + ); + } + } +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs index 7cbb56056..5bd277f98 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs @@ -21,11 +21,14 @@ using System.Linq; using System.Reflection; using System.Xml.Linq; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Common +namespace Microsoft.Toolkit.Uwp.Design.Common { public class MetadataRegistrationBase { - AttributeTable masterMetadataTable; + private AttributeTable masterMetadataTable; + + internal MetadataRegistrationBase() { } + /// /// Build design time metadata attribute table. /// @@ -131,7 +134,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Common Type t = Type.GetType(typeName); if (t != null && t.IsPublic && t.IsClass && - t.IsSubclassOf(Microsoft.Toolkit.Uwp.UI.Controls.Design.Types.PlatformTypes.DependencyObjectType)) + t.IsSubclassOf(Types.PlatformTypes.DependencyObjectType)) { string desc = ParseDescription(member); if (desc == null) @@ -185,20 +188,20 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Common } private static bool IsBrowsable(Type t) { - var attrs = t.GetCustomAttributes(Microsoft.Toolkit.Uwp.UI.Controls.Design.Types.PlatformTypes.EditorBrowsableAttributeType, false); + var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false); foreach (var attr in attrs) { - return Microsoft.Toolkit.Uwp.UI.Controls.Design.Types.PlatformTypes.IsBrowsable(attr); + return Types.PlatformTypes.IsBrowsable(attr); } return true; } private static bool IsBrowsable(System.Reflection.PropertyInfo pi) { - var attrs = pi.GetCustomAttributes(Microsoft.Toolkit.Uwp.UI.Controls.Design.Types.PlatformTypes.EditorBrowsableAttributeType, false); + var attrs = pi.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false); foreach (var attr in attrs) { - return Microsoft.Toolkit.Uwp.UI.Controls.Design.Types.PlatformTypes.IsBrowsable(attr); + return Types.PlatformTypes.IsBrowsable(attr); } return true; } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs index 28fdc993b..da2cd8175 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs @@ -14,9 +14,9 @@ using System; using Microsoft.Windows.Design.Metadata; using Windows.UI.Xaml; -namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Types +namespace Microsoft.Toolkit.Uwp.Design.Types { - public class PlatformTypes + internal class PlatformTypes { public static readonly Type DependencyObjectType = typeof(DependencyObject); public static readonly Type UIElementType = typeof(UIElement); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/DropShadowPanelMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/DropShadowPanelMetadata.cs new file mode 100644 index 000000000..a86401c8b --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/DropShadowPanelMetadata.cs @@ -0,0 +1,66 @@ +// ****************************************************************** +// Copyright (c) Microsoft. All rights reserved. +// This code is licensed under the MIT License (MIT). +// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE. +// ****************************************************************** + +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Windows.Design; +using Microsoft.Windows.Design.Features; +using Microsoft.Windows.Design.Metadata; +using Microsoft.Windows.Design.Model; +using Microsoft.Windows.Design.PropertyEditing; +using System.ComponentModel; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design + +{ + internal class DropShadowPanelDefaults : DefaultInitializer + { + public override void InitializeDefaults(ModelItem item) + { + item.Properties[nameof(DropShadowPanel.BlurRadius)].SetValue(5d); + } + } + + internal class DropShadowPanelMetadata : AttributeTableBuilder + { + public DropShadowPanelMetadata() + : base() + { + AddCallback(typeof(DropShadowPanel), + b => + { + b.AddCustomAttributes(new FeatureAttribute(typeof(DropShadowPanelDefaults))); + + b.AddCustomAttributes(nameof(DropShadowPanel.BlurRadius), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(DropShadowPanel.Color), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(DropShadowPanel.OffsetX), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(DropShadowPanel.OffsetY), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(DropShadowPanel.OffsetZ), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(DropShadowPanel.ShadowOpacity), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + + b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); + } + ); + } + } +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuItemMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuItemMetadata.cs new file mode 100644 index 000000000..be59617ae --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuItemMetadata.cs @@ -0,0 +1,59 @@ +// ****************************************************************** +// Copyright (c) Microsoft. All rights reserved. +// This code is licensed under the MIT License (MIT). +// THE CODE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE CODE OR THE USE OR OTHER DEALINGS IN THE CODE. +// ****************************************************************** + +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Windows.Design; +using Microsoft.Windows.Design.Metadata; +using Microsoft.Windows.Design.PropertyEditing; +using System.ComponentModel; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ + internal class MenuItemMetadata : AttributeTableBuilder + { + public MenuItemMetadata() + : base() + { +#pragma warning disable 0618 //Ignore obsolete warning + AddCallback(typeof(MenuItem), +#pragma warning restore 0618 + b => + { + b.AddCustomAttributes(nameof(MenuItem.Header), + new PropertyOrderAttribute(PropertyOrder.Early), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(MenuItem.IsOpened), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(MenuItem.HeaderTemplate), + new EditorBrowsableAttribute(EditorBrowsableState.Advanced), + new CategoryAttribute(Properties.Resources.CategoryCommon) + ); + b.AddCustomAttributes(nameof(MenuItem.Items), + new PropertyOrderAttribute(PropertyOrder.Early), + new CategoryAttribute(Properties.Resources.CategoryCommon), + //The following is necessary because this is a collection of an abstract type, so we help + //the designer with populating supported types that can be added to the collection + new NewItemTypesAttribute(new System.Type[] { + typeof(MenuItem), + }), + new AlternateContentPropertyAttribute() + ); + + b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); + b.AddCustomAttributes(new ToolboxBrowsableAttribute(false)); + } + ); + } + } +} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuMetadata.cs index 44081e9bf..e089f93d8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuMetadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuMetadata.cs @@ -34,9 +34,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design //The following is necessary because this is a collection of an abstract type, so we help //the designer with populating supported types that can be added to the collection new NewItemTypesAttribute(new System.Type[] { -#pragma warning disable 0618 //Ignore obsolete warning - typeof(Microsoft.Toolkit.Uwp.UI.Controls.MenuItem), -#pragma warning restore 0618 + typeof(MenuItem), }), new AlternateContentPropertyAttribute() ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs index 68bb037f6..a3a8c9e25 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs @@ -13,7 +13,7 @@ using System; using System.Reflection; using Microsoft.Windows.Design.Metadata; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.Design.Common; [assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj index 4c27ee8c4..032874009 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj @@ -3,7 +3,7 @@ Debug - x86 + AnyCPU {7AEFC959-ED7C-4D96-9E92-72609B40FBE0} Library Properties @@ -13,28 +13,32 @@ 512 - 10.0 - x86 - prompt - 4 + 8.1 - + true bin\Debug\ full false DEBUG;TRACE + AnyCPU - + bin\Release\ pdbonly + AnyCPU true TRACE + + + False + ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\$(Configuration)\uap10.0\Microsoft.Toolkit.Uwp.UI.Controls.dll + true False @@ -72,6 +76,11 @@ + + + + + @@ -101,14 +110,7 @@ - - {e9faabfb-d726-42c1-83c1-cb46a29fea81} - Microsoft.Toolkit.Uwp.UI.Controls - False - - - - + Microsoft.Toolkit.Uwp.UI.Controls.xml Designer diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs index c8a445f2a..d65653dc2 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs @@ -42,17 +42,6 @@ using System.Windows; //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - -[assembly:ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - - // Version information for an assembly consists of the following four values: // // Major Version diff --git a/UWP Community Toolkit.sln b/UWP Community Toolkit.sln index 8c4b72c30..704ddd28c 100644 --- a/UWP Community Toolkit.sln +++ b/UWP Community Toolkit.sln @@ -61,6 +61,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.Notif EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Design", "Microsoft.Toolkit.Uwp.UI.Controls.Design\Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}" + ProjectSection(ProjectDependencies) = postProject + {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} + EndProjectSection EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution @@ -371,16 +374,22 @@ Global {94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|x64.Build.0 = Release|Any CPU {94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|x86.ActiveCfg = Release|Any CPU {94F8D702-3A9D-4CFB-85C9-79FC5DBD8B22}.Release|x86.Build.0 = Release|Any CPU - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.ActiveCfg = Debug|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.ActiveCfg = Debug|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.ActiveCfg = Debug|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.ActiveCfg = Debug|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.Build.0 = Debug|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.ActiveCfg = Release|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.ActiveCfg = Release|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.ActiveCfg = Release|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.ActiveCfg = Release|x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.Build.0 = Release|x86 + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.Build.0 = Debug|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.ActiveCfg = Debug|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x64.Build.0 = Debug|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.ActiveCfg = Debug|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|x86.Build.0 = Debug|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|Any CPU.Build.0 = Release|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.ActiveCfg = Release|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|ARM.Build.0 = Release|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.ActiveCfg = Release|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.Build.0 = Release|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.ActiveCfg = Release|Any CPU + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE