From 4d4761552e6aaa8b43163d65c599bad101c741a9 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 30 May 2020 18:38:42 +0530 Subject: [PATCH 1/8] Removed Settings from Design projects Settings is not needed. It's a self-contained library. We don't need to have to tweak any behaviour for the Design surface right now. --- ...kit.Uwp.UI.Controls.DataGrid.Design.csproj | 11 +------- .../Properties/Settings.Designer.cs | 26 ------------------- .../Properties/Settings.settings | 7 ----- ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 11 +------- .../Properties/Settings.Designer.cs | 26 ------------------- .../Properties/Settings.settings | 7 ----- ...kit.Uwp.UI.Controls.Markdown.Design.csproj | 13 ++-------- .../Properties/Settings.Designer.cs | 26 ------------------- .../Properties/Settings.settings | 7 ----- 9 files changed, 4 insertions(+), 130 deletions(-) delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Settings.Designer.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Settings.settings delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Settings.Designer.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Settings.settings delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.Designer.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.settings diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj index 77f8ff582ca..935a6f93253 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj @@ -95,27 +95,18 @@ True Resources.resx - - True - Settings.settings - True - ResXFileCodeGenerator Resources.Designer.cs - - SettingsSingleFileGenerator - Settings.Designer.cs - Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml - Designer + False diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Settings.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Settings.Designer.cs deleted file mode 100644 index 662fe0ad430..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Settings.settings b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Settings.settings deleted file mode 100644 index 033d7a5e9e2..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file 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 1201d323388..65606a390b4 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 @@ -111,11 +111,6 @@ True Resources.resx - - True - Settings.settings - True - @@ -129,16 +124,12 @@ ResXFileCodeGenerator Resources.Designer.cs - - SettingsSingleFileGenerator - Settings.Designer.cs - Microsoft.Toolkit.Uwp.UI.Controls.xml - Designer + False diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Settings.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Settings.Designer.cs deleted file mode 100644 index 662fe0ad430..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Settings.settings b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Settings.settings deleted file mode 100644 index 033d7a5e9e2..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj index a03aff9ca16..594347717f6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj @@ -7,7 +7,7 @@ {67FE47A0-CA93-4680-B770-A0A48C1DBC40} Library Properties - Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design + Microsoft.Toolkit.Uwp.UI.Controls.Design Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design v4.7.2 512 @@ -97,26 +97,17 @@ True Resources.resx - - True - Settings.settings - True - ResXFileCodeGenerator Resources.Designer.cs - - SettingsSingleFileGenerator - Settings.Designer.cs - Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml - Designer + False diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.Designer.cs deleted file mode 100644 index 662fe0ad430..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 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 { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.settings b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.settings deleted file mode 100644 index 033d7a5e9e2..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From b796cf082a8b5e349f33625552912eeda6b05a6c Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 30 May 2020 19:00:56 +0530 Subject: [PATCH 2/8] Consolidate Common code Move control metadata into separate folder Add '.' after the control name in the filenames to make the file self-contained to attributes and defaults registration --- .../Common/MetadataRegistrationBase.cs | 253 ------------------ .../Common/PlatformTypes.cs | 49 ---- .../Common/ToolboxCategoryPaths.cs | 23 -- .../DataGrid.Metadata.cs} | 0 ...kit.Uwp.UI.Controls.DataGrid.Design.csproj | 8 +- .../AdaptiveGridView.Metadata.cs} | 0 .../BladeItem.Metadata.cs} | 0 .../BladeView.Metadata.cs} | 0 .../Carousel.Metadata.cs} | 0 .../DropShadowPanel.Metadata.cs} | 0 .../Expander.Metadata.cs} | 0 .../GridSplitter.Metadata.cs} | 0 .../ImageEx.Metadata.cs} | 0 .../InAppNotification.Metadata.cs} | 0 .../LayoutTransitionControl.Metadata.cs} | 0 .../Loading.Metadata.cs} | 0 .../MasterDetailsView.Metadata.cs} | 0 .../Menu.Metadata.cs} | 0 .../MenuItem.Metadata.cs} | 0 .../OrbitView.Metadata.cs} | 0 .../RadialGauge.Metadata.cs} | 0 .../RadialProgressBar.Metadata.cs} | 0 .../RangeSelector.Metadata.cs} | 0 .../RotatorTile.Metadata.cs} | 0 .../ScrollHeader.Metadata.cs} | 0 .../TextToolbar.Metadata.cs} | 0 .../TileControl.Metadata.cs} | 0 .../WrapPanel.Metadata.cs} | 0 ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 50 ++-- .../Common/MetadataRegistrationBase.cs | 252 ----------------- .../Common/PlatformTypes.cs | 49 ---- .../Common/ToolboxCategoryPaths.cs | 23 -- .../MarkdownTextBlock.Metadata.cs} | 0 ...kit.Uwp.UI.Controls.Markdown.Design.csproj | 8 +- 34 files changed, 33 insertions(+), 682 deletions(-) delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/PlatformTypes.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/ToolboxCategoryPaths.cs rename Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/{DataGridMetadata.cs => Controls/DataGrid.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{AdaptiveGridViewMetadata.cs => Controls/AdaptiveGridView.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{BladeItemMetadata.cs => Controls/BladeItem.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{BladeViewMetadata.cs => Controls/BladeView.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{CarouselMetadata.cs => Controls/Carousel.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{DropShadowPanelMetadata.cs => Controls/DropShadowPanel.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{ExpanderMetadata.cs => Controls/Expander.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{GridSplitterMetadata.cs => Controls/GridSplitter.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{ImageExMetadata.cs => Controls/ImageEx.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{InAppNotificationMetadata.cs => Controls/InAppNotification.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{LayoutTransitionControlMetadata.cs => Controls/LayoutTransitionControl.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{LoadingMetadata.cs => Controls/Loading.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{MasterDetailsViewMetadata.cs => Controls/MasterDetailsView.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{MenuMetadata.cs => Controls/Menu.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{MenuItemMetadata.cs => Controls/MenuItem.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{OrbitViewMetadata.cs => Controls/OrbitView.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{RadialGaugeMetadata.cs => Controls/RadialGauge.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{RadialProgressBarMetadata.cs => Controls/RadialProgressBar.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{RangeSelectorMetadata.cs => Controls/RangeSelector.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{RotatorTileMetadata.cs => Controls/RotatorTile.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{ScrollHeaderMetadata.cs => Controls/ScrollHeader.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{TextToolbarMetadata.cs => Controls/TextToolbar.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{TileControlMetadata.cs => Controls/TileControl.Metadata.cs} (100%) rename Microsoft.Toolkit.Uwp.UI.Controls.Design/{WrapPanelMetadata.cs => Controls/WrapPanel.Metadata.cs} (100%) delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/ToolboxCategoryPaths.cs rename Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/{MarkdownTextBlockMetadata.cs => Controls/MarkdownTextBlock.Metadata.cs} (100%) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs deleted file mode 100644 index 733b19ca7ce..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/MetadataRegistrationBase.cs +++ /dev/null @@ -1,253 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Microsoft.Windows.Design.Metadata; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Xml.Linq; - -namespace Microsoft.Toolkit.Uwp.Design.Common -{ - public class MetadataRegistrationBase - { - private AttributeTable masterMetadataTable; - - internal MetadataRegistrationBase() { } - - /// - /// Build design time metadata attribute table. - /// - /// Custom attribute table. - protected virtual AttributeTable BuildAttributeTable() - { - AttributeTableBuilder builder = new AttributeTableBuilder(); - - AddDescriptions(builder); - AddAttributes(builder); - AddTables(builder, this); - masterMetadataTable = builder.CreateTable(); - return masterMetadataTable; - } - - /// - /// Find all AttributeTableBuilder subclasses in the assembly - /// and add their attributes to the assembly attribute table. - /// - /// The assembly attribute table builder. - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")] - private void AddTables(AttributeTableBuilder builder, object parent) - { - Debug.Assert(builder != null, "AddTables is called with null parameter!"); - - Assembly asm = parent.GetType().Assembly; - foreach (Type t in asm.GetTypes()) - { - if (t.IsSubclassOf(typeof(AttributeTableBuilder))) - { - try - { - AttributeTableBuilder atb = (AttributeTableBuilder)Activator.CreateInstance(t); - builder.AddTable(atb.CreateTable()); - } - catch (Exception) - { - //error loading design assembly - } - } - } - } - - /// - /// Gets or sets the case sensitive resource name of the embedded XML file. - /// - protected string XmlResourceName { get; set; } - - /// - /// Gets or sets the FullName of the corresponding run time assembly. - /// - protected string AssemblyFullName { get; set; } - - /// - /// Create description attribute from run time assembly xml file. - /// - /// The assembly attribute table builder. - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")] - private void AddDescriptions(AttributeTableBuilder builder) - { - Debug.Assert(builder != null, "AddDescriptions is called with null parameter!"); - - if (string.IsNullOrEmpty(XmlResourceName) || - string.IsNullOrEmpty(AssemblyFullName)) - { - return; - } - XDocument xdoc = null; - try - { - xdoc = XDocument.Load(new StreamReader( - Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName))); - } - catch { return; } - if (xdoc == null) - { - return; - } - - foreach (XElement member in xdoc.Descendants("member")) - { - try - { - string name = (string)member.Attribute("name"); - if (name == null) - continue; - bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase); - if (isType || - name.StartsWith("P:", StringComparison.OrdinalIgnoreCase)) - { - int lastDot = name.Length; - string typeName; - if (isType) - { - typeName = name.Substring(2); // skip leading "T:" - } - else - { - lastDot = name.LastIndexOf('.'); - typeName = name.Substring(2, lastDot - 2); - } - typeName += AssemblyFullName; - - Type t = Type.GetType(typeName); - if (t != null && t.IsPublic && t.IsClass && - t.IsSubclassOf(Types.PlatformTypes.DependencyObjectType)) - { - string desc = ParseDescription(member); - if (desc == null) - continue; - - desc = desc.Trim(); - desc = string.Join(" ", desc.Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)); - if (isType) - { - bool isBrowsable = true; - try - { - isBrowsable = IsBrowsable(t); - } - catch { isBrowsable = false; } - if (isBrowsable) - builder.AddCallback(t, b => b.AddCustomAttributes(new DescriptionAttribute(desc))); - else //Hide from intellisense - { - builder.AddCallback(t, b => b.AddCustomAttributes( - new BrowsableAttribute(false), - new Windows.Design.ToolboxBrowsableAttribute(false), - new ToolboxItemAttribute(false))); - } - } - else - { - string propName = name.Substring(lastDot + 1); - PropertyInfo pi = t.GetProperty(propName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); - if (pi != null) - { - bool isBrowsable = true; - try - { - isBrowsable = IsBrowsable(pi); - } - catch { isBrowsable = false; } - if (isBrowsable) - builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc))); - else //Hide from intellisense - builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false))); - } - } - } - } - } - catch (Exception) - { - } - } - } - - private static bool IsBrowsable(Type t) - { - var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false); - foreach (var attr in attrs) - { - return Types.PlatformTypes.IsBrowsable(attr); - } - return true; - } - - private static bool IsBrowsable(PropertyInfo pi) - { - var attrs = pi.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false); - foreach (var attr in attrs) - { - return Types.PlatformTypes.IsBrowsable(attr); - } - return true; - } - - /// - /// Create description string from xml doc summary tag. - /// - /// A single node of the xml doc. - /// Description string. - private static string ParseDescription(XElement member) - { - string desc = null; - XElement memberDesc = member.Descendants("summary").FirstOrDefault(); - - if (memberDesc != null) - { - IEnumerable nodes = memberDesc.DescendantNodes(); - - if (nodes != null) - { - foreach (XNode node in nodes) - { - if (node.NodeType == System.Xml.XmlNodeType.Text) - { - desc += node.ToString(); - } - else - { - string s = node.ToString(); - int i = s.LastIndexOf('.'); - int j = s.LastIndexOf('"'); - - if ((i != -1 || j != -1) && j - i - 1 > 0) - { - try - { - desc += s.Substring(i + 1, j - i - 1); - } - catch { } - } - } - } - } - } - return desc; - } - - /// - /// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass. - /// - /// The assembly attribute table builder. - protected virtual void AddAttributes(AttributeTableBuilder builder) - { - } - } -} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/PlatformTypes.cs deleted file mode 100644 index 46b93f3f374..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/PlatformTypes.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using Microsoft.Windows.Design.Metadata; -using Windows.UI.Xaml; - -namespace Microsoft.Toolkit.Uwp.Design.Types -{ - internal class PlatformTypes - { - public static readonly Type DependencyObjectType = typeof(DependencyObject); - public static readonly Type UIElementType = typeof(UIElement); - public static readonly Type FrameworkElementType = typeof(FrameworkElement); - public static readonly Type EditorBrowsableAttributeType = typeof(System.ComponentModel.EditorBrowsableAttribute); - - /// - /// Used by MetadataRegistrationBase to get the browsable state - /// - /// This parameter must be of type 'System.ComponentModel.EditorBrowsableAttribute' - /// - public static bool IsBrowsable(object editorBrowsableAttribute) - { - if (editorBrowsableAttribute is System.ComponentModel.EditorBrowsableAttribute) - return (editorBrowsableAttribute as System.ComponentModel.EditorBrowsableAttribute).State != - System.ComponentModel.EditorBrowsableState.Never; - return true; - } - - public static class Control - { - public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control"); - public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background"); - public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush"); - public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness"); - } - - public static class FrameworkElement - { - public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement"); - public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin"); - public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment"); - public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment"); - public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height"); - public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width"); - } - } -} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/ToolboxCategoryPaths.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/ToolboxCategoryPaths.cs deleted file mode 100644 index acdacdd4c55..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Common/ToolboxCategoryPaths.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; - -[assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")] - -namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Common -{ - /// - /// Names for ToolboxCategoryAttribute. - /// - internal static class ToolboxCategoryPaths - { - /// - /// Basic Controls category. - /// - public const string Toolkit = "Windows Community Toolkit"; - } -} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/DataGridMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/DataGridMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj index 935a6f93253..d16ff88b646 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj @@ -84,9 +84,11 @@ + + + + - - Code @@ -95,8 +97,6 @@ True Resources.resx - - ResXFileCodeGenerator Resources.Designer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/AdaptiveGridViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/AdaptiveGridViewMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeItemMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeItemMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/BladeViewMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/CarouselMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/CarouselMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/DropShadowPanelMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/DropShadowPanelMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/ExpanderMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/ExpanderMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/GridSplitterMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/GridSplitterMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/ImageExMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/ImageExMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/InAppNotificationMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/InAppNotificationMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/LayoutTransitionControlMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/LayoutTransitionControlMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/LoadingMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/LoadingMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MasterDetailsViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/MasterDetailsViewMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuItemMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/MenuItemMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/OrbitViewMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/OrbitViewMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/RadialGaugeMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/RadialGaugeMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/RadialProgressBarMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/RadialProgressBarMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/RangeSelectorMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/RangeSelectorMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/RotatorTileMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/RotatorTileMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/ScrollHeaderMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/ScrollHeaderMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TextToolbarMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/TextToolbarMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/TileControlMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/TileControlMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/WrapPanelMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/WrapPanelMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs 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 65606a390b4..d6a71dcacbc 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 @@ -85,24 +85,33 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Code @@ -111,15 +120,6 @@ True Resources.resx - - - - - - - - - ResXFileCodeGenerator Resources.Designer.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs deleted file mode 100644 index ffcec2e7184..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/MetadataRegistrationBase.cs +++ /dev/null @@ -1,252 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using Microsoft.Windows.Design.Metadata; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Xml.Linq; - -namespace Microsoft.Toolkit.Uwp.Design.Common -{ - public class MetadataRegistrationBase - { - private AttributeTable masterMetadataTable; - - internal MetadataRegistrationBase() { } - - /// - /// Build design time metadata attribute table. - /// - /// Custom attribute table. - protected virtual AttributeTable BuildAttributeTable() - { - AttributeTableBuilder builder = new AttributeTableBuilder(); - - AddDescriptions(builder); - AddAttributes(builder); - AddTables(builder, this); - masterMetadataTable = builder.CreateTable(); - return masterMetadataTable; - } - - /// - /// Find all AttributeTableBuilder subclasses in the assembly - /// and add their attributes to the assembly attribute table. - /// - /// The assembly attribute table builder. - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail!")] - private void AddTables(AttributeTableBuilder builder, object parent) - { - Debug.Assert(builder != null, "AddTables is called with null parameter!"); - - Assembly asm = parent.GetType().Assembly; - foreach (Type t in asm.GetTypes()) - { - if (t.IsSubclassOf(typeof(AttributeTableBuilder))) - { - try - { - AttributeTableBuilder atb = (AttributeTableBuilder)Activator.CreateInstance(t); - builder.AddTable(atb.CreateTable()); - } - catch (Exception) - { - //error loading design assembly - } - } - } - } - - /// - /// Gets or sets the case sensitive resource name of the embedded XML file. - /// - protected string XmlResourceName { get; set; } - - /// - /// Gets or sets the FullName of the corresponding run time assembly. - /// - protected string AssemblyFullName { get; set; } - - /// - /// Create description attribute from run time assembly xml file. - /// - /// The assembly attribute table builder. - [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")] - private void AddDescriptions(AttributeTableBuilder builder) - { - Debug.Assert(builder != null, "AddDescriptions is called with null parameter!"); - - if (string.IsNullOrEmpty(XmlResourceName) || - string.IsNullOrEmpty(AssemblyFullName)) - { - return; - } - XDocument xdoc = null; - try - { - xdoc = XDocument.Load(new StreamReader( - Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName))); - } - catch { return; } - if (xdoc == null) - { - return; - } - - foreach (XElement member in xdoc.Descendants("member")) - { - try - { - string name = (string)member.Attribute("name"); - if (name == null) - continue; - bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase); - if (isType || - name.StartsWith("P:", StringComparison.OrdinalIgnoreCase)) - { - int lastDot = name.Length; - string typeName; - if (isType) - { - typeName = name.Substring(2); // skip leading "T:" - } - else - { - lastDot = name.LastIndexOf('.'); - typeName = name.Substring(2, lastDot - 2); - } - typeName += AssemblyFullName; - - Type t = Type.GetType(typeName); - if (t != null && t.IsPublic && t.IsClass && - t.IsSubclassOf(Types.PlatformTypes.DependencyObjectType)) - { - string desc = ParseDescription(member); - if (desc == null) - continue; - - desc = desc.Trim(); - desc = string.Join(" ", desc.Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)); - if (isType) - { - bool isBrowsable = true; - try - { - isBrowsable = IsBrowsable(t); - } - catch { isBrowsable = false; } - if (isBrowsable) - builder.AddCallback(t, b => b.AddCustomAttributes(new DescriptionAttribute(desc))); - else //Hide from intellisense - { - builder.AddCallback(t, b => b.AddCustomAttributes( - new BrowsableAttribute(false), - new Microsoft.Windows.Design.ToolboxBrowsableAttribute(false), - new ToolboxItemAttribute(false))); - } - } - else - { - string propName = name.Substring(lastDot + 1); - PropertyInfo pi = t.GetProperty(propName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); - if (pi != null) - { - bool isBrowsable = true; - try - { - isBrowsable = IsBrowsable(pi); - } - catch { isBrowsable = false; } - if (isBrowsable) - builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc))); - else //Hide from intellisense - builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false))); - } - } - } - } - } - catch (Exception) - { - } - } - } - private static bool IsBrowsable(Type t) - { - var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false); - foreach (var attr in attrs) - { - return Types.PlatformTypes.IsBrowsable(attr); - } - return true; - } - - private static bool IsBrowsable(System.Reflection.PropertyInfo pi) - { - var attrs = pi.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false); - foreach (var attr in attrs) - { - return Types.PlatformTypes.IsBrowsable(attr); - } - return true; - } - - /// - /// Create description string from xml doc summary tag. - /// - /// A single node of the xml doc. - /// Description string. - private static string ParseDescription(XElement member) - { - string desc = null; - XElement memberDesc = member.Descendants("summary").FirstOrDefault(); - - if (memberDesc != null) - { - IEnumerable nodes = memberDesc.DescendantNodes(); - - if (nodes != null) - { - foreach (XNode node in nodes) - { - if (node.NodeType == System.Xml.XmlNodeType.Text) - { - desc += node.ToString(); - } - else - { - string s = node.ToString(); - int i = s.LastIndexOf('.'); - int j = s.LastIndexOf('"'); - - if ((i != -1 || j != -1) && j - i - 1 > 0) - { - try - { - desc += s.Substring(i + 1, j - i - 1); - } - catch { } - } - } - } - } - } - return desc; - } - - /// - /// Provide a place to add custom attributes without creating a AttributeTableBuilder subclass. - /// - /// The assembly attribute table builder. - protected virtual void AddAttributes(AttributeTableBuilder builder) - { - } - } -} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs deleted file mode 100644 index 30196482c4c..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/PlatformTypes.cs +++ /dev/null @@ -1,49 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using Microsoft.Windows.Design.Metadata; -using Windows.UI.Xaml; - -namespace Microsoft.Toolkit.Uwp.Design.Types -{ - internal class PlatformTypes - { - public static readonly Type DependencyObjectType = typeof(DependencyObject); - public static readonly Type UIElementType = typeof(UIElement); - public static readonly Type FrameworkElementType = typeof(FrameworkElement); - public static readonly Type EditorBrowsableAttributeType = typeof(System.ComponentModel.EditorBrowsableAttribute); - - /// - /// Used by MetadataRegistrationBase to get the browsable state - /// - /// This parameter must be of type 'System.ComponentModel.EditorBrowsableAttribute' - /// - public static bool IsBrowsable(object editorBrowsableAttribute) - { - if (editorBrowsableAttribute is System.ComponentModel.EditorBrowsableAttribute) - return (editorBrowsableAttribute as System.ComponentModel.EditorBrowsableAttribute).State != - System.ComponentModel.EditorBrowsableState.Never; - return true; - } - - public static class Control - { - public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control"); - public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background"); - public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush"); - public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness"); - } - - public static class FrameworkElement - { - public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement"); - public static readonly PropertyIdentifier MarginProperty = new PropertyIdentifier(TypeId, "Margin"); - public static readonly PropertyIdentifier HorizontalAlignmentProperty = new PropertyIdentifier(TypeId, "HorizontalAlignment"); - public static readonly PropertyIdentifier VerticalAlignmentProperty = new PropertyIdentifier(TypeId, "VerticalAlignment"); - public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height"); - public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width"); - } - } -} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/ToolboxCategoryPaths.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/ToolboxCategoryPaths.cs deleted file mode 100644 index acdacdd4c55..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Common/ToolboxCategoryPaths.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; - -[assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")] - -namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Common -{ - /// - /// Names for ToolboxCategoryAttribute. - /// - internal static class ToolboxCategoryPaths - { - /// - /// Basic Controls category. - /// - public const string Toolkit = "Windows Community Toolkit"; - } -} diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MarkdownTextBlockMetadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MarkdownTextBlockMetadata.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj index 594347717f6..8f8c9f4261f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj @@ -85,10 +85,11 @@ - + + + + - - Code @@ -97,7 +98,6 @@ True Resources.resx - ResXFileCodeGenerator Resources.Designer.cs From 65af703c97d63a45508f6d18772b42cfa3dd8e96 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 30 May 2020 20:07:34 +0530 Subject: [PATCH 3/8] =?UTF-8?q?Code=20Cleanup=20=E2=80=94=20Design=20proje?= =?UTF-8?q?cts=20only?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Usings, newline and indent changes as specified in EditorConfig --- .../Controls/DataGrid.Metadata.cs | 3 +- .../MetadataRegistration.cs | 5 +- .../Properties/AssemblyInfo.cs | 11 ++-- .../Common/MetadataRegistrationBase.cs | 13 ++-- .../Common/PlatformTypes.cs | 4 +- .../Common/ToolboxCategoryPaths.cs | 2 - .../Controls/AdaptiveGridView.Metadata.cs | 20 +++---- .../Controls/BladeItem.Metadata.cs | 20 +++---- .../Controls/BladeView.Metadata.cs | 19 +++--- .../Controls/Carousel.Metadata.cs | 26 ++++---- .../Controls/DropShadowPanel.Metadata.cs | 17 +++--- .../Controls/Expander.Metadata.cs | 28 ++++----- .../Controls/GridSplitter.Metadata.cs | 28 ++++----- .../Controls/ImageEx.Metadata.cs | 26 ++++---- .../Controls/InAppNotification.Metadata.cs | 26 ++++---- .../LayoutTransitionControl.Metadata.cs | 26 ++++---- .../Controls/Loading.Metadata.cs | 26 ++++---- .../Controls/MasterDetailsView.Metadata.cs | 28 ++++----- .../Controls/Menu.Metadata.cs | 41 ++++++------- .../Controls/MenuItem.Metadata.cs | 35 +++++------ .../Controls/OrbitView.Metadata.cs | 24 ++++---- .../Controls/RadialGauge.Metadata.cs | 22 +++---- .../Controls/RadialProgressBar.Metadata.cs | 24 ++++---- .../Controls/RangeSelector.Metadata.cs | 26 ++++---- .../Controls/RotatorTile.Metadata.cs | 28 ++++----- .../Controls/ScrollHeader.Metadata.cs | 26 ++++---- .../Controls/TextToolbar.Metadata.cs | 24 ++++---- .../Controls/TileControl.Metadata.cs | 26 ++++---- .../Controls/WrapPanel.Metadata.cs | 32 +++++----- .../MetadataRegistration.cs | 59 ++++++++++--------- .../Properties/AssemblyInfo.cs | 11 ++-- .../Controls/MarkdownTextBlock.Metadata.cs | 26 ++++---- .../MetadataRegistration.cs | 59 ++++++++++--------- .../Properties/AssemblyInfo.cs | 17 +++--- 34 files changed, 401 insertions(+), 407 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs index 3d485c6a133..ceaa515280f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs @@ -2,12 +2,13 @@ // 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.ComponentModel; + 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 System.ComponentModel; namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs index 7be8ff15da6..10cf2dcd234 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs @@ -4,8 +4,9 @@ using System; using System.Reflection; -using Microsoft.Windows.Design.Metadata; + using Microsoft.Toolkit.Uwp.Design.Common; +using Microsoft.Windows.Design.Metadata; [assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))] @@ -16,7 +17,7 @@ public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeT public MetadataRegistration() : base() { // Note: - // The default constructor sets value of AssemblyFullName and + // The default constructor sets value of AssemblyFullName and // XmlResourceName used by MetadataRegistrationBase.AddDescriptions(). // The convention here is that the in .design.csproj // (or Default namespace in Project -> Properties -> Application tab) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs index 1a907af922c..a9b6d64a3bd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs @@ -3,12 +3,9 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Windows; -// General Information about an assembly is controlled through the following +// 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 DataGrid (Design)")] @@ -20,12 +17,12 @@ [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 +// 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 +//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 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs index ffcec2e7184..2d2b5b20521 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using Microsoft.Windows.Design.Metadata; using System; using System.Collections.Generic; using System.ComponentModel; @@ -13,6 +12,8 @@ using System.Reflection; using System.Xml.Linq; +using Microsoft.Windows.Design.Metadata; + namespace Microsoft.Toolkit.Uwp.Design.Common { public class MetadataRegistrationBase @@ -22,10 +23,10 @@ public class MetadataRegistrationBase internal MetadataRegistrationBase() { } /// - /// Build design time metadata attribute table. - /// - /// Custom attribute table. - protected virtual AttributeTable BuildAttributeTable() + /// Build design time metadata attribute table. + /// + /// Custom attribute table. + protected virtual AttributeTable BuildAttributeTable() { AttributeTableBuilder builder = new AttributeTableBuilder(); @@ -37,7 +38,7 @@ protected virtual AttributeTable BuildAttributeTable() } /// - /// Find all AttributeTableBuilder subclasses in the assembly + /// Find all AttributeTableBuilder subclasses in the assembly /// and add their attributes to the assembly attribute table. /// /// The assembly attribute table builder. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs index 30196482c4c..ff18230b5fb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs @@ -3,7 +3,9 @@ // See the LICENSE file in the project root for more information. using System; + using Microsoft.Windows.Design.Metadata; + using Windows.UI.Xaml; namespace Microsoft.Toolkit.Uwp.Design.Types @@ -27,7 +29,7 @@ public static bool IsBrowsable(object editorBrowsableAttribute) System.ComponentModel.EditorBrowsableState.Never; return true; } - + public static class Control { public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control"); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs index acdacdd4c55..f2abb1c3927 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System; using System.Diagnostics.CodeAnalysis; -using System.Linq.Expressions; [assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs index 2332d8910f2..1ffc752f3c0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs @@ -2,21 +2,19 @@ // 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.ComponentModel; + 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() - { + internal class CustomDialogMetadata : AttributeTableBuilder + { + public CustomDialogMetadata() + : base() + { AddCallback(typeof(AdaptiveGridView), b => { @@ -40,6 +38,6 @@ public CustomDialogMetadata() b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); - } - } + } + } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs index f9a01a4be8c..7695033de50 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs @@ -2,22 +2,20 @@ // 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.ComponentModel; + 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() - { + internal class BladeItemMetadata : AttributeTableBuilder + { + public BladeItemMetadata() + : base() + { AddCallback(typeof(BladeItem), b => { @@ -40,6 +38,6 @@ public BladeItemMetadata() b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); - } - } + } + } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs index 445b820876f..5b7e0fc4b8b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs @@ -2,22 +2,21 @@ // 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.ComponentModel; + 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() - { + internal class BladeViewMetadata : AttributeTableBuilder + { + public BladeViewMetadata() + : base() + { AddCallback(typeof(BladeView), b => { @@ -43,6 +42,6 @@ public BladeViewMetadata() b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); - } - } + } + } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs index fbe843374d9..0f2af7517c2 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs @@ -2,22 +2,22 @@ // 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.ComponentModel; + 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 CarouselMetadata : AttributeTableBuilder - { + internal class CarouselMetadata : AttributeTableBuilder + { public CarouselMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Carousel), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Carousel), + b => + { b.AddCustomAttributes(nameof(Carousel.SelectedItem), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(Carousel.SelectedIndex), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(Carousel.TransitionDuration), new CategoryAttribute(Properties.Resources.CategoryCommon)); @@ -30,8 +30,8 @@ public CarouselMetadata() b.AddCustomAttributes(nameof(Carousel.ItemRotationZ), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(Carousel.Orientation), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs index f8f88e8bc05..5872e3d31bf 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs @@ -2,13 +2,14 @@ // 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.ComponentModel; + 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 @@ -21,11 +22,11 @@ public override void InitializeDefaults(ModelItem item) } } - internal class DropShadowPanelMetadata : AttributeTableBuilder - { - public DropShadowPanelMetadata() - : base() - { + internal class DropShadowPanelMetadata : AttributeTableBuilder + { + public DropShadowPanelMetadata() + : base() + { AddCallback(typeof(DropShadowPanel), b => { @@ -58,6 +59,6 @@ public DropShadowPanelMetadata() b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); - } - } + } + } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs index 5ad82311ba5..f5bfd9a9288 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs @@ -2,32 +2,32 @@ // 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.ComponentModel; + 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 ExpanderMetadata : AttributeTableBuilder - { + internal class ExpanderMetadata : AttributeTableBuilder + { public ExpanderMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Expander), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Expander), + b => + { b.AddCustomAttributes(nameof(Expander.Header), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Expander.HeaderTemplate), + b.AddCustomAttributes(nameof(Expander.HeaderTemplate), new CategoryAttribute(Properties.Resources.CategoryCommon), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); b.AddCustomAttributes(nameof(Expander.IsExpanded), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(Expander.ExpandDirection), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs index b1ed1c253d0..d067ef8bf12 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs @@ -2,36 +2,36 @@ // 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.ComponentModel; + 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 GridSplitterMetadata : AttributeTableBuilder - { + internal class GridSplitterMetadata : AttributeTableBuilder + { public GridSplitterMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter), + b => + { b.AddCustomAttributes(nameof(GridSplitter.Element), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(GridSplitter.ResizeDirection), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(GridSplitter.ResizeBehavior), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(GridSplitter.GripperForeground), new CategoryAttribute(Properties.Resources.CategoryBrush)); b.AddCustomAttributes(nameof(GridSplitter.ParentLevel), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(GridSplitter.GripperCursor), new CategoryAttribute(Properties.Resources.CategoryAppearance)); - b.AddCustomAttributes(nameof(GridSplitter.GripperCustomCursorResource), + b.AddCustomAttributes(nameof(GridSplitter.GripperCustomCursorResource), new CategoryAttribute(Properties.Resources.CategoryAppearance), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); b.AddCustomAttributes(nameof(GridSplitter.CursorBehavior), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs index a5c0a5dabed..ef9798998ac 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs @@ -2,26 +2,26 @@ // 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.ComponentModel; + 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 ImageExMetadata : AttributeTableBuilder - { + internal class ImageExMetadata : AttributeTableBuilder + { public ImageExMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.ImageEx), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.ImageEx), + b => + { b.AddCustomAttributes(nameof(ImageEx.NineGrid), new CategoryAttribute(Properties.Resources.CategoryAppearance)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs index ef9ac4f00c4..997b2e37832 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs @@ -2,26 +2,26 @@ // 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.ComponentModel; + 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 InAppNotificationMetadata : AttributeTableBuilder - { + internal class InAppNotificationMetadata : AttributeTableBuilder + { public InAppNotificationMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification), + b => + { b.AddCustomAttributes(nameof(InAppNotification.ShowDismissButton), new CategoryAttribute(Properties.Resources.CategoryAppearance)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs index c0a095ea8c3..b67a2bee98c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs @@ -2,27 +2,27 @@ // 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.ComponentModel; + 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 LayoutTransformControlMetadata : AttributeTableBuilder - { + internal class LayoutTransformControlMetadata : AttributeTableBuilder + { public LayoutTransformControlMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl), + b => + { b.AddCustomAttributes(nameof(LayoutTransformControl.Child), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(LayoutTransformControl.Transform), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs index a80ac27ef39..378f388345e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs @@ -2,26 +2,26 @@ // 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.ComponentModel; + 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 LoadingMetadata : AttributeTableBuilder - { + internal class LoadingMetadata : AttributeTableBuilder + { public LoadingMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Loading), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Loading), + b => + { b.AddCustomAttributes(nameof(Loading.IsLoading), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs index 3cd1219b76d..2c49a1df31e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs @@ -2,24 +2,24 @@ // 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.ComponentModel; + 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 MasterDetailsViewMetadata : AttributeTableBuilder - { + internal class MasterDetailsViewMetadata : AttributeTableBuilder + { public MasterDetailsViewMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.MasterDetailsView), - b => + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.MasterDetailsView), + b => { b.AddCustomAttributes(nameof(MasterDetailsView.SelectedItem), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(MasterDetailsView.DetailsTemplate), + b.AddCustomAttributes(nameof(MasterDetailsView.DetailsTemplate), new CategoryAttribute(Properties.Resources.CategoryAppearance), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); @@ -31,7 +31,7 @@ public MasterDetailsViewMetadata() ); b.AddCustomAttributes(nameof(MasterDetailsView.MasterPaneWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance)); b.AddCustomAttributes(nameof(MasterDetailsView.NoSelectionContent), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(MasterDetailsView.NoSelectionContentTemplate), + b.AddCustomAttributes(nameof(MasterDetailsView.NoSelectionContentTemplate), new CategoryAttribute(Properties.Resources.CategoryCommon), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); @@ -39,8 +39,8 @@ public MasterDetailsViewMetadata() b.AddCustomAttributes(nameof(MasterDetailsView.MasterCommandBar), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(MasterDetailsView.DetailsCommandBar), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs index 164c4fa7b70..580fd359ce2 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs @@ -2,35 +2,36 @@ // 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.ComponentModel; + 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 MenuMetadata : AttributeTableBuilder - { + internal class MenuMetadata : AttributeTableBuilder + { public MenuMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Menu), - b => - { - b.AddCustomAttributes(nameof(Menu.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 + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Menu), + b => + { + b.AddCustomAttributes(nameof(Menu.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)); - } - ); - } - } + new AlternateContentPropertyAttribute() + ); + b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs index 8a63b3992c1..2c8c3ca60be 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs @@ -2,32 +2,33 @@ // 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.ComponentModel; + 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 - { + internal class MenuItemMetadata : AttributeTableBuilder + { public MenuItemMetadata() - : base() - { - AddCallback(typeof(MenuItem), - b => - { - b.AddCustomAttributes(nameof(MenuItem.Header), - new PropertyOrderAttribute(PropertyOrder.Early), - new CategoryAttribute(Properties.Resources.CategoryCommon) - ); + : base() + { + AddCallback(typeof(MenuItem), + 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) + new CategoryAttribute(Properties.Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(MenuItem.Items), new PropertyOrderAttribute(PropertyOrder.Early), @@ -42,8 +43,8 @@ public MenuItemMetadata() b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); b.AddCustomAttributes(new ToolboxBrowsableAttribute(false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs index 5a6737e8612..8d091b08a5b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs @@ -2,21 +2,21 @@ // 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.ComponentModel; + 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 OrbitViewMetadata : AttributeTableBuilder - { + internal class OrbitViewMetadata : AttributeTableBuilder + { public OrbitViewMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.OrbitView), - b => + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.OrbitView), + b => { b.AddCustomAttributes(nameof(OrbitView.OrbitsEnabled), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(OrbitView.IsItemClickEnabled), new CategoryAttribute(Properties.Resources.CategoryCommon)); @@ -30,8 +30,8 @@ public OrbitViewMetadata() b.AddCustomAttributes(nameof(OrbitView.OrbitThickness), new CategoryAttribute(Properties.Resources.CategoryAppearance)); b.AddCustomAttributes(nameof(OrbitView.CenterContent), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs index 2c351d6ad09..36c82a9bc5b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs @@ -2,13 +2,13 @@ // 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.ComponentModel; + 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 { @@ -21,12 +21,12 @@ public override void InitializeDefaults(ModelItem item) } internal class RadialGaugeMetadata : AttributeTableBuilder - { + { public RadialGaugeMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge), - b => + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge), + b => { b.AddCustomAttributes(new FeatureAttribute(typeof(RadialGaugeDefaults))); b.AddCustomAttributes(nameof(RadialGauge.Minimum), new CategoryAttribute(Properties.Resources.CategoryCommon)); @@ -51,8 +51,8 @@ public RadialGaugeMetadata() b.AddCustomAttributes(nameof(RadialGauge.MinAngle), new CategoryAttribute(Properties.Resources.CategoryAppearance)); b.AddCustomAttributes(nameof(RadialGauge.MaxAngle), new CategoryAttribute(Properties.Resources.CategoryAppearance)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs index 304de2dee12..71dd303cb13 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs @@ -2,13 +2,13 @@ // 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.ComponentModel; + 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 { @@ -21,19 +21,19 @@ public override void InitializeDefaults(ModelItem item) } internal class RadialProgressBarMetadata : AttributeTableBuilder - { + { public RadialProgressBarMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RadialProgressBar), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RadialProgressBar), + b => + { b.AddCustomAttributes(new FeatureAttribute(typeof(RadialProgressBarDefaults))); b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Properties.Resources.CategoryAppearance)); b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Properties.Resources.CategoryBrush)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs index a5075081e7e..f2a6950ca23 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs @@ -2,29 +2,29 @@ // 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.ComponentModel; + 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 RangeSelectorMetadata : AttributeTableBuilder - { + internal class RangeSelectorMetadata : AttributeTableBuilder + { public RangeSelectorMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector), + b => + { b.AddCustomAttributes(nameof(RangeSelector.Minimum), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(RangeSelector.Maximum), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(RangeSelector.RangeMin), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(RangeSelector.RangeMax), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs index e2541054e6d..cf93b46d4f3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs @@ -2,34 +2,34 @@ // 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.ComponentModel; + 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 RotatorTileMetadata : AttributeTableBuilder - { + internal class RotatorTileMetadata : AttributeTableBuilder + { public RotatorTileMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile), + b => + { b.AddCustomAttributes(nameof(RotatorTile.ExtraRandomDuration), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(RotatorTile.RotationDelay), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(RotatorTile.ItemsSource), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(RotatorTile.ItemTemplate), + b.AddCustomAttributes(nameof(RotatorTile.ItemTemplate), new CategoryAttribute(Properties.Resources.CategoryAppearance), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); b.AddCustomAttributes(nameof(RotatorTile.RotateDirection), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(RotatorTile.CurrentItem), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs index dae0fdf1892..0af933fc86c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs @@ -2,26 +2,26 @@ // 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.ComponentModel; + 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 ScrollHeaderMetadata : AttributeTableBuilder - { + internal class ScrollHeaderMetadata : AttributeTableBuilder + { public ScrollHeaderMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader), + b => + { b.AddCustomAttributes(nameof(ScrollHeader.Mode), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs index 47b52f1dd14..8d4bdfd0f8e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs @@ -2,30 +2,30 @@ // 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.ComponentModel; + 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 TextToolbarMetadata : AttributeTableBuilder - { + { public TextToolbarMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar), + b => + { b.AddCustomAttributes(nameof(TextToolbar.Editor), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(TextToolbar.Formatter), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(TextToolbar.DefaultButtons), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(TextToolbar.CustomButtons), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(TextToolbar.ButtonModifications), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs index f62d889a9b9..395480555e8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs @@ -2,22 +2,22 @@ // 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.ComponentModel; + 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 TileControlMetadata : AttributeTableBuilder - { + internal class TileControlMetadata : AttributeTableBuilder + { public TileControlMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TileControl), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TileControl), + b => + { b.AddCustomAttributes(nameof(TileControl.ScrollViewerContainer), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(TileControl.ImageAlignment), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(TileControl.ImageSource), new CategoryAttribute(Properties.Resources.CategoryCommon)); @@ -30,8 +30,8 @@ public TileControlMetadata() b.AddCustomAttributes(nameof(TileControl.AnimationStepY), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(nameof(TileControl.AnimationDuration), new CategoryAttribute(Properties.Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs index b7906773178..a9550dabf17 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs @@ -2,25 +2,25 @@ // 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.ComponentModel; + 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 WrapPanelMetadata : AttributeTableBuilder - { + internal class WrapPanelMetadata : AttributeTableBuilder + { public WrapPanelMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel), - b => - { - b.AddCustomAttributes(nameof(WrapPanel.Orientation), - new CategoryAttribute(Properties.Resources.CategoryLayout) - ); + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel), + b => + { + b.AddCustomAttributes(nameof(WrapPanel.Orientation), + new CategoryAttribute(Properties.Resources.CategoryLayout) + ); b.AddCustomAttributes(nameof(WrapPanel.HorizontalSpacing), new CategoryAttribute(Properties.Resources.CategoryLayout) ); @@ -28,8 +28,8 @@ public WrapPanelMetadata() new CategoryAttribute(Properties.Resources.CategoryLayout) ); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs index d7834cc6843..7c863f07019 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs @@ -4,43 +4,44 @@ using System; using System.Reflection; -using Microsoft.Windows.Design.Metadata; + using Microsoft.Toolkit.Uwp.Design.Common; +using Microsoft.Windows.Design.Metadata; [assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))] namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { - public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeTable - { - public MetadataRegistration() : base() - { - // Note: - // The default constructor sets value of AssemblyFullName and - // XmlResourceName used by MetadataRegistrationBase.AddDescriptions(). - // The convention here is that the in .design.csproj - // (or Default namespace in Project -> Properties -> Application tab) - // must be the same as runtime assembly's main namespace (t.Namespace) - // plus .Design. + public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeTable + { + public MetadataRegistration() : base() + { + // Note: + // The default constructor sets value of AssemblyFullName and + // XmlResourceName used by MetadataRegistrationBase.AddDescriptions(). + // The convention here is that the in .design.csproj + // (or Default namespace in Project -> Properties -> Application tab) + // must be the same as runtime assembly's main namespace (t.Namespace) + // plus .Design. Type t = typeof(Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter); - AssemblyName an = t.Assembly.GetName(); - AssemblyFullName = ", " + an.FullName; - XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; - } + AssemblyName an = t.Assembly.GetName(); + AssemblyFullName = ", " + an.FullName; + XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; + } - #region IProvideAttributeTable Members + #region IProvideAttributeTable Members - /// - /// Gets the AttributeTable for design time metadata. - /// - public AttributeTable AttributeTable - { - get - { - return BuildAttributeTable(); - } - } + /// + /// Gets the AttributeTable for design time metadata. + /// + public AttributeTable AttributeTable + { + get + { + return BuildAttributeTable(); + } + } - #endregion - } + #endregion + } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs index c4763b5af16..bfa162fde30 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/AssemblyInfo.cs @@ -3,12 +3,9 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Windows; -// General Information about an assembly is controlled through the following +// 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)")] @@ -20,12 +17,12 @@ [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 +// 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 +//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 diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs index 6a6a3513b00..1c8d23271b7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs @@ -2,22 +2,22 @@ // 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.ComponentModel; + 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 MarkdownTextBlockMetadata : AttributeTableBuilder - { + internal class MarkdownTextBlockMetadata : AttributeTableBuilder + { public MarkdownTextBlockMetadata() - : base() - { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock), - b => - { + : base() + { + AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock), + b => + { b.AddCustomAttributes(nameof(MarkdownTextBlock.ImageStretch), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); b.AddCustomAttributes(nameof(MarkdownTextBlock.Text), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); b.AddCustomAttributes(nameof(MarkdownTextBlock.IsTextSelectionEnabled), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); @@ -62,8 +62,8 @@ public MarkdownTextBlockMetadata() b.AddCustomAttributes(nameof(MarkdownTextBlock.TableMargin), new CategoryAttribute(Properties.Resources.CategoryMarkdownTableStyle)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); - } - ); - } - } + } + ); + } + } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs index 5c0b0b2df70..56b252dbeb4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs @@ -4,43 +4,44 @@ using System; using System.Reflection; -using Microsoft.Windows.Design.Metadata; + using Microsoft.Toolkit.Uwp.Design.Common; +using Microsoft.Windows.Design.Metadata; [assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))] namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { - public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeTable - { - public MetadataRegistration() : base() - { - // Note: - // The default constructor sets value of AssemblyFullName and - // XmlResourceName used by MetadataRegistrationBase.AddDescriptions(). - // The convention here is that the in .design.csproj - // (or Default namespace in Project -> Properties -> Application tab) - // must be the same as runtime assembly's main namespace (t.Namespace) - // plus .Design. + public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeTable + { + public MetadataRegistration() : base() + { + // Note: + // The default constructor sets value of AssemblyFullName and + // XmlResourceName used by MetadataRegistrationBase.AddDescriptions(). + // The convention here is that the in .design.csproj + // (or Default namespace in Project -> Properties -> Application tab) + // must be the same as runtime assembly's main namespace (t.Namespace) + // plus .Design. Type t = typeof(Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock); - AssemblyName an = t.Assembly.GetName(); - AssemblyFullName = ", " + an.FullName; - XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; - } + AssemblyName an = t.Assembly.GetName(); + AssemblyFullName = ", " + an.FullName; + XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; + } - #region IProvideAttributeTable Members + #region IProvideAttributeTable Members - /// - /// Gets the AttributeTable for design time metadata. - /// - public AttributeTable AttributeTable - { - get - { - return BuildAttributeTable(); - } - } + /// + /// Gets the AttributeTable for design time metadata. + /// + public AttributeTable AttributeTable + { + get + { + return BuildAttributeTable(); + } + } - #endregion - } + #endregion + } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs index 06b96fdf78d..7adc149cd6d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs @@ -3,16 +3,13 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Windows; -// General Information about an assembly is controlled through the following +// 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: AssemblyTitle("Windows Community Toolkit Controls Markdown (Design)")] +[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Markdown Controls")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("Windows Community Toolkit")] @@ -20,14 +17,14 @@ [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 +// 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 +//In order to begin building localizable applications, set //CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english +//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. From ccaf0ec547ab384221b374de0c1eb7d687b73225 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 30 May 2020 20:16:44 +0530 Subject: [PATCH 4/8] =?UTF-8?q?Consolidate=20Build=20logic=20=E2=80=94=20D?= =?UTF-8?q?esign=20projects=20only?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename Platform version to revision — after all that's what it is! Introduce PlatformBaseVersion to hold '10.0' Move UWP specific logic to its own targets --- Directory.Build.props | 7 ++--- Directory.Build.targets | 26 +++++-------------- ...kit.Uwp.UI.Controls.DataGrid.Design.csproj | 16 +++++------- ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 18 +++++-------- ...kit.Uwp.UI.Controls.Markdown.Design.csproj | 17 +++++------- SmokeTests/SmokeTest.csproj | 4 +-- build/Find-WindowsSDKVersions.ps1 | 6 ++--- build/Windows.Toolkit.Uwp.Build.targets | 19 ++++++++++++++ 8 files changed, 54 insertions(+), 59 deletions(-) create mode 100644 build/Windows.Toolkit.Uwp.Build.targets diff --git a/Directory.Build.props b/Directory.Build.props index d43a2ceffc3..54b7668bb20 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,8 +14,9 @@ $(MSBuildProjectName.Contains('Test')) $(MSBuildProjectName.Contains('Uwp')) $(MSBuildProjectName.Contains('Sample')) - 19041 - 17763 + 10.0 + 19041 + 17763 $(MSBuildThisFileDirectory)bin\nupkg @@ -88,7 +89,6 @@ - $(NoWarn);8002 @@ -103,4 +103,5 @@ stylecop.json + \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets index 111afac2e44..ab132c6cf4c 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,26 +1,11 @@ - - - - - 10.0.$(DefaultTargetPlatformVersion).0 - 10.0.$(DefaultTargetPlatformMinVersion).0 - - - Portable - + + true + - - - Windows Desktop Extensions for the UWP - - - - - - + true $(MSBuildThisFileDirectory)toolkit.snk @@ -28,6 +13,8 @@ + + @@ -36,4 +23,5 @@ + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj index d16ff88b646..44ed7c07980 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj @@ -9,20 +9,17 @@ Properties Microsoft.Toolkit.Uwp.UI.Controls.Design Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design - v4.7.2 512 - - $(AssetTargetFallback);uap10.0.17763 - - 8.1 + v4.7.2 + false true ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\uap10.0.17763\Design\ full false - DEBUG;TRACE + TRACE;DEBUG x86 @@ -33,7 +30,7 @@ TRACE - false + $(AssetTargetFallback);uap10.0.17763 @@ -110,7 +107,6 @@ - - - + + \ No newline at end of file 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 d6a71dcacbc..4b1c3e4fd35 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 @@ -9,21 +9,17 @@ Properties Microsoft.Toolkit.Uwp.UI.Controls.Design Microsoft.Toolkit.Uwp.UI.Controls.Design - v4.7.2 512 - - $(NoWarn);0618 - $(AssetTargetFallback);uap10.0.17763 - - 8.1 + v4.7.2 + false true ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\uap10.0.17763\Design\ full false - DEBUG;TRACE + TRACE;DEBUG x86 @@ -34,7 +30,8 @@ TRACE - false + $(NoWarn);0618 + $(AssetTargetFallback);uap10.0.17763 @@ -137,7 +134,6 @@ - - - + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj index 8f8c9f4261f..769f8f7cedc 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj @@ -9,21 +9,17 @@ Properties Microsoft.Toolkit.Uwp.UI.Controls.Design Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design - v4.7.2 512 - - $(NoWarn);0618 - $(AssetTargetFallback);uap10.0.17763 - - 8.1 + v4.7.2 + false true ..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Debug\uap10.0.17763\Design\ full false - DEBUG;TRACE + TRACE;DEBUG x86 @@ -34,7 +30,7 @@ TRACE - false + $(AssetTargetFallback);uap10.0.17763 @@ -111,7 +107,6 @@ - - - + + \ No newline at end of file diff --git a/SmokeTests/SmokeTest.csproj b/SmokeTests/SmokeTest.csproj index bbcfbdd57ab..1f4c5855eed 100644 --- a/SmokeTests/SmokeTest.csproj +++ b/SmokeTests/SmokeTest.csproj @@ -17,8 +17,8 @@ SmokeTest.$(CurrentProject) en-US UAP - 10.0.$(DefaultTargetPlatformVersion).0 - 10.0.$(DefaultTargetPlatformMinVersion).0 + 10.0.$(TargetPlatformRevision).0 + 10.0.$(TargetPlatformMinRevision).0 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} diff --git a/build/Find-WindowsSDKVersions.ps1 b/build/Find-WindowsSDKVersions.ps1 index b743dac342c..ebb8ab5eeb1 100644 --- a/build/Find-WindowsSDKVersions.ps1 +++ b/build/Find-WindowsSDKVersions.ps1 @@ -57,13 +57,13 @@ function Get-SdkVersion $versions.Add($version) | Out-Null # Versions may also be specified without the 10.0.xxxxx.0 format in the - # PropertyGroup/DefaultTargetPlatformVersion and PropertyGroup/DefaultTargetPlatformMinVersion + # PropertyGroup/TargetPlatformRevision and PropertyGroup/TargetPlatformMinRevision # If you want a complete set of SDKs that are required, uncomment the following - # $version = Get-NodeValue $xml 'PropertyGroup/DefaultTargetPlatformMinVersion' + # $version = Get-NodeValue $xml 'PropertyGroup/TargetPlatformMinRevision' # $versions.Add("10.0." + $version + ".0") | Out-Null - $version = Get-NodeValue $xml 'PropertyGroup/DefaultTargetPlatformVersion' + $version = Get-NodeValue $xml 'PropertyGroup/TargetPlatformRevision' $versions.Add("10.0." + $version + ".0") | Out-Null } diff --git a/build/Windows.Toolkit.Uwp.Build.targets b/build/Windows.Toolkit.Uwp.Build.targets new file mode 100644 index 00000000000..96eb9df1922 --- /dev/null +++ b/build/Windows.Toolkit.Uwp.Build.targets @@ -0,0 +1,19 @@ + + + + + $(TargetPlatformBaseVersion).$(TargetPlatformRevision).0 + $(TargetPlatformBaseVersion).$(TargetPlatformMinRevision).0 + Portable + + + + + Windows Desktop Extensions for the UWP + + + Windows Mobile Extensions for the UWP + + + + \ No newline at end of file From fbeecf7cc616ca5516ab6f86acf23145f18b2b09 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 30 May 2020 20:26:19 +0530 Subject: [PATCH 5/8] Support both process and surface isolated designers From 16.4 Visual Studio enables surface isolated designer for XAML projects. Isolate common code and implement shims to make it work with both designers. --- .../Controls/DataGrid.Metadata.cs | 143 +++++++++--------- .../MetadataRegistration.cs | 30 ++-- ...kit.Uwp.UI.Controls.DataGrid.Design.csproj | 1 + .../Common/MetadataRegistrationBase.cs | 126 +++++++-------- .../Common/PlatformTypes.cs | 46 +++--- .../Common/ToolboxCategoryPaths.cs | 3 +- .../Controls/AdaptiveGridView.Metadata.cs | 15 +- .../Controls/BladeItem.Metadata.cs | 15 +- .../Controls/BladeView.Metadata.cs | 13 +- .../Controls/Carousel.Metadata.cs | 29 ++-- .../Controls/DropShadowPanel.Metadata.cs | 17 ++- .../Controls/Expander.Metadata.cs | 15 +- .../Controls/GridSplitter.Metadata.cs | 23 +-- .../Controls/ImageEx.Metadata.cs | 9 +- .../Controls/InAppNotification.Metadata.cs | 9 +- .../LayoutTransitionControl.Metadata.cs | 11 +- .../Controls/Loading.Metadata.cs | 9 +- .../Controls/MasterDetailsView.Metadata.cs | 29 ++-- .../Controls/Menu.Metadata.cs | 9 +- .../Controls/MenuItem.Metadata.cs | 13 +- .../Controls/OrbitView.Metadata.cs | 29 ++-- .../Controls/RadialGauge.Metadata.cs | 5 +- .../Controls/RadialProgressBar.Metadata.cs | 5 +- .../Controls/RangeSelector.Metadata.cs | 15 +- .../Controls/RotatorTile.Metadata.cs | 19 ++- .../Controls/ScrollHeader.Metadata.cs | 9 +- .../Controls/TextToolbar.Metadata.cs | 17 ++- .../Controls/TileControl.Metadata.cs | 29 ++-- .../Controls/WrapPanel.Metadata.cs | 13 +- .../MetadataRegistration.cs | 30 ++-- ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 1 + .../Controls/MarkdownTextBlock.Metadata.cs | 75 ++++----- .../MetadataRegistration.cs | 30 ++-- ...kit.Uwp.UI.Controls.Markdown.Design.csproj | 1 + 34 files changed, 441 insertions(+), 402 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs index ceaa515280f..36166b96f92 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs @@ -3,22 +3,25 @@ // See the LICENSE file in the project root for more information. using System.ComponentModel; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; -//using Microsoft.Windows.Design.Features; +using Microsoft.Windows.Design.Features; using Microsoft.Windows.Design.Metadata; -//using Microsoft.Windows.Design.Model; +using Microsoft.Windows.Design.Model; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { - //internal class DataGridDefaults : DefaultInitializer - //{ - // public override void InitializeDefaults(ModelItem item) - // { - // item.Properties[nameof(DataGrid.MyProperty)].SetValue(); - // } - //} + internal class DataGridDefaults : DefaultInitializer + { + public override void InitializeDefaults(ModelItem item) + { + item.Properties[nameof(DataGrid.Height)].SetValue(50); + item.Properties[nameof(DataGrid.Width)].SetValue(100); + } + } internal class DataGridMetadata : AttributeTableBuilder { @@ -27,92 +30,92 @@ public DataGridMetadata() : base() AddCallback(typeof(DataGrid), b => { - //b.AddCustomAttributes(new FeatureAttribute(typeof(DataGridDefaults))); - b.AddCustomAttributes(nameof(DataGrid.AlternatingRowBackground), new CategoryAttribute(Properties.Resources.CategoryRows)); - b.AddCustomAttributes(nameof(DataGrid.AreRowDetailsFrozen), new CategoryAttribute(Properties.Resources.CategoryRows)); - b.AddCustomAttributes(nameof(DataGrid.AreRowGroupHeadersFrozen), new CategoryAttribute(Properties.Resources.CategoryHeaders)); - b.AddCustomAttributes(nameof(DataGrid.AutoGenerateColumns), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.CanUserReorderColumns), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.CanUserResizeColumns), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.CanUserSortColumns), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.CellStyle), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.ClipboardCopyMode), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGrid.ColumnHeaderHeight), new CategoryAttribute(Properties.Resources.CategoryHeaders)); - b.AddCustomAttributes(nameof(DataGrid.ColumnHeaderStyle), new CategoryAttribute(Properties.Resources.CategoryHeaders)); - b.AddCustomAttributes(nameof(DataGrid.Columns), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.ColumnWidth), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.CurrentColumn), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGrid.DragIndicatorStyle), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGrid.DropLocationIndicatorStyle), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGrid.FrozenColumnCount), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.GridLinesVisibility), new CategoryAttribute(Properties.Resources.CategoryGridLines)); - b.AddCustomAttributes(nameof(DataGrid.HeadersVisibility), new CategoryAttribute(Properties.Resources.CategoryHeaders)); - b.AddCustomAttributes(nameof(DataGrid.HorizontalGridLinesBrush), new CategoryAttribute(Properties.Resources.CategoryGridLines)); - b.AddCustomAttributes(nameof(DataGrid.HorizontalScrollBarVisibility), new CategoryAttribute(Properties.Resources.CategoryLayout)); - b.AddCustomAttributes(nameof(DataGrid.IsReadOnly), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGrid.IsValid), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGrid.ItemsSource), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.MaxColumnWidth), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.MinColumnWidth), new CategoryAttribute(Properties.Resources.CategoryColumns)); - b.AddCustomAttributes(nameof(DataGrid.RowBackground), new CategoryAttribute(Properties.Resources.CategoryRows)); - b.AddCustomAttributes(nameof(DataGrid.RowDetailsTemplate), new CategoryAttribute(Properties.Resources.CategoryRows)); - b.AddCustomAttributes(nameof(DataGrid.RowDetailsVisibilityMode), new CategoryAttribute(Properties.Resources.CategoryRows)); - b.AddCustomAttributes(nameof(DataGrid.RowGroupHeaderPropertyNameAlternative), new CategoryAttribute(Properties.Resources.CategoryHeaders)); - b.AddCustomAttributes(nameof(DataGrid.RowGroupHeaderStyles), new CategoryAttribute(Properties.Resources.CategoryHeaders)); - b.AddCustomAttributes(nameof(DataGrid.RowHeaderStyle), new CategoryAttribute(Properties.Resources.CategoryHeaders)); - b.AddCustomAttributes(nameof(DataGrid.RowHeaderWidth), new CategoryAttribute(Properties.Resources.CategoryHeaders)); - b.AddCustomAttributes(nameof(DataGrid.RowHeight), new CategoryAttribute(Properties.Resources.CategoryRows)); - b.AddCustomAttributes(nameof(DataGrid.RowStyle), new CategoryAttribute(Properties.Resources.CategoryRows)); - b.AddCustomAttributes(nameof(DataGrid.SelectedIndex), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(DataGrid.SelectedItem), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(DataGrid.SelectedItems), new CategoryAttribute(Properties.Resources.CategoryAppearance)); - b.AddCustomAttributes(nameof(DataGrid.SelectionMode), new CategoryAttribute(Properties.Resources.CategoryRows)); - b.AddCustomAttributes(nameof(DataGrid.VerticalGridLinesBrush), new CategoryAttribute(Properties.Resources.CategoryGridLines)); - b.AddCustomAttributes(nameof(DataGrid.VerticalScrollBarVisibility), new CategoryAttribute(Properties.Resources.CategoryLayout)); + b.AddCustomAttributes(new FeatureAttribute(typeof(DataGridDefaults))); + b.AddCustomAttributes(nameof(DataGrid.AlternatingRowBackground), new CategoryAttribute(Resources.CategoryRows)); + b.AddCustomAttributes(nameof(DataGrid.AreRowDetailsFrozen), new CategoryAttribute(Resources.CategoryRows)); + b.AddCustomAttributes(nameof(DataGrid.AreRowGroupHeadersFrozen), new CategoryAttribute(Resources.CategoryHeaders)); + b.AddCustomAttributes(nameof(DataGrid.AutoGenerateColumns), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.CanUserReorderColumns), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.CanUserResizeColumns), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.CanUserSortColumns), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.CellStyle), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.ClipboardCopyMode), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGrid.ColumnHeaderHeight), new CategoryAttribute(Resources.CategoryHeaders)); + b.AddCustomAttributes(nameof(DataGrid.ColumnHeaderStyle), new CategoryAttribute(Resources.CategoryHeaders)); + b.AddCustomAttributes(nameof(DataGrid.Columns), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.ColumnWidth), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.CurrentColumn), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGrid.DragIndicatorStyle), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGrid.DropLocationIndicatorStyle), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGrid.FrozenColumnCount), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.GridLinesVisibility), new CategoryAttribute(Resources.CategoryGridLines)); + b.AddCustomAttributes(nameof(DataGrid.HeadersVisibility), new CategoryAttribute(Resources.CategoryHeaders)); + b.AddCustomAttributes(nameof(DataGrid.HorizontalGridLinesBrush), new CategoryAttribute(Resources.CategoryGridLines)); + b.AddCustomAttributes(nameof(DataGrid.HorizontalScrollBarVisibility), new CategoryAttribute(Resources.CategoryLayout)); + b.AddCustomAttributes(nameof(DataGrid.IsReadOnly), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGrid.IsValid), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGrid.ItemsSource), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.MaxColumnWidth), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.MinColumnWidth), new CategoryAttribute(Resources.CategoryColumns)); + b.AddCustomAttributes(nameof(DataGrid.RowBackground), new CategoryAttribute(Resources.CategoryRows)); + b.AddCustomAttributes(nameof(DataGrid.RowDetailsTemplate), new CategoryAttribute(Resources.CategoryRows)); + b.AddCustomAttributes(nameof(DataGrid.RowDetailsVisibilityMode), new CategoryAttribute(Resources.CategoryRows)); + b.AddCustomAttributes(nameof(DataGrid.RowGroupHeaderPropertyNameAlternative), new CategoryAttribute(Resources.CategoryHeaders)); + b.AddCustomAttributes(nameof(DataGrid.RowGroupHeaderStyles), new CategoryAttribute(Resources.CategoryHeaders)); + b.AddCustomAttributes(nameof(DataGrid.RowHeaderStyle), new CategoryAttribute(Resources.CategoryHeaders)); + b.AddCustomAttributes(nameof(DataGrid.RowHeaderWidth), new CategoryAttribute(Resources.CategoryHeaders)); + b.AddCustomAttributes(nameof(DataGrid.RowHeight), new CategoryAttribute(Resources.CategoryRows)); + b.AddCustomAttributes(nameof(DataGrid.RowStyle), new CategoryAttribute(Resources.CategoryRows)); + b.AddCustomAttributes(nameof(DataGrid.SelectedIndex), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(DataGrid.SelectedItem), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(DataGrid.SelectedItems), new CategoryAttribute(Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(DataGrid.SelectionMode), new CategoryAttribute(Resources.CategoryRows)); + b.AddCustomAttributes(nameof(DataGrid.VerticalGridLinesBrush), new CategoryAttribute(Resources.CategoryGridLines)); + b.AddCustomAttributes(nameof(DataGrid.VerticalScrollBarVisibility), new CategoryAttribute(Resources.CategoryLayout)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); }); AddCallback(typeof(DataGridColumn), b => { - b.AddCustomAttributes(nameof(DataGridColumn.CanUserResize), new CategoryAttribute(Properties.Resources.CategoryLayout)); - b.AddCustomAttributes(nameof(DataGridColumn.CanUserSort), new CategoryAttribute(Properties.Resources.CategorySort)); - b.AddCustomAttributes(nameof(DataGridColumn.Header), new CategoryAttribute(Properties.Resources.CategoryHeader)); - b.AddCustomAttributes(nameof(DataGridColumn.HeaderStyle), new CategoryAttribute(Properties.Resources.CategoryHeader)); - b.AddCustomAttributes(nameof(DataGridColumn.MaxWidth), new CategoryAttribute(Properties.Resources.CategoryLayout)); - b.AddCustomAttributes(nameof(DataGridColumn.MinWidth), new CategoryAttribute(Properties.Resources.CategoryLayout)); - b.AddCustomAttributes(nameof(DataGridColumn.SortDirection), new CategoryAttribute(Properties.Resources.CategorySort)); - b.AddCustomAttributes(nameof(DataGridColumn.Visibility), new CategoryAttribute(Properties.Resources.CategoryAppearance)); - b.AddCustomAttributes(nameof(DataGridColumn.Width), new CategoryAttribute(Properties.Resources.CategoryLayout)); + b.AddCustomAttributes(nameof(DataGridColumn.CanUserResize), new CategoryAttribute(Resources.CategoryLayout)); + b.AddCustomAttributes(nameof(DataGridColumn.CanUserSort), new CategoryAttribute(Resources.CategorySort)); + b.AddCustomAttributes(nameof(DataGridColumn.Header), new CategoryAttribute(Resources.CategoryHeader)); + b.AddCustomAttributes(nameof(DataGridColumn.HeaderStyle), new CategoryAttribute(Resources.CategoryHeader)); + b.AddCustomAttributes(nameof(DataGridColumn.MaxWidth), new CategoryAttribute(Resources.CategoryLayout)); + b.AddCustomAttributes(nameof(DataGridColumn.MinWidth), new CategoryAttribute(Resources.CategoryLayout)); + b.AddCustomAttributes(nameof(DataGridColumn.SortDirection), new CategoryAttribute(Resources.CategorySort)); + b.AddCustomAttributes(nameof(DataGridColumn.Visibility), new CategoryAttribute(Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(DataGridColumn.Width), new CategoryAttribute(Resources.CategoryLayout)); }); AddCallback(typeof(DataGridBoundColumn), b => { - b.AddCustomAttributes(nameof(DataGridBoundColumn.Binding), new CategoryAttribute(Properties.Resources.CategoryCellBinding)); + b.AddCustomAttributes(nameof(DataGridBoundColumn.Binding), new CategoryAttribute(Resources.CategoryCellBinding)); }); AddCallback(typeof(DataGridTextColumn), b => { - b.AddCustomAttributes(nameof(DataGridTextColumn.FontFamily), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGridTextColumn.FontSize), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGridTextColumn.FontStyle), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGridTextColumn.FontWeight), new CategoryAttribute(Properties.Resources.CategoryText)); - b.AddCustomAttributes(nameof(DataGridTextColumn.Foreground), new CategoryAttribute(Properties.Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGridTextColumn.FontFamily), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGridTextColumn.FontSize), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGridTextColumn.FontStyle), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGridTextColumn.FontWeight), new CategoryAttribute(Resources.CategoryText)); + b.AddCustomAttributes(nameof(DataGridTextColumn.Foreground), new CategoryAttribute(Resources.CategoryText)); }); AddCallback(typeof(DataGridCheckBoxColumn), b => { - b.AddCustomAttributes(nameof(DataGridCheckBoxColumn.IsThreeState), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(DataGridCheckBoxColumn.IsThreeState), new CategoryAttribute(Resources.CategoryCommon)); }); AddCallback(typeof(DataGridTemplateColumn), b => { - b.AddCustomAttributes(nameof(DataGridTemplateColumn.CellEditingTemplate), new CategoryAttribute(Properties.Resources.CategoryCellTemplate)); - b.AddCustomAttributes(nameof(DataGridTemplateColumn.CellTemplate), new CategoryAttribute(Properties.Resources.CategoryCellTemplate)); + b.AddCustomAttributes(nameof(DataGridTemplateColumn.CellEditingTemplate), new CategoryAttribute(Resources.CategoryCellTemplate)); + b.AddCustomAttributes(nameof(DataGridTemplateColumn.CellTemplate), new CategoryAttribute(Resources.CategoryCellTemplate)); }); } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs index 10cf2dcd234..e173892976c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs @@ -4,15 +4,18 @@ using System; using System.Reflection; - using Microsoft.Toolkit.Uwp.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design.Metadata; +#endif -[assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))] +[assembly: ProvideMetadata(typeof(MetadataRegistration))] namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { - public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeTable + public class MetadataRegistration : MetadataRegistrationBase { public MetadataRegistration() : base() { @@ -23,25 +26,12 @@ public MetadataRegistration() : base() // (or Default namespace in Project -> Properties -> Application tab) // must be the same as runtime assembly's main namespace (t.Namespace) // plus .Design. - Type t = typeof(Microsoft.Toolkit.Uwp.UI.Controls.DataGrid); +#if VS_DESIGNER_PROCESS_ISOLATION + Type t = typeof(DataGrid); AssemblyName an = t.Assembly.GetName(); - AssemblyFullName = ", " + an.FullName; + AssemblyFullName = an.FullName; XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; +#endif } - - #region IProvideAttributeTable Members - - /// - /// Gets the AttributeTable for design time metadata. - /// - public AttributeTable AttributeTable - { - get - { - return BuildAttributeTable(); - } - } - - #endregion } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj index 44ed7c07980..f6132ee4d4e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj @@ -31,6 +31,7 @@ $(AssetTargetFallback);uap10.0.17763 + $(DefineConstants);VS_DESIGNER_PROCESS_ISOLATION diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs index 2d2b5b20521..bab3988e108 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs @@ -7,16 +7,20 @@ using System.ComponentModel; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; -using System.IO; using System.Linq; using System.Reflection; using System.Xml.Linq; +using Microsoft.Toolkit.Uwp.Design.Types; + +#if VS_DESIGNER_PROCESS_ISOLATION +using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.Design.Common { - public class MetadataRegistrationBase + public abstract class MetadataRegistrationBase : IProvideAttributeTable { private AttributeTable masterMetadataTable; @@ -28,15 +32,25 @@ internal MetadataRegistrationBase() { } /// Custom attribute table. protected virtual AttributeTable BuildAttributeTable() { - AttributeTableBuilder builder = new AttributeTableBuilder(); + var builder = new AttributeTableBuilder(); AddDescriptions(builder); AddAttributes(builder); AddTables(builder, this); + masterMetadataTable = builder.CreateTable(); return masterMetadataTable; } + #region IProvideAttributeTable Members + + /// + /// Gets the AttributeTable for design time metadata. + /// + public AttributeTable AttributeTable => BuildAttributeTable(); + + #endregion + /// /// Find all AttributeTableBuilder subclasses in the assembly /// and add their attributes to the assembly attribute table. @@ -54,7 +68,7 @@ private void AddTables(AttributeTableBuilder builder, object parent) { try { - AttributeTableBuilder atb = (AttributeTableBuilder)Activator.CreateInstance(t); + var atb = (AttributeTableBuilder)Activator.CreateInstance(t); builder.AddTable(atb.CreateTable()); } catch (Exception) @@ -76,7 +90,7 @@ private void AddTables(AttributeTableBuilder builder, object parent) protected string AssemblyFullName { get; set; } /// - /// Create description attribute from run time assembly xml file. + /// Create description attribute from run time assembly XML file. /// /// The assembly attribute table builder. [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Design time dll should not fail.")] @@ -84,36 +98,36 @@ private void AddDescriptions(AttributeTableBuilder builder) { Debug.Assert(builder != null, "AddDescriptions is called with null parameter!"); - if (string.IsNullOrEmpty(XmlResourceName) || - string.IsNullOrEmpty(AssemblyFullName)) - { - return; - } - XDocument xdoc = null; + if (string.IsNullOrEmpty(XmlResourceName) || string.IsNullOrEmpty(AssemblyFullName)) return; + + XDocument xDoc; try { - xdoc = XDocument.Load(new StreamReader( - Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName))); + xDoc = XDocument.Load(Assembly.GetExecutingAssembly().GetManifestResourceStream(XmlResourceName)); } - catch { return; } - if (xdoc == null) + catch { return; } - foreach (XElement member in xdoc.Descendants("member")) + if (xDoc == null) return; + + foreach (XElement member in xDoc.Descendants("member")) { try { string name = (string)member.Attribute("name"); - if (name == null) - continue; + + if (name == null) continue; + bool isType = name.StartsWith("T:", StringComparison.OrdinalIgnoreCase); - if (isType || - name.StartsWith("P:", StringComparison.OrdinalIgnoreCase)) + bool isProperty = name.StartsWith("P:", StringComparison.OrdinalIgnoreCase); + + if (isType || isProperty) { int lastDot = name.Length; string typeName; + if (isType) { typeName = name.Substring(2); // skip leading "T:" @@ -123,86 +137,74 @@ private void AddDescriptions(AttributeTableBuilder builder) lastDot = name.LastIndexOf('.'); typeName = name.Substring(2, lastDot - 2); } - typeName += AssemblyFullName; - Type t = Type.GetType(typeName); - if (t != null && t.IsPublic && t.IsClass && - t.IsSubclassOf(Types.PlatformTypes.DependencyObjectType)) + var type = Type.GetType(typeName + ", " + AssemblyFullName); + + if (type != null && type.IsPublic && type.IsClass && type.IsSubclassOf(PlatformTypes.DependencyObject)) { string desc = ParseDescription(member); - if (desc == null) - continue; - desc = desc.Trim(); - desc = string.Join(" ", desc.Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)); + if (desc == null) continue; + + desc = string.Join(" ", desc.Trim().Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)); + if (isType) { - bool isBrowsable = true; - try + if (IsBrowsable(type)) { - isBrowsable = IsBrowsable(t); + builder.AddCustomAttributes(type, new DescriptionAttribute(desc)); } - catch { isBrowsable = false; } - if (isBrowsable) - builder.AddCallback(t, b => b.AddCustomAttributes(new DescriptionAttribute(desc))); else //Hide from intellisense { - builder.AddCallback(t, b => b.AddCustomAttributes( + builder.AddCustomAttributes(type, new BrowsableAttribute(false), - new Microsoft.Windows.Design.ToolboxBrowsableAttribute(false), - new ToolboxItemAttribute(false))); + new ToolboxBrowsableAttribute(false), + new ToolboxItemAttribute(false)); } } else { - string propName = name.Substring(lastDot + 1); - PropertyInfo pi = t.GetProperty(propName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); + var propertyName = name.Substring(lastDot + 1); + PropertyInfo pi = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); if (pi != null) { - bool isBrowsable = true; - try + if (IsBrowsable(type)) { - isBrowsable = IsBrowsable(pi); + builder.AddCustomAttributes(type, propertyName, new DescriptionAttribute(desc)); } - catch { isBrowsable = false; } - if (isBrowsable) - builder.AddCallback(t, b => b.AddCustomAttributes(propName, new DescriptionAttribute(desc))); else //Hide from intellisense - builder.AddCallback(t, b => b.AddCustomAttributes(new BrowsableAttribute(false))); + { + builder.AddCustomAttributes(type, new BrowsableAttribute(false)); + } } } } } } - catch (Exception) + catch { } } } - private static bool IsBrowsable(Type t) + + private static bool IsBrowsable(MemberInfo typeOrMember) { - var attrs = t.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false); - foreach (var attr in attrs) + EditorBrowsableAttribute attribute; + try { - return Types.PlatformTypes.IsBrowsable(attr); + attribute = typeOrMember.GetCustomAttribute(false); } - return true; - } - - private static bool IsBrowsable(System.Reflection.PropertyInfo pi) - { - var attrs = pi.GetCustomAttributes(Types.PlatformTypes.EditorBrowsableAttributeType, false); - foreach (var attr in attrs) + catch { - return Types.PlatformTypes.IsBrowsable(attr); + return true; // If there is no [EditorBrowsable] attribute present, we'll show it by default. } - return true; + return attribute.State != EditorBrowsableState.Never; } /// - /// Create description string from xml doc summary tag. + /// Create description string from XML doc summary tag. /// - /// A single node of the xml doc. + /// A single node of the XML doc. /// Description string. private static string ParseDescription(XElement member) { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs index ff18230b5fb..19049b77f7f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs @@ -3,41 +3,25 @@ // See the LICENSE file in the project root for more information. using System; +using Windows.UI.Xaml; +using Windows.UI.Xaml.Controls; +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design.Metadata; - -using Windows.UI.Xaml; +#endif namespace Microsoft.Toolkit.Uwp.Design.Types { internal class PlatformTypes { - public static readonly Type DependencyObjectType = typeof(DependencyObject); - public static readonly Type UIElementType = typeof(UIElement); - public static readonly Type FrameworkElementType = typeof(FrameworkElement); - public static readonly Type EditorBrowsableAttributeType = typeof(System.ComponentModel.EditorBrowsableAttribute); - - /// - /// Used by MetadataRegistrationBase to get the browsable state - /// - /// This parameter must be of type 'System.ComponentModel.EditorBrowsableAttribute' - /// - public static bool IsBrowsable(object editorBrowsableAttribute) - { - if (editorBrowsableAttribute is System.ComponentModel.EditorBrowsableAttribute) - return (editorBrowsableAttribute as System.ComponentModel.EditorBrowsableAttribute).State != - System.ComponentModel.EditorBrowsableState.Never; - return true; - } - - public static class Control - { - public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control"); - public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background"); - public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush"); - public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness"); - } + public static readonly Type DependencyObject = typeof(DependencyObject); + public static readonly Type UIElement = typeof(UIElement); + public static readonly Type FrameworkElement = typeof(FrameworkElement); + public static readonly Type Control = typeof(Control); + } + internal class XamlTypes + { public static class FrameworkElement { public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "FrameworkElement"); @@ -47,5 +31,13 @@ public static class FrameworkElement public static readonly PropertyIdentifier HeightProperty = new PropertyIdentifier(TypeId, "Height"); public static readonly PropertyIdentifier WidthProperty = new PropertyIdentifier(TypeId, "Width"); } + + public static class Control + { + public static readonly TypeIdentifier TypeId = new TypeIdentifier("http://schemas.microsoft.com/winfx/2006/xaml/presentation", "Control"); + public static readonly PropertyIdentifier BackgroundProperty = new PropertyIdentifier(TypeId, "Background"); + public static readonly PropertyIdentifier BorderBrushProperty = new PropertyIdentifier(TypeId, "BorderBrush"); + public static readonly PropertyIdentifier BorderThicknessProperty = new PropertyIdentifier(TypeId, "BorderThickness"); + } } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs index f2abb1c3927..2e997b06ee6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs @@ -2,11 +2,12 @@ // 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; using System.Diagnostics.CodeAnalysis; [assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")] -namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Common +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { /// /// Names for ToolboxCategoryAttribute. diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs index 1ffc752f3c0..fda2d18a745 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -19,20 +22,20 @@ public CustomDialogMetadata() b => { b.AddCustomAttributes(nameof(AdaptiveGridView.DesiredWidth), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(AdaptiveGridView.ItemHeight), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(AdaptiveGridView.OneRowModeEnabled), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(AdaptiveGridView.StretchContentForSingleRow), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(AdaptiveGridView.ItemClickCommand), new EditorBrowsableAttribute(EditorBrowsableState.Advanced), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs index 7695033de50..5e1982baccc 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -20,19 +23,19 @@ public BladeItemMetadata() b => { b.AddCustomAttributes(nameof(BladeItem.TitleBarVisibility), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(BladeItem.IsOpen), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(BladeItem.TitleBarBackground), - new CategoryAttribute(Properties.Resources.CategoryBrush) + new CategoryAttribute(Resources.CategoryBrush) ); b.AddCustomAttributes(nameof(BladeItem.CloseButtonBackground), - new CategoryAttribute(Properties.Resources.CategoryBrush) + new CategoryAttribute(Resources.CategoryBrush) ); b.AddCustomAttributes(nameof(BladeItem.CloseButtonForeground), - new CategoryAttribute(Properties.Resources.CategoryBrush) + new CategoryAttribute(Resources.CategoryBrush) ); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs index 5b7e0fc4b8b..73b1916b177 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs @@ -4,10 +4,13 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.PropertyEditing; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -21,17 +24,17 @@ public BladeViewMetadata() b => { b.AddCustomAttributes(nameof(BladeView.ActiveBlades), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(BladeView.BladeMode), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(BladeView.AutoCollapseCountThreshold), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(BladeView.Items), new PropertyOrderAttribute(PropertyOrder.Early), - new CategoryAttribute(Properties.Resources.CategoryCommon), + new CategoryAttribute(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[] { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs index 0f2af7517c2..0cd8a0cb9c7 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,20 +18,20 @@ internal class CarouselMetadata : AttributeTableBuilder public CarouselMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Carousel), + AddCallback(typeof(Carousel), b => { - b.AddCustomAttributes(nameof(Carousel.SelectedItem), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.SelectedIndex), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.TransitionDuration), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.ItemDepth), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.EasingFunction), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.ItemMargin), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.InvertPositive), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.ItemRotationX), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.ItemRotationY), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.ItemRotationZ), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Carousel.Orientation), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.SelectedItem), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.SelectedIndex), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.TransitionDuration), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.ItemDepth), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.EasingFunction), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.ItemMargin), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.InvertPositive), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.ItemRotationX), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.ItemRotationY), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.ItemRotationZ), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Carousel.Orientation), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs index 5872e3d31bf..e80da3c9c5a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs @@ -4,12 +4,15 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Features; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.Model; using Microsoft.Windows.Design.PropertyEditing; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design @@ -34,26 +37,26 @@ public DropShadowPanelMetadata() b.AddCustomAttributes(nameof(DropShadowPanel.BlurRadius), new PropertyOrderAttribute(PropertyOrder.Early), - new CategoryAttribute(Properties.Resources.CategoryDropShadow) + new CategoryAttribute(Resources.CategoryDropShadow) ); b.AddCustomAttributes(nameof(DropShadowPanel.ShadowOpacity), new PropertyOrderAttribute(PropertyOrder.Early), - new CategoryAttribute(Properties.Resources.CategoryDropShadow) + new CategoryAttribute(Resources.CategoryDropShadow) ); b.AddCustomAttributes(nameof(DropShadowPanel.Color), - new CategoryAttribute(Properties.Resources.CategoryDropShadow) + new CategoryAttribute(Resources.CategoryDropShadow) ); b.AddCustomAttributes(nameof(DropShadowPanel.OffsetX), new PropertyOrderAttribute(PropertyOrder.Late), - new CategoryAttribute(Properties.Resources.CategoryDropShadow) + new CategoryAttribute(Resources.CategoryDropShadow) ); b.AddCustomAttributes(nameof(DropShadowPanel.OffsetY), new PropertyOrderAttribute(PropertyOrder.Late), - new CategoryAttribute(Properties.Resources.CategoryDropShadow) + new CategoryAttribute(Resources.CategoryDropShadow) ); b.AddCustomAttributes(nameof(DropShadowPanel.OffsetZ), new PropertyOrderAttribute(PropertyOrder.Late), - new CategoryAttribute(Properties.Resources.CategoryDropShadow) + new CategoryAttribute(Resources.CategoryDropShadow) ); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs index f5bfd9a9288..1f61e000a45 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,16 +18,16 @@ internal class ExpanderMetadata : AttributeTableBuilder public ExpanderMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Expander), + AddCallback(typeof(Expander), b => { - b.AddCustomAttributes(nameof(Expander.Header), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Expander.Header), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(nameof(Expander.HeaderTemplate), - new CategoryAttribute(Properties.Resources.CategoryCommon), + new CategoryAttribute(Resources.CategoryCommon), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); - b.AddCustomAttributes(nameof(Expander.IsExpanded), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(Expander.ExpandDirection), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Expander.IsExpanded), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Expander.ExpandDirection), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs index d067ef8bf12..694ba9a123c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,20 +18,20 @@ internal class GridSplitterMetadata : AttributeTableBuilder public GridSplitterMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter), + AddCallback(typeof(GridSplitter), b => { - b.AddCustomAttributes(nameof(GridSplitter.Element), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(GridSplitter.ResizeDirection), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(GridSplitter.ResizeBehavior), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(GridSplitter.GripperForeground), new CategoryAttribute(Properties.Resources.CategoryBrush)); - b.AddCustomAttributes(nameof(GridSplitter.ParentLevel), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(GridSplitter.GripperCursor), new CategoryAttribute(Properties.Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(GridSplitter.Element), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(GridSplitter.ResizeDirection), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(GridSplitter.ResizeBehavior), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(GridSplitter.GripperForeground), new CategoryAttribute(Resources.CategoryBrush)); + b.AddCustomAttributes(nameof(GridSplitter.ParentLevel), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(GridSplitter.GripperCursor), new CategoryAttribute(Resources.CategoryAppearance)); b.AddCustomAttributes(nameof(GridSplitter.GripperCustomCursorResource), - new CategoryAttribute(Properties.Resources.CategoryAppearance), + new CategoryAttribute(Resources.CategoryAppearance), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); - b.AddCustomAttributes(nameof(GridSplitter.CursorBehavior), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(GridSplitter.CursorBehavior), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs index ef9798998ac..91bca7fc2bd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,10 +18,10 @@ internal class ImageExMetadata : AttributeTableBuilder public ImageExMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.ImageEx), + AddCallback(typeof(ImageEx), b => { - b.AddCustomAttributes(nameof(ImageEx.NineGrid), new CategoryAttribute(Properties.Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(ImageEx.NineGrid), new CategoryAttribute(Resources.CategoryAppearance)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs index 997b2e37832..840d6190db9 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,10 +18,10 @@ internal class InAppNotificationMetadata : AttributeTableBuilder public InAppNotificationMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.InAppNotification), + AddCallback(typeof(InAppNotification), b => { - b.AddCustomAttributes(nameof(InAppNotification.ShowDismissButton), new CategoryAttribute(Properties.Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(InAppNotification.ShowDismissButton), new CategoryAttribute(Resources.CategoryAppearance)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs index b67a2bee98c..0b0716358f1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,11 +18,11 @@ internal class LayoutTransformControlMetadata : AttributeTableBuilder public LayoutTransformControlMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.LayoutTransformControl), + AddCallback(typeof(LayoutTransformControl), b => { - b.AddCustomAttributes(nameof(LayoutTransformControl.Child), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(LayoutTransformControl.Transform), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(LayoutTransformControl.Child), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(LayoutTransformControl.Transform), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs index 378f388345e..10b5bad49ac 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,10 +18,10 @@ internal class LoadingMetadata : AttributeTableBuilder public LoadingMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Loading), + AddCallback(typeof(Loading), b => { - b.AddCustomAttributes(nameof(Loading.IsLoading), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(Loading.IsLoading), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs index 2c49a1df31e..0b3586c1d48 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,29 +18,29 @@ internal class MasterDetailsViewMetadata : AttributeTableBuilder public MasterDetailsViewMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.MasterDetailsView), + AddCallback(typeof(MasterDetailsView), b => { - b.AddCustomAttributes(nameof(MasterDetailsView.SelectedItem), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(MasterDetailsView.SelectedItem), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(nameof(MasterDetailsView.DetailsTemplate), - new CategoryAttribute(Properties.Resources.CategoryAppearance), + new CategoryAttribute(Resources.CategoryAppearance), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); - b.AddCustomAttributes(nameof(MasterDetailsView.MasterPaneBackground), new CategoryAttribute(Properties.Resources.CategoryBrush)); - b.AddCustomAttributes(nameof(MasterDetailsView.MasterHeader), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(MasterDetailsView.MasterPaneBackground), new CategoryAttribute(Resources.CategoryBrush)); + b.AddCustomAttributes(nameof(MasterDetailsView.MasterHeader), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(nameof(MasterDetailsView.MasterHeaderTemplate), - new CategoryAttribute(Properties.Resources.CategoryAppearance), + new CategoryAttribute(Resources.CategoryAppearance), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); - b.AddCustomAttributes(nameof(MasterDetailsView.MasterPaneWidth), new CategoryAttribute(Properties.Resources.CategoryAppearance)); - b.AddCustomAttributes(nameof(MasterDetailsView.NoSelectionContent), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(MasterDetailsView.MasterPaneWidth), new CategoryAttribute(Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(MasterDetailsView.NoSelectionContent), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(nameof(MasterDetailsView.NoSelectionContentTemplate), - new CategoryAttribute(Properties.Resources.CategoryCommon), + new CategoryAttribute(Resources.CategoryCommon), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); - b.AddCustomAttributes(nameof(MasterDetailsView.ViewState), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(MasterDetailsView.MasterCommandBar), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(MasterDetailsView.DetailsCommandBar), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(MasterDetailsView.ViewState), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(MasterDetailsView.MasterCommandBar), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(MasterDetailsView.DetailsCommandBar), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs index 580fd359ce2..7a3e30c307d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs @@ -4,10 +4,13 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.PropertyEditing; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -16,12 +19,12 @@ internal class MenuMetadata : AttributeTableBuilder public MenuMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Menu), + AddCallback(typeof(Menu), b => { b.AddCustomAttributes(nameof(Menu.Items), new PropertyOrderAttribute(PropertyOrder.Early), - new CategoryAttribute(Properties.Resources.CategoryCommon), + new CategoryAttribute(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[] { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs index 2c8c3ca60be..535cc422f01 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs @@ -4,10 +4,13 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.PropertyEditing; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -21,18 +24,18 @@ public MenuItemMetadata() { b.AddCustomAttributes(nameof(MenuItem.Header), new PropertyOrderAttribute(PropertyOrder.Early), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(MenuItem.IsOpened), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(MenuItem.HeaderTemplate), new EditorBrowsableAttribute(EditorBrowsableState.Advanced), - new CategoryAttribute(Properties.Resources.CategoryCommon) + new CategoryAttribute(Resources.CategoryCommon) ); b.AddCustomAttributes(nameof(MenuItem.Items), new PropertyOrderAttribute(PropertyOrder.Early), - new CategoryAttribute(Properties.Resources.CategoryCommon), + new CategoryAttribute(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[] { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs index 8d091b08a5b..5fc1e7c7129 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,20 +18,20 @@ internal class OrbitViewMetadata : AttributeTableBuilder public OrbitViewMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.OrbitView), + AddCallback(typeof(OrbitView), b => { - b.AddCustomAttributes(nameof(OrbitView.OrbitsEnabled), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(OrbitView.IsItemClickEnabled), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(OrbitView.AnchorsEnabled), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(OrbitView.MinItemSize), new CategoryAttribute(Properties.Resources.CategoryAppearance)); - b.AddCustomAttributes(nameof(OrbitView.MaxItemSize), new CategoryAttribute(Properties.Resources.CategoryAppearance)); - b.AddCustomAttributes(nameof(OrbitView.AnchorColor), new CategoryAttribute(Properties.Resources.CategoryBrush)); - b.AddCustomAttributes(nameof(OrbitView.OrbitColor), new CategoryAttribute(Properties.Resources.CategoryBrush)); - b.AddCustomAttributes(nameof(OrbitView.OrbitDashArray), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(OrbitView.AnchorThickness), new CategoryAttribute(Properties.Resources.CategoryAppearance)); - b.AddCustomAttributes(nameof(OrbitView.OrbitThickness), new CategoryAttribute(Properties.Resources.CategoryAppearance)); - b.AddCustomAttributes(nameof(OrbitView.CenterContent), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(OrbitView.OrbitsEnabled), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(OrbitView.IsItemClickEnabled), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(OrbitView.AnchorsEnabled), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(OrbitView.MinItemSize), new CategoryAttribute(Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(OrbitView.MaxItemSize), new CategoryAttribute(Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(OrbitView.AnchorColor), new CategoryAttribute(Resources.CategoryBrush)); + b.AddCustomAttributes(nameof(OrbitView.OrbitColor), new CategoryAttribute(Resources.CategoryBrush)); + b.AddCustomAttributes(nameof(OrbitView.OrbitDashArray), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(OrbitView.AnchorThickness), new CategoryAttribute(Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(OrbitView.OrbitThickness), new CategoryAttribute(Resources.CategoryAppearance)); + b.AddCustomAttributes(nameof(OrbitView.CenterContent), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs index 36c82a9bc5b..d66bf2ea770 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs @@ -4,11 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Features; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.Model; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -25,7 +26,7 @@ internal class RadialGaugeMetadata : AttributeTableBuilder public RadialGaugeMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RadialGauge), + AddCallback(typeof(RadialGauge), b => { b.AddCustomAttributes(new FeatureAttribute(typeof(RadialGaugeDefaults))); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs index 71dd303cb13..297dbe10256 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs @@ -4,11 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Features; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.Model; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -25,7 +26,7 @@ internal class RadialProgressBarMetadata : AttributeTableBuilder public RadialProgressBarMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RadialProgressBar), + AddCallback(typeof(RadialProgressBar), b => { b.AddCustomAttributes(new FeatureAttribute(typeof(RadialProgressBarDefaults))); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs index f2a6950ca23..ce340e9b0a5 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,13 +18,13 @@ internal class RangeSelectorMetadata : AttributeTableBuilder public RangeSelectorMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RangeSelector), + AddCallback(typeof(RangeSelector), b => { - b.AddCustomAttributes(nameof(RangeSelector.Minimum), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(RangeSelector.Maximum), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(RangeSelector.RangeMin), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(RangeSelector.RangeMax), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RangeSelector.Minimum), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RangeSelector.Maximum), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RangeSelector.RangeMin), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RangeSelector.RangeMax), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs index cf93b46d4f3..85ad34e555a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,18 +18,18 @@ internal class RotatorTileMetadata : AttributeTableBuilder public RotatorTileMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile), + AddCallback(typeof(RotatorTile), b => { - b.AddCustomAttributes(nameof(RotatorTile.ExtraRandomDuration), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(RotatorTile.RotationDelay), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(RotatorTile.ItemsSource), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RotatorTile.ExtraRandomDuration), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RotatorTile.RotationDelay), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RotatorTile.ItemsSource), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(nameof(RotatorTile.ItemTemplate), - new CategoryAttribute(Properties.Resources.CategoryAppearance), + new CategoryAttribute(Resources.CategoryAppearance), new EditorBrowsableAttribute(EditorBrowsableState.Advanced) ); - b.AddCustomAttributes(nameof(RotatorTile.RotateDirection), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(RotatorTile.CurrentItem), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RotatorTile.RotateDirection), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(RotatorTile.CurrentItem), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs index 0af933fc86c..5448f74a65b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,10 +18,10 @@ internal class ScrollHeaderMetadata : AttributeTableBuilder public ScrollHeaderMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.ScrollHeader), + AddCallback(typeof(ScrollHeader), b => { - b.AddCustomAttributes(nameof(ScrollHeader.Mode), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(ScrollHeader.Mode), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs index 8d4bdfd0f8e..89e6549397f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,14 +18,14 @@ internal class TextToolbarMetadata : AttributeTableBuilder public TextToolbarMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TextToolbar), + AddCallback(typeof(TextToolbar), b => { - b.AddCustomAttributes(nameof(TextToolbar.Editor), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TextToolbar.Formatter), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TextToolbar.DefaultButtons), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TextToolbar.CustomButtons), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TextToolbar.ButtonModifications), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TextToolbar.Editor), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TextToolbar.Formatter), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TextToolbar.DefaultButtons), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TextToolbar.CustomButtons), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TextToolbar.ButtonModifications), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs index 395480555e8..8c443a1648b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,20 +18,20 @@ internal class TileControlMetadata : AttributeTableBuilder public TileControlMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.TileControl), + AddCallback(typeof(TileControl), b => { - b.AddCustomAttributes(nameof(TileControl.ScrollViewerContainer), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.ImageAlignment), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.ImageSource), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.ScrollOrientation), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.OffsetX), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.OffsetY), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.ParallaxSpeedRatio), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.IsAnimated), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.AnimationStepX), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.AnimationStepY), new CategoryAttribute(Properties.Resources.CategoryCommon)); - b.AddCustomAttributes(nameof(TileControl.AnimationDuration), new CategoryAttribute(Properties.Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.ScrollViewerContainer), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.ImageAlignment), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.ImageSource), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.ScrollOrientation), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.OffsetX), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.OffsetY), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.ParallaxSpeedRatio), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.IsAnimated), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.AnimationStepX), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.AnimationStepY), new CategoryAttribute(Resources.CategoryCommon)); + b.AddCustomAttributes(nameof(TileControl.AnimationDuration), new CategoryAttribute(Resources.CategoryCommon)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs index a9550dabf17..5792f64149d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,17 +18,17 @@ internal class WrapPanelMetadata : AttributeTableBuilder public WrapPanelMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel), + AddCallback(typeof(WrapPanel), b => { b.AddCustomAttributes(nameof(WrapPanel.Orientation), - new CategoryAttribute(Properties.Resources.CategoryLayout) + new CategoryAttribute(Resources.CategoryLayout) ); b.AddCustomAttributes(nameof(WrapPanel.HorizontalSpacing), - new CategoryAttribute(Properties.Resources.CategoryLayout) + new CategoryAttribute(Resources.CategoryLayout) ); b.AddCustomAttributes(nameof(WrapPanel.VerticalSpacing), - new CategoryAttribute(Properties.Resources.CategoryLayout) + new CategoryAttribute(Resources.CategoryLayout) ); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs index 7c863f07019..9999b770aeb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs @@ -4,15 +4,18 @@ using System; using System.Reflection; - using Microsoft.Toolkit.Uwp.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design.Metadata; +#endif -[assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))] +[assembly: ProvideMetadata(typeof(MetadataRegistration))] namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { - public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeTable + public class MetadataRegistration : MetadataRegistrationBase { public MetadataRegistration() : base() { @@ -23,25 +26,12 @@ public MetadataRegistration() : base() // (or Default namespace in Project -> Properties -> Application tab) // must be the same as runtime assembly's main namespace (t.Namespace) // plus .Design. - Type t = typeof(Microsoft.Toolkit.Uwp.UI.Controls.GridSplitter); +#if VS_DESIGNER_PROCESS_ISOLATION + Type t = typeof(GridSplitter); AssemblyName an = t.Assembly.GetName(); - AssemblyFullName = ", " + an.FullName; + AssemblyFullName = an.FullName; XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; +#endif } - - #region IProvideAttributeTable Members - - /// - /// Gets the AttributeTable for design time metadata. - /// - public AttributeTable AttributeTable - { - get - { - return BuildAttributeTable(); - } - } - - #endregion } } \ No newline at end of file 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 4b1c3e4fd35..e8db770ef48 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 @@ -32,6 +32,7 @@ $(NoWarn);0618 $(AssetTargetFallback);uap10.0.17763 + $(DefineConstants);VS_DESIGNER_PROCESS_ISOLATION diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs index 1c8d23271b7..b2cdb9d9b32 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs @@ -4,9 +4,12 @@ using System.ComponentModel; -using Microsoft.Toolkit.Uwp.UI.Controls.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { @@ -15,51 +18,51 @@ internal class MarkdownTextBlockMetadata : AttributeTableBuilder public MarkdownTextBlockMetadata() : base() { - AddCallback(typeof(Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock), + AddCallback(typeof(MarkdownTextBlock), b => { - b.AddCustomAttributes(nameof(MarkdownTextBlock.ImageStretch), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.Text), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.IsTextSelectionEnabled), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.LinkForeground), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.TextWrapping), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.ParagraphMargin), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.HorizontalRuleBrush), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.HorizontalRuleMargin), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.HorizontalRuleThickness), new CategoryAttribute(Properties.Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.ImageStretch), new CategoryAttribute(Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.Text), new CategoryAttribute(Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.IsTextSelectionEnabled), new CategoryAttribute(Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.LinkForeground), new CategoryAttribute(Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.TextWrapping), new CategoryAttribute(Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.ParagraphMargin), new CategoryAttribute(Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.HorizontalRuleBrush), new CategoryAttribute(Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.HorizontalRuleMargin), new CategoryAttribute(Resources.CategoryMarkdownStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.HorizontalRuleThickness), new CategoryAttribute(Resources.CategoryMarkdownStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeBackground), new CategoryAttribute(Properties.Resources.CategoryMarkdownCodeStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeBorderBrush), new CategoryAttribute(Properties.Resources.CategoryMarkdownCodeStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeBorderThickness), new CategoryAttribute(Properties.Resources.CategoryMarkdownCodeStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeForeground), new CategoryAttribute(Properties.Resources.CategoryMarkdownCodeStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeBackground), new CategoryAttribute(Properties.Resources.CategoryMarkdownCodeStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeFontFamily), new CategoryAttribute(Properties.Resources.CategoryMarkdownCodeStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeMargin), new CategoryAttribute(Properties.Resources.CategoryMarkdownCodeStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.CodePadding), new CategoryAttribute(Properties.Resources.CategoryMarkdownCodeStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeBackground), new CategoryAttribute(Resources.CategoryMarkdownCodeStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeBorderBrush), new CategoryAttribute(Resources.CategoryMarkdownCodeStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeBorderThickness), new CategoryAttribute(Resources.CategoryMarkdownCodeStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeForeground), new CategoryAttribute(Resources.CategoryMarkdownCodeStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeBackground), new CategoryAttribute(Resources.CategoryMarkdownCodeStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeFontFamily), new CategoryAttribute(Resources.CategoryMarkdownCodeStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.CodeMargin), new CategoryAttribute(Resources.CategoryMarkdownCodeStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.CodePadding), new CategoryAttribute(Resources.CategoryMarkdownCodeStyle)); for (int i = 1; i <= 6; i++) { - b.AddCustomAttributes($"Header{i}FontWeight", new CategoryAttribute(string.Format(Properties.Resources.CategoryMarkdownHeaderStyle, i))); - b.AddCustomAttributes($"Header{i}FontSize", new CategoryAttribute(string.Format(Properties.Resources.CategoryMarkdownHeaderStyle, i))); - b.AddCustomAttributes($"Header{i}Margin", new CategoryAttribute(string.Format(Properties.Resources.CategoryMarkdownHeaderStyle, i))); - b.AddCustomAttributes($"Header{i}Foreground", new CategoryAttribute(string.Format(Properties.Resources.CategoryMarkdownHeaderStyle, i))); + b.AddCustomAttributes($"Header{i}FontWeight", new CategoryAttribute(string.Format(Resources.CategoryMarkdownHeaderStyle, i))); + b.AddCustomAttributes($"Header{i}FontSize", new CategoryAttribute(string.Format(Resources.CategoryMarkdownHeaderStyle, i))); + b.AddCustomAttributes($"Header{i}Margin", new CategoryAttribute(string.Format(Resources.CategoryMarkdownHeaderStyle, i))); + b.AddCustomAttributes($"Header{i}Foreground", new CategoryAttribute(string.Format(Resources.CategoryMarkdownHeaderStyle, i))); } - b.AddCustomAttributes(nameof(MarkdownTextBlock.ListMargin), new CategoryAttribute(Properties.Resources.CategoryMarkdownListStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.ListGutterWidth), new CategoryAttribute(Properties.Resources.CategoryMarkdownListStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.ListBulletSpacing), new CategoryAttribute(Properties.Resources.CategoryMarkdownListStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.ListMargin), new CategoryAttribute(Resources.CategoryMarkdownListStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.ListGutterWidth), new CategoryAttribute(Resources.CategoryMarkdownListStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.ListBulletSpacing), new CategoryAttribute(Resources.CategoryMarkdownListStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteBackground), new CategoryAttribute(Properties.Resources.CategoryMarkdownQuoteStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteBorderBrush), new CategoryAttribute(Properties.Resources.CategoryMarkdownQuoteStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteBorderThickness), new CategoryAttribute(Properties.Resources.CategoryMarkdownQuoteStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteForeground), new CategoryAttribute(Properties.Resources.CategoryMarkdownQuoteStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteMargin), new CategoryAttribute(Properties.Resources.CategoryMarkdownQuoteStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.QuotePadding), new CategoryAttribute(Properties.Resources.CategoryMarkdownQuoteStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteBackground), new CategoryAttribute(Resources.CategoryMarkdownQuoteStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteBorderBrush), new CategoryAttribute(Resources.CategoryMarkdownQuoteStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteBorderThickness), new CategoryAttribute(Resources.CategoryMarkdownQuoteStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteForeground), new CategoryAttribute(Resources.CategoryMarkdownQuoteStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.QuoteMargin), new CategoryAttribute(Resources.CategoryMarkdownQuoteStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.QuotePadding), new CategoryAttribute(Resources.CategoryMarkdownQuoteStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.TableBorderBrush), new CategoryAttribute(Properties.Resources.CategoryMarkdownTableStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.TableBorderThickness), new CategoryAttribute(Properties.Resources.CategoryMarkdownTableStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.TableCellPadding), new CategoryAttribute(Properties.Resources.CategoryMarkdownTableStyle)); - b.AddCustomAttributes(nameof(MarkdownTextBlock.TableMargin), new CategoryAttribute(Properties.Resources.CategoryMarkdownTableStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.TableBorderBrush), new CategoryAttribute(Resources.CategoryMarkdownTableStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.TableBorderThickness), new CategoryAttribute(Resources.CategoryMarkdownTableStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.TableCellPadding), new CategoryAttribute(Resources.CategoryMarkdownTableStyle)); + b.AddCustomAttributes(nameof(MarkdownTextBlock.TableMargin), new CategoryAttribute(Resources.CategoryMarkdownTableStyle)); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs index 56b252dbeb4..b804d9b759f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs @@ -4,15 +4,18 @@ using System; using System.Reflection; - using Microsoft.Toolkit.Uwp.Design.Common; +using Microsoft.Toolkit.Uwp.UI.Controls.Design; + +#if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design.Metadata; +#endif -[assembly: ProvideMetadata(typeof(Microsoft.Toolkit.Uwp.UI.Controls.Design.MetadataRegistration))] +[assembly: ProvideMetadata(typeof(MetadataRegistration))] namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { - public class MetadataRegistration : MetadataRegistrationBase, IProvideAttributeTable + public class MetadataRegistration : MetadataRegistrationBase { public MetadataRegistration() : base() { @@ -23,25 +26,12 @@ public MetadataRegistration() : base() // (or Default namespace in Project -> Properties -> Application tab) // must be the same as runtime assembly's main namespace (t.Namespace) // plus .Design. - Type t = typeof(Microsoft.Toolkit.Uwp.UI.Controls.MarkdownTextBlock); +#if VS_DESIGNER_PROCESS_ISOLATION + Type t = typeof(MarkdownTextBlock); AssemblyName an = t.Assembly.GetName(); - AssemblyFullName = ", " + an.FullName; + AssemblyFullName = an.FullName; XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; +#endif } - - #region IProvideAttributeTable Members - - /// - /// Gets the AttributeTable for design time metadata. - /// - public AttributeTable AttributeTable - { - get - { - return BuildAttributeTable(); - } - } - - #endregion } } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj index 769f8f7cedc..d301283f68f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj @@ -31,6 +31,7 @@ $(AssetTargetFallback);uap10.0.17763 + $(DefineConstants);VS_DESIGNER_PROCESS_ISOLATION From 7ef1690fce2ac3752ed94c8bb526b0f2c8a56613 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 30 May 2020 20:36:35 +0530 Subject: [PATCH 6/8] Move typeof into Typedata files Since the new designer APIs require type as FQN (_fully qualified name_) instead of `Type` objects, we move those definitions into it's own class `ControlTypes`, so that we can add FQNs for the new designer APIs. Refactoring like this will help us maintain logic for both designers for the foreseeable future. --- .../Controls/DataGrid.Metadata.cs | 12 ++++----- .../Controls/DataGrid.Typedata.cs | 20 +++++++++++++++ ...kit.Uwp.UI.Controls.DataGrid.Design.csproj | 3 ++- .../{ToolboxCategoryPaths.cs => Constants.cs} | 0 .../Common/MetadataRegistrationBase.cs | 12 +++++---- .../Controls/AdaptiveGridView.Metadata.cs | 2 +- .../Controls/AdaptiveGridView.Typedata.cs | 15 +++++++++++ .../Controls/BladeItem.Metadata.cs | 2 +- .../Controls/BladeItem.Typedata.cs | 15 +++++++++++ .../Controls/BladeView.Metadata.cs | 6 ++--- .../Controls/BladeView.Typedata.cs | 15 +++++++++++ .../Controls/Carousel.Metadata.cs | 2 +- .../Controls/Carousel.Typedata.cs | 15 +++++++++++ .../Controls/DropShadowPanel.Metadata.cs | 2 +- .../Controls/DropShadowPanel.Typedata.cs | 15 +++++++++++ .../Controls/Expander.Metadata.cs | 2 +- .../Controls/Expander.Typedata.cs | 15 +++++++++++ .../Controls/GridSplitter.Metadata.cs | 2 +- .../Controls/GridSplitter.Typedata.cs | 15 +++++++++++ .../Controls/ImageEx.Metadata.cs | 2 +- .../Controls/ImageEx.Typedata.cs | 15 +++++++++++ .../Controls/InAppNotification.Metadata.cs | 2 +- .../Controls/InAppNotification.Typedata.cs | 15 +++++++++++ .../LayoutTransitionControl.Metadata.cs | 2 +- .../LayoutTransitionControl.Typedata.cs | 15 +++++++++++ .../Controls/Loading.Metadata.cs | 2 +- .../Controls/Loading.Typedata.cs | 15 +++++++++++ .../Controls/MasterDetailsView.Metadata.cs | 2 +- .../Controls/MasterDetailsView.Typedata.cs | 15 +++++++++++ .../Controls/Menu.Metadata.cs | 6 ++--- .../Controls/Menu.Typedata.cs | 15 +++++++++++ .../Controls/MenuItem.Metadata.cs | 6 ++--- .../Controls/MenuItem.Typedata.cs | 15 +++++++++++ .../Controls/OrbitView.Metadata.cs | 2 +- .../Controls/OrbitView.Typedata.cs | 15 +++++++++++ .../Controls/RadialGauge.Metadata.cs | 2 +- .../Controls/RadialGauge.Typedata.cs | 15 +++++++++++ .../Controls/RadialProgressBar.Metadata.cs | 2 +- .../Controls/RadialProgressBar.Typedata.cs | 15 +++++++++++ .../Controls/RangeSelector.Metadata.cs | 2 +- .../Controls/RangeSelector.Typedata.cs | 15 +++++++++++ .../Controls/RotatorTile.Metadata.cs | 2 +- .../Controls/RotatorTile.Typedata.cs | 15 +++++++++++ .../Controls/ScrollHeader.Metadata.cs | 2 +- .../Controls/ScrollHeader.Typedata.cs | 15 +++++++++++ .../Controls/TextToolbar.Metadata.cs | 2 +- .../Controls/TextToolbar.Typedata.cs | 15 +++++++++++ .../Controls/TileControl.Metadata.cs | 2 +- .../Controls/TileControl.Typedata.cs | 15 +++++++++++ .../Controls/WrapPanel.Metadata.cs | 2 +- .../Controls/WrapPanel.Typedata.cs | 15 +++++++++++ ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 25 ++++++++++++++++++- .../Controls/MarkdownTextBlock.Metadata.cs | 2 +- .../Controls/MarkdownTextBlock.Typedata.cs | 15 +++++++++++ ...kit.Uwp.UI.Controls.Markdown.Design.csproj | 3 ++- 55 files changed, 448 insertions(+), 47 deletions(-) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs rename Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/{ToolboxCategoryPaths.cs => Constants.cs} (100%) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs index 36166b96f92..0718c660d20 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs @@ -27,7 +27,7 @@ internal class DataGridMetadata : AttributeTableBuilder { public DataGridMetadata() : base() { - AddCallback(typeof(DataGrid), + AddCallback(ControlTypes.DataGrid, b => { b.AddCustomAttributes(new FeatureAttribute(typeof(DataGridDefaults))); @@ -75,7 +75,7 @@ public DataGridMetadata() : base() b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); }); - AddCallback(typeof(DataGridColumn), + AddCallback(ControlTypes.DataGridColumn, b => { b.AddCustomAttributes(nameof(DataGridColumn.CanUserResize), new CategoryAttribute(Resources.CategoryLayout)); @@ -89,13 +89,13 @@ public DataGridMetadata() : base() b.AddCustomAttributes(nameof(DataGridColumn.Width), new CategoryAttribute(Resources.CategoryLayout)); }); - AddCallback(typeof(DataGridBoundColumn), + AddCallback(ControlTypes.DataGridBoundColumn, b => { b.AddCustomAttributes(nameof(DataGridBoundColumn.Binding), new CategoryAttribute(Resources.CategoryCellBinding)); }); - AddCallback(typeof(DataGridTextColumn), + AddCallback(ControlTypes.DataGridTextColumn, b => { b.AddCustomAttributes(nameof(DataGridTextColumn.FontFamily), new CategoryAttribute(Resources.CategoryText)); @@ -105,13 +105,13 @@ public DataGridMetadata() : base() b.AddCustomAttributes(nameof(DataGridTextColumn.Foreground), new CategoryAttribute(Resources.CategoryText)); }); - AddCallback(typeof(DataGridCheckBoxColumn), + AddCallback(ControlTypes.DataGridCheckBoxColumn, b => { b.AddCustomAttributes(nameof(DataGridCheckBoxColumn.IsThreeState), new CategoryAttribute(Resources.CategoryCommon)); }); - AddCallback(typeof(DataGridTemplateColumn), + AddCallback(ControlTypes.DataGridTemplateColumn, b => { b.AddCustomAttributes(nameof(DataGridTemplateColumn.CellEditingTemplate), new CategoryAttribute(Resources.CategoryCellTemplate)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs new file mode 100644 index 00000000000..bda869c3c58 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs @@ -0,0 +1,20 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type DataGrid = typeof(DataGrid); + internal static readonly Type DataGridColumn = typeof(DataGridColumn); + internal static readonly Type DataGridBoundColumn = typeof(DataGridBoundColumn); + internal static readonly Type DataGridTextColumn = typeof(DataGridTextColumn); + internal static readonly Type DataGridCheckBoxColumn = typeof(DataGridCheckBoxColumn); + internal static readonly Type DataGridTemplateColumn = typeof(DataGridTemplateColumn); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj index f6132ee4d4e..e4296030a32 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj @@ -82,10 +82,11 @@ + - + Code diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/ToolboxCategoryPaths.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs index bab3988e108..d81169306db 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs @@ -139,7 +139,9 @@ private void AddDescriptions(AttributeTableBuilder builder) } var type = Type.GetType(typeName + ", " + AssemblyFullName); - +#if VS_DESIGNER_PROCESS_ISOLATION + var typeID = type; +#endif if (type != null && type.IsPublic && type.IsClass && type.IsSubclassOf(PlatformTypes.DependencyObject)) { string desc = ParseDescription(member); @@ -152,11 +154,11 @@ private void AddDescriptions(AttributeTableBuilder builder) { if (IsBrowsable(type)) { - builder.AddCustomAttributes(type, new DescriptionAttribute(desc)); + builder.AddCustomAttributes(typeID, new DescriptionAttribute(desc)); } else //Hide from intellisense { - builder.AddCustomAttributes(type, + builder.AddCustomAttributes(typeID, new BrowsableAttribute(false), new ToolboxBrowsableAttribute(false), new ToolboxItemAttribute(false)); @@ -170,11 +172,11 @@ private void AddDescriptions(AttributeTableBuilder builder) { if (IsBrowsable(type)) { - builder.AddCustomAttributes(type, propertyName, new DescriptionAttribute(desc)); + builder.AddCustomAttributes(typeID, propertyName, new DescriptionAttribute(desc)); } else //Hide from intellisense { - builder.AddCustomAttributes(type, new BrowsableAttribute(false)); + builder.AddCustomAttributes(typeID, new BrowsableAttribute(false)); } } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs index fda2d18a745..ff5387adfd6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs @@ -18,7 +18,7 @@ internal class CustomDialogMetadata : AttributeTableBuilder public CustomDialogMetadata() : base() { - AddCallback(typeof(AdaptiveGridView), + AddCallback(ControlTypes.AdaptiveGridView, b => { b.AddCustomAttributes(nameof(AdaptiveGridView.DesiredWidth), diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs new file mode 100644 index 00000000000..e40e367c637 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type AdaptiveGridView = typeof(AdaptiveGridView); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs index 5e1982baccc..bf5dabbe188 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs @@ -19,7 +19,7 @@ internal class BladeItemMetadata : AttributeTableBuilder public BladeItemMetadata() : base() { - AddCallback(typeof(BladeItem), + AddCallback(ControlTypes.BladeItem, b => { b.AddCustomAttributes(nameof(BladeItem.TitleBarVisibility), diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs new file mode 100644 index 00000000000..4f09a81a450 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type BladeItem = typeof(BladeItem); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs index 73b1916b177..ebbb627328a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs @@ -20,7 +20,7 @@ internal class BladeViewMetadata : AttributeTableBuilder public BladeViewMetadata() : base() { - AddCallback(typeof(BladeView), + AddCallback(ControlTypes.BladeView, b => { b.AddCustomAttributes(nameof(BladeView.ActiveBlades), @@ -37,9 +37,7 @@ public BladeViewMetadata() new CategoryAttribute(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 NewItemTypesAttribute(ControlTypes.BladeItem), new AlternateContentPropertyAttribute() ); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs new file mode 100644 index 00000000000..a628dedeefe --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type BladeView = typeof(BladeView); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs index 0cd8a0cb9c7..635f36e1e85 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs @@ -18,7 +18,7 @@ internal class CarouselMetadata : AttributeTableBuilder public CarouselMetadata() : base() { - AddCallback(typeof(Carousel), + AddCallback(ControlTypes.Carousel, b => { b.AddCustomAttributes(nameof(Carousel.SelectedItem), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs new file mode 100644 index 00000000000..6880400757f --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type Carousel = typeof(Carousel); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs index e80da3c9c5a..9d477e91533 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs @@ -30,7 +30,7 @@ internal class DropShadowPanelMetadata : AttributeTableBuilder public DropShadowPanelMetadata() : base() { - AddCallback(typeof(DropShadowPanel), + AddCallback(ControlTypes.DropShadowPanel, b => { b.AddCustomAttributes(new FeatureAttribute(typeof(DropShadowPanelDefaults))); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs new file mode 100644 index 00000000000..fd6db2408cb --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type DropShadowPanel = typeof(DropShadowPanel); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs index 1f61e000a45..e2351d3954b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs @@ -18,7 +18,7 @@ internal class ExpanderMetadata : AttributeTableBuilder public ExpanderMetadata() : base() { - AddCallback(typeof(Expander), + AddCallback(ControlTypes.Expander, b => { b.AddCustomAttributes(nameof(Expander.Header), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs new file mode 100644 index 00000000000..aefbbcabd79 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type Expander = typeof(Expander); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs index 694ba9a123c..5da389864ce 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs @@ -18,7 +18,7 @@ internal class GridSplitterMetadata : AttributeTableBuilder public GridSplitterMetadata() : base() { - AddCallback(typeof(GridSplitter), + AddCallback(ControlTypes.GridSplitter, b => { b.AddCustomAttributes(nameof(GridSplitter.Element), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs new file mode 100644 index 00000000000..8aa7698491e --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type GridSplitter = typeof(GridSplitter); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs index 91bca7fc2bd..14414c06a3a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs @@ -18,7 +18,7 @@ internal class ImageExMetadata : AttributeTableBuilder public ImageExMetadata() : base() { - AddCallback(typeof(ImageEx), + AddCallback(ControlTypes.ImageEx, b => { b.AddCustomAttributes(nameof(ImageEx.NineGrid), new CategoryAttribute(Resources.CategoryAppearance)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs new file mode 100644 index 00000000000..e7d61613bda --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type ImageEx = typeof(ImageEx); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs index 840d6190db9..8f96630e1ee 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs @@ -18,7 +18,7 @@ internal class InAppNotificationMetadata : AttributeTableBuilder public InAppNotificationMetadata() : base() { - AddCallback(typeof(InAppNotification), + AddCallback(ControlTypes.InAppNotification, b => { b.AddCustomAttributes(nameof(InAppNotification.ShowDismissButton), new CategoryAttribute(Resources.CategoryAppearance)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs new file mode 100644 index 00000000000..57cec7a3acb --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type InAppNotification = typeof(InAppNotification); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs index 0b0716358f1..90cb8bc6d68 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs @@ -18,7 +18,7 @@ internal class LayoutTransformControlMetadata : AttributeTableBuilder public LayoutTransformControlMetadata() : base() { - AddCallback(typeof(LayoutTransformControl), + AddCallback(ControlTypes.LayoutTransformControl, b => { b.AddCustomAttributes(nameof(LayoutTransformControl.Child), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs new file mode 100644 index 00000000000..a3ac747ef94 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type LayoutTransformControl = typeof(LayoutTransformControl); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs index 10b5bad49ac..9aa714858c4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs @@ -18,7 +18,7 @@ internal class LoadingMetadata : AttributeTableBuilder public LoadingMetadata() : base() { - AddCallback(typeof(Loading), + AddCallback(ControlTypes.Loading, b => { b.AddCustomAttributes(nameof(Loading.IsLoading), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs new file mode 100644 index 00000000000..8018970dc65 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type Loading = typeof(Loading); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs index 0b3586c1d48..88590d30870 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs @@ -18,7 +18,7 @@ internal class MasterDetailsViewMetadata : AttributeTableBuilder public MasterDetailsViewMetadata() : base() { - AddCallback(typeof(MasterDetailsView), + AddCallback(ControlTypes.MasterDetailsView, b => { b.AddCustomAttributes(nameof(MasterDetailsView.SelectedItem), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs new file mode 100644 index 00000000000..ef4a1f58395 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type MasterDetailsView = typeof(MasterDetailsView); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs index 7a3e30c307d..ddbe6af0f42 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs @@ -19,7 +19,7 @@ internal class MenuMetadata : AttributeTableBuilder public MenuMetadata() : base() { - AddCallback(typeof(Menu), + AddCallback(ControlTypes.Menu, b => { b.AddCustomAttributes(nameof(Menu.Items), @@ -27,9 +27,7 @@ public MenuMetadata() new CategoryAttribute(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 NewItemTypesAttribute(ControlTypes.MenuItem), new AlternateContentPropertyAttribute() ); b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs new file mode 100644 index 00000000000..37497ebd8f0 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type Menu = typeof(Menu); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs index 535cc422f01..796229dbca6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs @@ -19,7 +19,7 @@ internal class MenuItemMetadata : AttributeTableBuilder public MenuItemMetadata() : base() { - AddCallback(typeof(MenuItem), + AddCallback(ControlTypes.MenuItem, b => { b.AddCustomAttributes(nameof(MenuItem.Header), @@ -38,9 +38,7 @@ public MenuItemMetadata() new CategoryAttribute(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 NewItemTypesAttribute(ControlTypes.MenuItem), new AlternateContentPropertyAttribute() ); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs new file mode 100644 index 00000000000..5f4f392bd47 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type MenuItem = typeof(MenuItem); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs index 5fc1e7c7129..24cdbe58abe 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs @@ -18,7 +18,7 @@ internal class OrbitViewMetadata : AttributeTableBuilder public OrbitViewMetadata() : base() { - AddCallback(typeof(OrbitView), + AddCallback(ControlTypes.OrbitView, b => { b.AddCustomAttributes(nameof(OrbitView.OrbitsEnabled), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs new file mode 100644 index 00000000000..31d3b1e1b72 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type OrbitView = typeof(OrbitView); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs index d66bf2ea770..c2903dd33a0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs @@ -26,7 +26,7 @@ internal class RadialGaugeMetadata : AttributeTableBuilder public RadialGaugeMetadata() : base() { - AddCallback(typeof(RadialGauge), + AddCallback(ControlTypes.RadialGauge, b => { b.AddCustomAttributes(new FeatureAttribute(typeof(RadialGaugeDefaults))); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs new file mode 100644 index 00000000000..a3bccb4f54d --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type RadialGauge = typeof(RadialGauge); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs index 297dbe10256..549237a4c8f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs @@ -26,7 +26,7 @@ internal class RadialProgressBarMetadata : AttributeTableBuilder public RadialProgressBarMetadata() : base() { - AddCallback(typeof(RadialProgressBar), + AddCallback(ControlTypes.RadialProgressBar, b => { b.AddCustomAttributes(new FeatureAttribute(typeof(RadialProgressBarDefaults))); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs new file mode 100644 index 00000000000..7fa42b76480 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type RadialProgressBar = typeof(RadialProgressBar); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs index ce340e9b0a5..f14d0bf0958 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs @@ -18,7 +18,7 @@ internal class RangeSelectorMetadata : AttributeTableBuilder public RangeSelectorMetadata() : base() { - AddCallback(typeof(RangeSelector), + AddCallback(ControlTypes.RangeSelector, b => { b.AddCustomAttributes(nameof(RangeSelector.Minimum), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs new file mode 100644 index 00000000000..ba407bad83e --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type RangeSelector = typeof(RangeSelector); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs index 85ad34e555a..b2fc73e058e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs @@ -18,7 +18,7 @@ internal class RotatorTileMetadata : AttributeTableBuilder public RotatorTileMetadata() : base() { - AddCallback(typeof(RotatorTile), + AddCallback(ControlTypes.RotatorTile, b => { b.AddCustomAttributes(nameof(RotatorTile.ExtraRandomDuration), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs new file mode 100644 index 00000000000..63524a35cbb --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type RotatorTile = typeof(RotatorTile); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs index 5448f74a65b..ae4b8097017 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs @@ -18,7 +18,7 @@ internal class ScrollHeaderMetadata : AttributeTableBuilder public ScrollHeaderMetadata() : base() { - AddCallback(typeof(ScrollHeader), + AddCallback(ControlTypes.ScrollHeader, b => { b.AddCustomAttributes(nameof(ScrollHeader.Mode), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs new file mode 100644 index 00000000000..e503885f899 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type ScrollHeader = typeof(ScrollHeader); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs index 89e6549397f..549ba936f14 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs @@ -18,7 +18,7 @@ internal class TextToolbarMetadata : AttributeTableBuilder public TextToolbarMetadata() : base() { - AddCallback(typeof(TextToolbar), + AddCallback(ControlTypes.TextToolbar, b => { b.AddCustomAttributes(nameof(TextToolbar.Editor), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs new file mode 100644 index 00000000000..8bbda900127 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type TextToolbar = typeof(TextToolbar); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs index 8c443a1648b..4cfa85f1d47 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs @@ -18,7 +18,7 @@ internal class TileControlMetadata : AttributeTableBuilder public TileControlMetadata() : base() { - AddCallback(typeof(TileControl), + AddCallback(ControlTypes.TileControl, b => { b.AddCustomAttributes(nameof(TileControl.ScrollViewerContainer), new CategoryAttribute(Resources.CategoryCommon)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs new file mode 100644 index 00000000000..2a60a846bdc --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type TileControl = typeof(TileControl); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs index 5792f64149d..f1cd4b0f430 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs @@ -18,7 +18,7 @@ internal class WrapPanelMetadata : AttributeTableBuilder public WrapPanelMetadata() : base() { - AddCallback(typeof(WrapPanel), + AddCallback(ControlTypes.WrapPanel, b => { b.AddCustomAttributes(nameof(WrapPanel.Orientation), diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs new file mode 100644 index 00000000000..b061cb0d45c --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type WrapPanel = typeof(WrapPanel); + } +#endif +} \ No newline at end of file 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 e8db770ef48..01030bf156f 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 @@ -83,32 +83,55 @@ + - + + + + + + + + + + + + + + + + + + + + + + + Code diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs index b2cdb9d9b32..073b487da60 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs @@ -18,7 +18,7 @@ internal class MarkdownTextBlockMetadata : AttributeTableBuilder public MarkdownTextBlockMetadata() : base() { - AddCallback(typeof(MarkdownTextBlock), + AddCallback(ControlTypes.MarkdownTextBlock, b => { b.AddCustomAttributes(nameof(MarkdownTextBlock.ImageStretch), new CategoryAttribute(Resources.CategoryMarkdownStyle)); diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs new file mode 100644 index 00000000000..28fc9e48bf4 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs @@ -0,0 +1,15 @@ +// 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; + +namespace Microsoft.Toolkit.Uwp.UI.Controls.Design +{ +#if VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + internal static readonly Type MarkdownTextBlock = typeof(MarkdownTextBlock); + } +#endif +} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj index d301283f68f..02999b45652 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj @@ -82,10 +82,11 @@ + - + Code From ecc7f1eb46786017f6717b12244c3fa6e8748ab5 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sat, 30 May 2020 20:41:31 +0530 Subject: [PATCH 7/8] Add DesignTools Project for the new Designer APIs Add FQNs and Proxy classes for the Control types since they should not be referenced by the DesignTools assembly in new Designer system. --- Directory.Build.props | 2 + .../Controls/DataGrid.Metadata.cs | 9 +- .../Controls/DataGrid.Typedata.cs | 95 +++++++++++ .../MetadataRegistration.cs | 6 + ...kit.Uwp.UI.Controls.DataGrid.Design.csproj | 2 +- ...wp.UI.Controls.DataGrid.DesignTools.csproj | 107 ++++++++++++ ...ft.Toolkit.Uwp.UI.Controls.DataGrid.csproj | 4 +- .../Common/Constants.cs | 7 + .../Common/MetadataRegistrationBase.cs | 5 + .../Common/PlatformTypes.cs | 3 + .../Controls/AdaptiveGridView.Metadata.cs | 3 + .../Controls/AdaptiveGridView.Typedata.cs | 14 ++ .../Controls/BladeItem.Metadata.cs | 3 + .../Controls/BladeItem.Typedata.cs | 14 ++ .../Controls/BladeView.Metadata.cs | 4 + .../Controls/BladeView.Typedata.cs | 13 ++ .../Controls/Carousel.Metadata.cs | 3 + .../Controls/Carousel.Typedata.cs | 20 +++ .../Controls/DropShadowPanel.Metadata.cs | 6 + .../Controls/DropShadowPanel.Typedata.cs | 15 ++ .../Controls/Expander.Metadata.cs | 3 + .../Controls/Expander.Typedata.cs | 13 ++ .../Controls/GridSplitter.Metadata.cs | 3 + .../Controls/GridSplitter.Typedata.cs | 17 ++ .../Controls/ImageEx.Metadata.cs | 3 + .../Controls/ImageEx.Typedata.cs | 10 ++ .../Controls/InAppNotification.Metadata.cs | 3 + .../Controls/InAppNotification.Typedata.cs | 10 ++ .../LayoutTransitionControl.Metadata.cs | 3 + .../LayoutTransitionControl.Typedata.cs | 11 ++ .../Controls/Loading.Metadata.cs | 3 + .../Controls/Loading.Typedata.cs | 10 ++ .../Controls/MasterDetailsView.Metadata.cs | 3 + .../Controls/MasterDetailsView.Typedata.cs | 20 +++ .../Controls/Menu.Metadata.cs | 4 + .../Controls/Menu.Typedata.cs | 10 ++ .../Controls/MenuItem.Metadata.cs | 4 + .../Controls/MenuItem.Typedata.cs | 13 ++ .../Controls/OrbitView.Metadata.cs | 3 + .../Controls/OrbitView.Typedata.cs | 20 +++ .../Controls/RadialGauge.Metadata.cs | 5 + .../Controls/RadialGauge.Typedata.cs | 30 ++++ .../Controls/RadialProgressBar.Metadata.cs | 5 + .../Controls/RadialProgressBar.Typedata.cs | 12 ++ .../Controls/RangeSelector.Metadata.cs | 3 + .../Controls/RangeSelector.Typedata.cs | 13 ++ .../Controls/RotatorTile.Metadata.cs | 3 + .../Controls/RotatorTile.Typedata.cs | 15 ++ .../Controls/ScrollHeader.Metadata.cs | 3 + .../Controls/ScrollHeader.Typedata.cs | 10 ++ .../Controls/TextToolbar.Metadata.cs | 3 + .../Controls/TextToolbar.Typedata.cs | 15 ++ .../Controls/TileControl.Metadata.cs | 3 + .../Controls/TileControl.Typedata.cs | 20 +++ .../Controls/WrapPanel.Metadata.cs | 3 + .../Controls/WrapPanel.Typedata.cs | 12 ++ .../MetadataRegistration.cs | 6 + ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 2 +- ...Toolkit.Uwp.UI.Controls.DesignTools.csproj | 156 ++++++++++++++++++ .../Controls/MarkdownTextBlock.Metadata.cs | 3 + .../Controls/MarkdownTextBlock.Typedata.cs | 38 +++++ .../MetadataRegistration.cs | 6 + ...kit.Uwp.UI.Controls.Markdown.Design.csproj | 2 +- ...wp.UI.Controls.Markdown.DesignTools.csproj | 107 ++++++++++++ ...ft.Toolkit.Uwp.UI.Controls.Markdown.csproj | 19 ++- .../Microsoft.Toolkit.Uwp.UI.Controls.csproj | 10 +- Windows Community Toolkit.sln | 112 +++++++++---- .../Windows.Toolkit.VisualStudio.Design.props | 21 +++ 68 files changed, 1085 insertions(+), 53 deletions(-) create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj create mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj create mode 100644 build/Windows.Toolkit.VisualStudio.Design.props diff --git a/Directory.Build.props b/Directory.Build.props index 54b7668bb20..9048c242b14 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -104,4 +104,6 @@ + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs index 0718c660d20..ccc45ad9e97 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs @@ -10,6 +10,11 @@ using Microsoft.Windows.Design.Features; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.Model; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Features; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; +using Microsoft.VisualStudio.DesignTools.Extensibility.Model; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design @@ -18,8 +23,8 @@ internal class DataGridDefaults : DefaultInitializer { public override void InitializeDefaults(ModelItem item) { - item.Properties[nameof(DataGrid.Height)].SetValue(50); - item.Properties[nameof(DataGrid.Width)].SetValue(100); + item.Properties[nameof(DataGrid.Height)].SetValue(50d); + item.Properties[nameof(DataGrid.Width)].SetValue(100d); } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs index bda869c3c58..988bd48a9bd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs @@ -16,5 +16,100 @@ internal static partial class ControlTypes internal static readonly Type DataGridCheckBoxColumn = typeof(DataGridCheckBoxColumn); internal static readonly Type DataGridTemplateColumn = typeof(DataGridTemplateColumn); } +#else + internal static partial class ControlTypes + { + internal const string DataGrid = RootNamespace + "." + nameof(DataGrid); + internal const string DataGridColumn = RootNamespace + "." + nameof(DataGridColumn); + internal const string DataGridBoundColumn = RootNamespace + "." + nameof(DataGridBoundColumn); + internal const string DataGridTextColumn = RootNamespace + "." + nameof(DataGridTextColumn); + internal const string DataGridCheckBoxColumn = RootNamespace + "." + nameof(DataGridCheckBoxColumn); + internal const string DataGridTemplateColumn = RootNamespace + "." + nameof(DataGridTemplateColumn); + } + + internal static class DataGrid + { + internal const string AlternatingRowBackground = nameof(AlternatingRowBackground); + internal const string AreRowDetailsFrozen = nameof(AreRowDetailsFrozen); + internal const string AreRowGroupHeadersFrozen = nameof(AreRowGroupHeadersFrozen); + internal const string AutoGenerateColumns = nameof(AutoGenerateColumns); + internal const string CanUserReorderColumns = nameof(CanUserReorderColumns); + internal const string CanUserResizeColumns = nameof(CanUserResizeColumns); + internal const string CanUserSortColumns = nameof(CanUserSortColumns); + internal const string CellStyle = nameof(CellStyle); + internal const string ClipboardCopyMode = nameof(ClipboardCopyMode); + internal const string ColumnHeaderHeight = nameof(ColumnHeaderHeight); + internal const string ColumnHeaderStyle = nameof(ColumnHeaderStyle); + internal const string Columns = nameof(Columns); + internal const string ColumnWidth = nameof(ColumnWidth); + internal const string CurrentColumn = nameof(CurrentColumn); + internal const string DragIndicatorStyle = nameof(DragIndicatorStyle); + internal const string DropLocationIndicatorStyle = nameof(DropLocationIndicatorStyle); + internal const string FrozenColumnCount = nameof(FrozenColumnCount); + internal const string GridLinesVisibility = nameof(GridLinesVisibility); + internal const string HeadersVisibility = nameof(HeadersVisibility); + internal const string Height = nameof(Height); + internal const string HorizontalGridLinesBrush = nameof(HorizontalGridLinesBrush); + internal const string HorizontalScrollBarVisibility = nameof(HorizontalScrollBarVisibility); + internal const string IsReadOnly = nameof(IsReadOnly); + internal const string IsValid = nameof(IsValid); + internal const string ItemsSource = nameof(ItemsSource); + internal const string MaxColumnWidth = nameof(MaxColumnWidth); + internal const string MinColumnWidth = nameof(MinColumnWidth); + internal const string RowBackground = nameof(RowBackground); + internal const string RowDetailsTemplate = nameof(RowDetailsTemplate); + internal const string RowDetailsVisibilityMode = nameof(RowDetailsVisibilityMode); + internal const string RowGroupHeaderPropertyNameAlternative = nameof(RowGroupHeaderPropertyNameAlternative); + internal const string RowGroupHeaderStyles = nameof(RowGroupHeaderStyles); + internal const string RowHeaderStyle = nameof(RowHeaderStyle); + internal const string RowHeaderWidth = nameof(RowHeaderWidth); + internal const string RowHeight = nameof(RowHeight); + internal const string RowStyle = nameof(RowStyle); + internal const string SelectedIndex = nameof(SelectedIndex); + internal const string SelectedItem = nameof(SelectedItem); + internal const string SelectedItems = nameof(SelectedItems); + internal const string SelectionMode = nameof(SelectionMode); + internal const string VerticalGridLinesBrush = nameof(VerticalGridLinesBrush); + internal const string VerticalScrollBarVisibility = nameof(VerticalScrollBarVisibility); + internal const string Width = nameof(Width); + } + + internal static class DataGridColumn + { + internal const string CanUserResize = nameof(CanUserResize); + internal const string CanUserSort = nameof(CanUserSort); + internal const string Header = nameof(Header); + internal const string HeaderStyle = nameof(HeaderStyle); + internal const string MaxWidth = nameof(MaxWidth); + internal const string MinWidth = nameof(MinWidth); + internal const string SortDirection = nameof(SortDirection); + internal const string Visibility = nameof(Visibility); + internal const string Width = nameof(Width); + } + + internal static class DataGridBoundColumn + { + internal const string Binding = nameof(Binding); + } + + internal static class DataGridTextColumn + { + internal const string FontFamily = nameof(FontFamily); + internal const string FontSize = nameof(FontSize); + internal const string FontStyle = nameof(FontStyle); + internal const string FontWeight = nameof(FontWeight); + internal const string Foreground = nameof(Foreground); + } + + internal static class DataGridCheckBoxColumn + { + internal const string IsThreeState = nameof(IsThreeState); + } + + internal static class DataGridTemplateColumn + { + internal const string CellEditingTemplate = nameof(CellEditingTemplate); + internal const string CellTemplate = nameof(CellTemplate); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs index e173892976c..4968dc766df 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs @@ -9,6 +9,8 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif [assembly: ProvideMetadata(typeof(MetadataRegistration))] @@ -31,6 +33,10 @@ public MetadataRegistration() : base() AssemblyName an = t.Assembly.GetName(); AssemblyFullName = an.FullName; XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; +#else + var AssemblyName = ControlTypes.RootNamespace + ".DataGrid"; + AssemblyFullName = $"{AssemblyName}, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null"; + XmlResourceName = $"{AssemblyName}.Design.{AssemblyName}.xml"; #endif } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj index e4296030a32..6d2d306c6dd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj @@ -4,7 +4,7 @@ Debug x86 - {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1} + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8} Library Properties Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj new file mode 100644 index 00000000000..71cbce85b89 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj @@ -0,0 +1,107 @@ + + + + + Debug + x86 + {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1} + Library + Properties + Microsoft.Toolkit.Uwp.UI.Controls.Design + Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools + 512 + 8.1 + v4.7.2 + false + + + true + ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\uap10.0.17763\Design\ + full + false + TRACE;DEBUG + x86 + + + ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\uap10.0.17763\Design\ + pdbonly + x86 + true + TRACE + + + $(AssetTargetFallback);uap10.0.17763 + + + + + + + + False + False + + + False + False + + + + + + + + + + False + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd + + + + + + + + + + $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd + WindowsRuntime + False + + + $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd + WindowsRuntime + False + + + + + + + + + + + Code + + + True + True + Resources.resx + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.xml + False + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj index fb417ede285..6d63e41a3d6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj @@ -4,7 +4,7 @@ Windows Community Toolkit Controls DataGrid This library provides a XAML DataGrid control. It is part of the Windows Community Toolkit. - + UWP Toolkit Windows Controls XAML DataGrid Microsoft.Toolkit.Uwp.UI.Controls @@ -14,7 +14,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs index 2e997b06ee6..c2b4b4eff72 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs @@ -9,6 +9,13 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { +#if !VS_DESIGNER_PROCESS_ISOLATION + internal static partial class ControlTypes + { + // HACK: Don't forget to update, if the namespace changes. + public const string RootNamespace = "Microsoft.Toolkit.Uwp.UI.Controls"; + } +#endif /// /// Names for ToolboxCategoryAttribute. /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs index d81169306db..e005adff941 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs @@ -16,6 +16,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.Design.Common @@ -141,6 +144,8 @@ private void AddDescriptions(AttributeTableBuilder builder) var type = Type.GetType(typeName + ", " + AssemblyFullName); #if VS_DESIGNER_PROCESS_ISOLATION var typeID = type; +#else + var typeID = typeName; #endif if (type != null && type.IsPublic && type.IsClass && type.IsSubclassOf(PlatformTypes.DependencyObject)) { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs index 19049b77f7f..a4de7f4eb60 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs @@ -8,6 +8,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.Design.Types diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs index ff5387adfd6..f98324d5e1f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs index e40e367c637..8f7e1c577f8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs @@ -11,5 +11,19 @@ internal static partial class ControlTypes { internal static readonly Type AdaptiveGridView = typeof(AdaptiveGridView); } +#else + internal static partial class ControlTypes + { + internal const string AdaptiveGridView = RootNamespace + "." + nameof(AdaptiveGridView); + } + + internal static class AdaptiveGridView + { + internal const string DesiredWidth = nameof(DesiredWidth); + internal const string ItemClickCommand = nameof(ItemClickCommand); + internal const string ItemHeight = nameof(ItemHeight); + internal const string OneRowModeEnabled = nameof(OneRowModeEnabled); + internal const string StretchContentForSingleRow = nameof(StretchContentForSingleRow); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs index bf5dabbe188..61f783b83f8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs index 4f09a81a450..f5e9668d35a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs @@ -11,5 +11,19 @@ internal static partial class ControlTypes { internal static readonly Type BladeItem = typeof(BladeItem); } +#else + internal static partial class ControlTypes + { + internal const string BladeItem = RootNamespace + "." + nameof(BladeItem); + } + + internal static class BladeItem + { + internal const string CloseButtonBackground = nameof(CloseButtonBackground); + internal const string CloseButtonForeground = nameof(CloseButtonForeground); + internal const string IsOpen = nameof(IsOpen); + internal const string TitleBarBackground = nameof(TitleBarBackground); + internal const string TitleBarVisibility = nameof(TitleBarVisibility); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs index ebbb627328a..7293304a390 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs @@ -10,6 +10,10 @@ using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.PropertyEditing; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; +using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs index a628dedeefe..239cc9b3e4c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs @@ -11,5 +11,18 @@ internal static partial class ControlTypes { internal static readonly Type BladeView = typeof(BladeView); } +#else + internal static partial class ControlTypes + { + internal const string BladeView = RootNamespace + "." + nameof(BladeView); + } + + internal static class BladeView + { + internal const string ActiveBlades = nameof(ActiveBlades); + internal const string AutoCollapseCountThreshold = nameof(AutoCollapseCountThreshold); + internal const string BladeMode = nameof(BladeMode); + internal const string Items = nameof(Items); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs index 635f36e1e85..d7479e31b6d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs index 6880400757f..dd3f91b3195 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs @@ -11,5 +11,25 @@ internal static partial class ControlTypes { internal static readonly Type Carousel = typeof(Carousel); } +#else + internal static partial class ControlTypes + { + internal const string Carousel = RootNamespace + "." + nameof(Carousel); + } + + internal static class Carousel + { + internal const string EasingFunction = nameof(EasingFunction); + internal const string InvertPositive = nameof(InvertPositive); + internal const string ItemDepth = nameof(ItemDepth); + internal const string ItemMargin = nameof(ItemMargin); + internal const string ItemRotationX = nameof(ItemRotationX); + internal const string ItemRotationY = nameof(ItemRotationY); + internal const string ItemRotationZ = nameof(ItemRotationZ); + internal const string Orientation = nameof(Orientation); + internal const string SelectedIndex = nameof(SelectedIndex); + internal const string SelectedItem = nameof(SelectedItem); + internal const string TransitionDuration = nameof(TransitionDuration); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs index 9d477e91533..f827722cd10 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs @@ -12,6 +12,12 @@ using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.Model; using Microsoft.Windows.Design.PropertyEditing; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Features; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; +using Microsoft.VisualStudio.DesignTools.Extensibility.Model; +using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs index fd6db2408cb..9cbd156cb25 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs @@ -11,5 +11,20 @@ internal static partial class ControlTypes { internal static readonly Type DropShadowPanel = typeof(DropShadowPanel); } +#else + internal static partial class ControlTypes + { + internal const string DropShadowPanel = RootNamespace + "." + nameof(DropShadowPanel); + } + + internal static class DropShadowPanel + { + internal const string BlurRadius = nameof(BlurRadius); + internal const string Color = nameof(Color); + internal const string OffsetX = nameof(OffsetX); + internal const string OffsetY = nameof(OffsetY); + internal const string OffsetZ = nameof(OffsetZ); + internal const string ShadowOpacity = nameof(ShadowOpacity); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs index e2351d3954b..cbb1fb62b42 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs index aefbbcabd79..fe171f65d79 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs @@ -11,5 +11,18 @@ internal static partial class ControlTypes { internal static readonly Type Expander = typeof(Expander); } +#else + internal static partial class ControlTypes + { + internal const string Expander = RootNamespace + "." + nameof(Expander); + } + + internal static class Expander + { + internal const string ExpandDirection = nameof(ExpandDirection); + internal const string Header = nameof(Header); + internal const string HeaderTemplate = nameof(HeaderTemplate); + internal const string IsExpanded = nameof(IsExpanded); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs index 5da389864ce..e18d236231f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs index 8aa7698491e..0f91303425e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs @@ -11,5 +11,22 @@ internal static partial class ControlTypes { internal static readonly Type GridSplitter = typeof(GridSplitter); } +#else + internal static partial class ControlTypes + { + internal const string GridSplitter = RootNamespace + "." + nameof(GridSplitter); + } + + internal static class GridSplitter + { + internal const string CursorBehavior = nameof(CursorBehavior); + internal const string Element = nameof(Element); + internal const string GripperCursor = nameof(GripperCursor); + internal const string GripperCustomCursorResource = nameof(GripperCustomCursorResource); + internal const string GripperForeground = nameof(GripperForeground); + internal const string ParentLevel = nameof(ParentLevel); + internal const string ResizeBehavior = nameof(ResizeBehavior); + internal const string ResizeDirection = nameof(ResizeDirection); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs index 14414c06a3a..ff4f7160344 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs index e7d61613bda..2e90abfe7bb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs @@ -11,5 +11,15 @@ internal static partial class ControlTypes { internal static readonly Type ImageEx = typeof(ImageEx); } +#else + internal static partial class ControlTypes + { + internal const string ImageEx = RootNamespace + "." + nameof(ImageEx); + } + + internal static class ImageEx + { + internal const string NineGrid = nameof(NineGrid); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs index 8f96630e1ee..c7b8d6070a1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs index 57cec7a3acb..9c72fe287b9 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs @@ -11,5 +11,15 @@ internal static partial class ControlTypes { internal static readonly Type InAppNotification = typeof(InAppNotification); } +#else + internal static partial class ControlTypes + { + internal const string InAppNotification = RootNamespace + "." + nameof(InAppNotification); + } + + internal static class InAppNotification + { + internal const string ShowDismissButton = nameof(ShowDismissButton); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs index 90cb8bc6d68..1523fab35f1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs index a3ac747ef94..70b048495ef 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs @@ -11,5 +11,16 @@ internal static partial class ControlTypes { internal static readonly Type LayoutTransformControl = typeof(LayoutTransformControl); } +#else + internal static partial class ControlTypes + { + internal const string LayoutTransformControl = RootNamespace + "." + nameof(LayoutTransformControl); + } + + internal static class LayoutTransformControl + { + internal const string Child = nameof(Child); + internal const string Transform = nameof(Transform); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs index 9aa714858c4..d0dd2d05e49 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs index 8018970dc65..e2823aec8ea 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs @@ -11,5 +11,15 @@ internal static partial class ControlTypes { internal static readonly Type Loading = typeof(Loading); } +#else + internal static partial class ControlTypes + { + internal const string Loading = RootNamespace + "." + nameof(Loading); + } + + internal static class Loading + { + internal const string IsLoading = nameof(IsLoading); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs index 88590d30870..2d2287dcf24 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs index ef4a1f58395..82cc90b4792 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs @@ -11,5 +11,25 @@ internal static partial class ControlTypes { internal static readonly Type MasterDetailsView = typeof(MasterDetailsView); } +#else + internal static partial class ControlTypes + { + internal const string MasterDetailsView = RootNamespace + "." + nameof(MasterDetailsView); + } + + internal static class MasterDetailsView + { + internal const string DetailsCommandBar = nameof(DetailsCommandBar); + internal const string DetailsTemplate = nameof(DetailsTemplate); + internal const string MasterCommandBar = nameof(MasterCommandBar); + internal const string MasterHeader = nameof(MasterHeader); + internal const string MasterHeaderTemplate = nameof(MasterHeaderTemplate); + internal const string MasterPaneBackground = nameof(MasterPaneBackground); + internal const string MasterPaneWidth = nameof(MasterPaneWidth); + internal const string NoSelectionContent = nameof(NoSelectionContent); + internal const string NoSelectionContentTemplate = nameof(NoSelectionContentTemplate); + internal const string SelectedItem = nameof(SelectedItem); + internal const string ViewState = nameof(ViewState); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs index ddbe6af0f42..fc0e06b6f49 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs @@ -10,6 +10,10 @@ using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.PropertyEditing; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; +using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs index 37497ebd8f0..6a024be643f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs @@ -11,5 +11,15 @@ internal static partial class ControlTypes { internal static readonly Type Menu = typeof(Menu); } +#else + internal static partial class ControlTypes + { + internal const string Menu = RootNamespace + "." + nameof(Menu); + } + + internal static class Menu + { + internal const string Items = nameof(Items); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs index 796229dbca6..f91ae6d2004 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs @@ -10,6 +10,10 @@ using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.PropertyEditing; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; +using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs index 5f4f392bd47..35a9f6030cb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs @@ -11,5 +11,18 @@ internal static partial class ControlTypes { internal static readonly Type MenuItem = typeof(MenuItem); } +#else + internal static partial class ControlTypes + { + internal const string MenuItem = RootNamespace + "." + nameof(MenuItem); + } + + internal static class MenuItem + { + internal const string Header = nameof(Header); + internal const string HeaderTemplate = nameof(HeaderTemplate); + internal const string IsOpened = nameof(IsOpened); + internal const string Items = nameof(Items); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs index 24cdbe58abe..f11c70f904b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs index 31d3b1e1b72..84f044d48e0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs @@ -11,5 +11,25 @@ internal static partial class ControlTypes { internal static readonly Type OrbitView = typeof(OrbitView); } +#else + internal static partial class ControlTypes + { + internal const string OrbitView = RootNamespace + "." + nameof(OrbitView); + } + + internal static class OrbitView + { + internal const string AnchorColor = nameof(AnchorColor); + internal const string AnchorsEnabled = nameof(AnchorsEnabled); + internal const string AnchorThickness = nameof(AnchorThickness); + internal const string CenterContent = nameof(CenterContent); + internal const string IsItemClickEnabled = nameof(IsItemClickEnabled); + internal const string MaxItemSize = nameof(MaxItemSize); + internal const string MinItemSize = nameof(MinItemSize); + internal const string OrbitColor = nameof(OrbitColor); + internal const string OrbitDashArray = nameof(OrbitDashArray); + internal const string OrbitsEnabled = nameof(OrbitsEnabled); + internal const string OrbitThickness = nameof(OrbitThickness); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs index c2903dd33a0..41cc5992638 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs @@ -9,6 +9,11 @@ using Microsoft.Windows.Design.Features; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.Model; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Features; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; +using Microsoft.VisualStudio.DesignTools.Extensibility.Model; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs index a3bccb4f54d..12c06a03103 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs @@ -11,5 +11,35 @@ internal static partial class ControlTypes { internal static readonly Type RadialGauge = typeof(RadialGauge); } +#else + internal static partial class ControlTypes + { + internal const string RadialGauge = RootNamespace + "." + nameof(RadialGauge); + } + + internal static class RadialGauge + { + internal const string IsInteractive = nameof(IsInteractive); + internal const string MaxAngle = nameof(MaxAngle); + internal const string Maximum = nameof(Maximum); + internal const string MinAngle = nameof(MinAngle); + internal const string Minimum = nameof(Minimum); + internal const string NeedleBrush = nameof(NeedleBrush); + internal const string NeedleLength = nameof(NeedleLength); + internal const string NeedleWidth = nameof(NeedleWidth); + internal const string ScaleBrush = nameof(ScaleBrush); + internal const string ScalePadding = nameof(ScalePadding); + internal const string ScaleTickWidth = nameof(ScaleTickWidth); + internal const string ScaleWidth = nameof(ScaleWidth); + internal const string StepSize = nameof(StepSize); + internal const string TickBrush = nameof(TickBrush); + internal const string TickLength = nameof(TickLength); + internal const string TickSpacing = nameof(TickSpacing); + internal const string TickWidth = nameof(TickWidth); + internal const string TrailBrush = nameof(TrailBrush); + internal const string Unit = nameof(Unit); + internal const string Value = nameof(Value); + internal const string ValueStringFormat = nameof(ValueStringFormat); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs index 549237a4c8f..b1e3ef29c39 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs @@ -9,6 +9,11 @@ using Microsoft.Windows.Design.Features; using Microsoft.Windows.Design.Metadata; using Microsoft.Windows.Design.Model; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Features; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; +using Microsoft.VisualStudio.DesignTools.Extensibility.Model; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs index 7fa42b76480..079cdc98be6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs @@ -11,5 +11,17 @@ internal static partial class ControlTypes { internal static readonly Type RadialProgressBar = typeof(RadialProgressBar); } +#else + internal static partial class ControlTypes + { + internal const string RadialProgressBar = RootNamespace + "." + nameof(RadialProgressBar); + } + + internal static class RadialProgressBar + { + internal const string Outline = nameof(Outline); + internal const string Thickness = nameof(Thickness); + internal const string Value = nameof(Value); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs index f14d0bf0958..ea28e6d24f6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs index ba407bad83e..51dcc9261f8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs @@ -11,5 +11,18 @@ internal static partial class ControlTypes { internal static readonly Type RangeSelector = typeof(RangeSelector); } +#else + internal static partial class ControlTypes + { + internal const string RangeSelector = RootNamespace + "." + nameof(RangeSelector); + } + + internal static class RangeSelector + { + internal const string Maximum = nameof(Maximum); + internal const string Minimum = nameof(Minimum); + internal const string RangeMax = nameof(RangeMax); + internal const string RangeMin = nameof(RangeMin); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs index b2fc73e058e..3fb48d62133 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs index 63524a35cbb..fe6b3f57784 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs @@ -11,5 +11,20 @@ internal static partial class ControlTypes { internal static readonly Type RotatorTile = typeof(RotatorTile); } +#else + internal static partial class ControlTypes + { + internal const string RotatorTile = RootNamespace + "." + nameof(RotatorTile); + } + + internal static class RotatorTile + { + internal const string CurrentItem = nameof(CurrentItem); + internal const string ExtraRandomDuration = nameof(ExtraRandomDuration); + internal const string ItemsSource = nameof(ItemsSource); + internal const string ItemTemplate = nameof(ItemTemplate); + internal const string RotateDirection = nameof(RotateDirection); + internal const string RotationDelay = nameof(RotationDelay); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs index ae4b8097017..4580a2efba4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs index e503885f899..ee4edbdc33d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs @@ -11,5 +11,15 @@ internal static partial class ControlTypes { internal static readonly Type ScrollHeader = typeof(ScrollHeader); } +#else + internal static partial class ControlTypes + { + internal const string ScrollHeader = RootNamespace + "." + nameof(ScrollHeader); + } + + internal static class ScrollHeader + { + internal const string Mode = nameof(Mode); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs index 549ba936f14..dd392a17fd8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs index 8bbda900127..0e2a04ecded 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs @@ -11,5 +11,20 @@ internal static partial class ControlTypes { internal static readonly Type TextToolbar = typeof(TextToolbar); } +#else + internal static partial class ControlTypes + { + internal const string TextToolbar = RootNamespace + "." + nameof(TextToolbar); + } + + internal static class TextToolbar + { + internal const string ButtonModifications = nameof(ButtonModifications); + internal const string CustomButtons = nameof(CustomButtons); + internal const string DefaultButtons = nameof(DefaultButtons); + internal const string Editor = nameof(Editor); + internal const string Format = nameof(Format); + internal const string Formatter = nameof(Formatter); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs index 4cfa85f1d47..76b69a3eda1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs index 2a60a846bdc..988b6c795a8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs @@ -11,5 +11,25 @@ internal static partial class ControlTypes { internal static readonly Type TileControl = typeof(TileControl); } +#else + internal static partial class ControlTypes + { + internal const string TileControl = RootNamespace + "." + nameof(TileControl); + } + + internal static class TileControl + { + internal const string AnimationDuration = nameof(AnimationDuration); + internal const string AnimationStepX = nameof(AnimationStepX); + internal const string AnimationStepY = nameof(AnimationStepY); + internal const string ImageAlignment = nameof(ImageAlignment); + internal const string ImageSource = nameof(ImageSource); + internal const string IsAnimated = nameof(IsAnimated); + internal const string OffsetX = nameof(OffsetX); + internal const string OffsetY = nameof(OffsetY); + internal const string ParallaxSpeedRatio = nameof(ParallaxSpeedRatio); + internal const string ScrollOrientation = nameof(ScrollOrientation); + internal const string ScrollViewerContainer = nameof(ScrollViewerContainer); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs index f1cd4b0f430..cbef72dab05 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs index b061cb0d45c..e946329f44f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs @@ -11,5 +11,17 @@ internal static partial class ControlTypes { internal static readonly Type WrapPanel = typeof(WrapPanel); } +#else + internal static partial class ControlTypes + { + internal const string WrapPanel = RootNamespace + "." + nameof(WrapPanel); + } + + internal static class WrapPanel + { + internal const string HorizontalSpacing = nameof(HorizontalSpacing); + internal const string Orientation = nameof(Orientation); + internal const string VerticalSpacing = nameof(VerticalSpacing); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs index 9999b770aeb..d9519960bef 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs @@ -9,6 +9,8 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif [assembly: ProvideMetadata(typeof(MetadataRegistration))] @@ -31,6 +33,10 @@ public MetadataRegistration() : base() AssemblyName an = t.Assembly.GetName(); AssemblyFullName = an.FullName; XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; +#else + var AssemblyName = ControlTypes.RootNamespace; + AssemblyFullName = $"{AssemblyName}, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null"; + XmlResourceName = $"{AssemblyName}.Design.{AssemblyName}.xml"; #endif } } 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 01030bf156f..25c730a8862 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 @@ -4,7 +4,7 @@ Debug x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0} + {749E4D01-D6C1-4B19-903B-712D63925FEB} Library Properties Microsoft.Toolkit.Uwp.UI.Controls.Design 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 new file mode 100644 index 00000000000..cb7387f0f66 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj @@ -0,0 +1,156 @@ + + + + + Debug + x86 + {7AEFC959-ED7C-4D96-9E92-72609B40FBE0} + Library + Properties + Microsoft.Toolkit.Uwp.UI.Controls.Design + Microsoft.Toolkit.Uwp.UI.Controls.DesignTools + 512 + 8.1 + v4.7.2 + false + + + true + ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\uap10.0.17763\Design\ + full + false + TRACE;DEBUG + x86 + + + ..\Microsoft.Toolkit.Uwp.UI.Controls\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.xml + False + + + + + + + + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs index 073b487da60..0172b7b8875 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs @@ -9,6 +9,9 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design; using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility; +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs index 28fc9e48bf4..cd03a7d38f3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs @@ -11,5 +11,43 @@ internal static partial class ControlTypes { internal static readonly Type MarkdownTextBlock = typeof(MarkdownTextBlock); } +#else + internal static partial class ControlTypes + { + internal const string MarkdownTextBlock = RootNamespace + "." + nameof(MarkdownTextBlock); + } + + internal static class MarkdownTextBlock + { + internal const string CodeBackground = nameof(CodeBackground); + internal const string CodeBorderBrush = nameof(CodeBorderBrush); + internal const string CodeBorderThickness = nameof(CodeBorderThickness); + internal const string CodeFontFamily = nameof(CodeFontFamily); + internal const string CodeForeground = nameof(CodeForeground); + internal const string CodeMargin = nameof(CodeMargin); + internal const string CodePadding = nameof(CodePadding); + internal const string HorizontalRuleBrush = nameof(HorizontalRuleBrush); + internal const string HorizontalRuleMargin = nameof(HorizontalRuleMargin); + internal const string HorizontalRuleThickness = nameof(HorizontalRuleThickness); + internal const string ImageStretch = nameof(ImageStretch); + internal const string IsTextSelectionEnabled = nameof(IsTextSelectionEnabled); + internal const string LinkForeground = nameof(LinkForeground); + internal const string ListBulletSpacing = nameof(ListBulletSpacing); + internal const string ListGutterWidth = nameof(ListGutterWidth); + internal const string ListMargin = nameof(ListMargin); + internal const string ParagraphMargin = nameof(ParagraphMargin); + internal const string QuoteBackground = nameof(QuoteBackground); + internal const string QuoteBorderBrush = nameof(QuoteBorderBrush); + internal const string QuoteBorderThickness = nameof(QuoteBorderThickness); + internal const string QuoteForeground = nameof(QuoteForeground); + internal const string QuoteMargin = nameof(QuoteMargin); + internal const string QuotePadding = nameof(QuotePadding); + internal const string TableBorderBrush = nameof(TableBorderBrush); + internal const string TableBorderThickness = nameof(TableBorderThickness); + internal const string TableCellPadding = nameof(TableCellPadding); + internal const string TableMargin = nameof(TableMargin); + internal const string Text = nameof(Text); + internal const string TextWrapping = nameof(TextWrapping); + } #endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs index b804d9b759f..0bf905a14a0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs @@ -9,6 +9,8 @@ #if VS_DESIGNER_PROCESS_ISOLATION using Microsoft.Windows.Design.Metadata; +#else +using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; #endif [assembly: ProvideMetadata(typeof(MetadataRegistration))] @@ -31,6 +33,10 @@ public MetadataRegistration() : base() AssemblyName an = t.Assembly.GetName(); AssemblyFullName = an.FullName; XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; +#else + var AssemblyName = ControlTypes.RootNamespace + ".Markdown"; + AssemblyFullName = $"{AssemblyName}, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null"; + XmlResourceName = $"{AssemblyName}.Design.{AssemblyName}.xml"; #endif } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj index 02999b45652..c62d1f72d0d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj @@ -4,7 +4,7 @@ Debug x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40} + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402} Library Properties Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj new file mode 100644 index 00000000000..2613819d155 --- /dev/null +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj @@ -0,0 +1,107 @@ + + + + + Debug + x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40} + Library + Properties + Microsoft.Toolkit.Uwp.UI.Controls.Design + Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools + 512 + 8.1 + v4.7.2 + false + + + true + ..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Debug\uap10.0.17763\Design\ + full + false + TRACE;DEBUG + x86 + + + ..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Release\uap10.0.17763\Design\ + pdbonly + x86 + true + TRACE + + + $(AssetTargetFallback);uap10.0.17763 + + + + + + + + False + False + + + False + False + + + + + + + + + + False + $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd + + + + + + + + + + $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd + WindowsRuntime + False + + + $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd + WindowsRuntime + False + + + + + + + + + + + Code + + + True + True + Resources.resx + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + Microsoft.Toolkit.Uwp.UI.Controls.Markdown.xml + False + + + + + + \ No newline at end of file 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 ede2fce9ac4..da2194150b7 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 @@ -4,6 +4,7 @@ Windows Community Toolkit Controls Markdown This library provides a XAML MarkdownTextBlock control, an efficient and extensible control that can parse and render markdown. It is part of the Windows Community Toolkit. + UWP Toolkit Windows Controls XAML Markdown MarkdownTextBlock Microsoft.Toolkit.Uwp.UI.Controls @@ -12,15 +13,8 @@ - - - - - - - - - + + @@ -38,6 +32,13 @@ + + + + + + + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj index 294ac153355..bf18c15c898 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj @@ -5,7 +5,7 @@ Windows Community Toolkit Controls This library provides XAML templated controls. It is part of the Windows Community Toolkit. - + Controls: - AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space. - BladeView: Provides a horizontal collection of blades for master-detail scenarios. @@ -48,23 +48,21 @@ - + - + - + - - diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index 19e1beb3709..be4d53a5077 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -55,12 +55,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution settings.xamlstyler = settings.xamlstyler 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}" +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", "{749E4D01-D6C1-4B19-903B-712D63925FEB}" ProjectSection(ProjectDependencies) = postProject {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj", "{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Design\Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}" + ProjectSection(ProjectDependencies) = postProject + {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj", "{618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}" + ProjectSection(ProjectDependencies) = postProject + {DAEB9CEC-C817-33B2-74B2-BC379380DB72} = {DAEB9CEC-C817-33B2-74B2-BC379380DB72} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj", "{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}" ProjectSection(ProjectDependencies) = postProject {DAEB9CEC-C817-33B2-74B2-BC379380DB72} = {DAEB9CEC-C817-33B2-74B2-BC379380DB72} EndProjectSection @@ -110,7 +120,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj", "{6FEDF199-B052-49DD-8F3E-2A9224998E0F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj", "{67FE47A0-CA93-4680-B770-A0A48C1DBC40}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj", "{6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}" + ProjectSection(ProjectDependencies) = postProject + {6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {6FEDF199-B052-49DD-8F3E-2A9224998E0F} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj", "{67FE47A0-CA93-4680-B770-A0A48C1DBC40}" + ProjectSection(ProjectDependencies) = postProject + {6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {6FEDF199-B052-49DD-8F3E-2A9224998E0F} + EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Win32.WpfCore.SampleApp", "Microsoft.Toolkit.Win32.WpfCore.SampleApp\Microsoft.Toolkit.Win32.WpfCore.SampleApp.csproj", "{0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}" EndProject @@ -480,6 +498,25 @@ Global {94994424-5F60-4CD8-ABA2-101779066208}.Release|x64.Build.0 = Release|Any CPU {94994424-5F60-4CD8-ABA2-101779066208}.Release|x86.ActiveCfg = Release|Any CPU {94994424-5F60-4CD8-ABA2-101779066208}.Release|x86.Build.0 = Release|Any CPU + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|Any CPU.ActiveCfg = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|Any CPU.Build.0 = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|ARM.ActiveCfg = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|ARM.Build.0 = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|ARM64.ActiveCfg = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|x64.ActiveCfg = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|x64.Build.0 = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|x86.ActiveCfg = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|x86.Build.0 = Debug|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|Any CPU.ActiveCfg = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|Any CPU.Build.0 = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|ARM.ActiveCfg = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|ARM.Build.0 = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|ARM64.ActiveCfg = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|ARM64.Build.0 = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|x64.ActiveCfg = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|x64.Build.0 = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|x86.ActiveCfg = Release|x86 + {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|x86.Build.0 = Release|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.ActiveCfg = Debug|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.Build.0 = Debug|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.ActiveCfg = Debug|x86 @@ -500,6 +537,25 @@ Global {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.Build.0 = Release|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.ActiveCfg = Release|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.Build.0 = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|Any CPU.ActiveCfg = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|Any CPU.Build.0 = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|ARM.ActiveCfg = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|ARM.Build.0 = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|ARM64.ActiveCfg = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|x64.ActiveCfg = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|x64.Build.0 = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|x86.ActiveCfg = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|x86.Build.0 = Debug|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|Any CPU.ActiveCfg = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|Any CPU.Build.0 = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|ARM.ActiveCfg = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|ARM.Build.0 = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|ARM64.ActiveCfg = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|ARM64.Build.0 = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|x64.ActiveCfg = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|x64.Build.0 = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|x86.ActiveCfg = Release|x86 + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|x86.Build.0 = Release|x86 {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|Any CPU.ActiveCfg = Debug|x86 {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|Any CPU.Build.0 = Debug|x86 {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM.ActiveCfg = Debug|x86 @@ -804,12 +860,6 @@ Global {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x64.Build.0 = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.ActiveCfg = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.Build.0 = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.ActiveCfg = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.Build.0 = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.ActiveCfg = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.ActiveCfg = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.ActiveCfg = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.ActiveCfg = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.ActiveCfg = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.ActiveCfg = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.Build.0 = Release|Any CPU @@ -834,13 +884,6 @@ Global {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.ActiveCfg = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Build.0 = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Deploy.0 = Debug|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.ActiveCfg = Release|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Build.0 = Release|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Deploy.0 = Release|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.ActiveCfg = Release|ARM - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.ActiveCfg = Release|ARM64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.ActiveCfg = Release|x64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.ActiveCfg = Release|x86 {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.ActiveCfg = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Build.0 = Release|Any CPU @@ -874,6 +917,25 @@ Global {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.Build.0 = Release|Any CPU {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.ActiveCfg = Release|Any CPU {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.Build.0 = Release|Any CPU + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|Any CPU.ActiveCfg = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|Any CPU.Build.0 = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|ARM.ActiveCfg = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|ARM.Build.0 = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|ARM64.ActiveCfg = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|x64.ActiveCfg = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|x64.Build.0 = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|x86.ActiveCfg = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|x86.Build.0 = Debug|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|Any CPU.ActiveCfg = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|Any CPU.Build.0 = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|ARM.ActiveCfg = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|ARM.Build.0 = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|ARM64.ActiveCfg = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|ARM64.Build.0 = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|x64.ActiveCfg = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|x64.Build.0 = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|x86.ActiveCfg = Release|x86 + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|x86.Build.0 = Release|x86 {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.ActiveCfg = Debug|x86 {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.Build.0 = Debug|x86 {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.ActiveCfg = Debug|x86 @@ -907,11 +969,6 @@ Global {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.ActiveCfg = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Build.0 = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Deploy.0 = Debug|x86 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|Any CPU.ActiveCfg = Release|x64 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM.ActiveCfg = Release|ARM - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM64.ActiveCfg = Release|ARM64 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x64.ActiveCfg = Release|x64 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x86.ActiveCfg = Release|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.ActiveCfg = Release|ARM @@ -936,11 +993,6 @@ Global {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x64.Build.0 = Debug|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x86.ActiveCfg = Debug|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x86.Build.0 = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|Any CPU.ActiveCfg = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM.ActiveCfg = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM64.ActiveCfg = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x64.ActiveCfg = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x86.ActiveCfg = Debug|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|Any CPU.Build.0 = Release|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|ARM.ActiveCfg = Release|Any CPU @@ -961,11 +1013,6 @@ Global {C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x64.Build.0 = Debug|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x86.ActiveCfg = Debug|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x86.Build.0 = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|Any CPU.ActiveCfg = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM.ActiveCfg = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM64.ActiveCfg = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x64.ActiveCfg = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x86.ActiveCfg = Debug|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|Any CPU.ActiveCfg = Release|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|Any CPU.Build.0 = Release|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|ARM.ActiveCfg = Release|Any CPU @@ -992,7 +1039,9 @@ Global {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD} = {9333C63A-F64F-4797-82B3-017422668A5D} {1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C} = {9AD30620-667D-433C-9961-8D885EE7B762} {94994424-5F60-4CD8-ABA2-101779066208} = {9333C63A-F64F-4797-82B3-017422668A5D} + {749E4D01-D6C1-4B19-903B-712D63925FEB} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {7AEFC959-ED7C-4D96-9E92-72609B40FBE0} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} + {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6} = {B30036C4-D514-4E5B-A323-587A061772CE} {75F9EE44-3EFA-47BC-AEDD-351B9834A0AF} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} @@ -1011,6 +1060,7 @@ Global {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405} = {9AD30620-667D-433C-9961-8D885EE7B762} {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A} = {9AD30620-667D-433C-9961-8D885EE7B762} {6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} + {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {67FE47A0-CA93-4680-B770-A0A48C1DBC40} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {05C83067-FA46-45E2-BEC4-EDEE84AD18D0} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} = {B30036C4-D514-4E5B-A323-587A061772CE} diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props new file mode 100644 index 00000000000..de91a09dfad --- /dev/null +++ b/build/Windows.Toolkit.VisualStudio.Design.props @@ -0,0 +1,21 @@ + + + + $([MSBuild]::EnsureTrailingSlash($([MSBuild]::ValueOrDefault('$(BaseIntermediateOutputPath)', 'obj')))) + + + + + + $(BaseIntermediateOutputPath)Design\ + + + + + $(BaseIntermediateOutputPath)DesignTools\ + + + + + + \ No newline at end of file From 9019a28713086ecfafdff98f8c752dea3e21b2ff Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Wed, 25 Nov 2020 09:30:49 +0530 Subject: [PATCH 8/8] Remove older XAML DesignTime support The process isolated designer is replaced by surface isolated designer from Visual Studio IDE v16.3 onwards --- .../Controls/DataGrid.Metadata.cs | 7 - .../Controls/DataGrid.Typedata.cs | 12 -- .../MetadataRegistration.cs | 43 ----- ...kit.Uwp.UI.Controls.DataGrid.Design.csproj | 114 ------------ ...wp.UI.Controls.DataGrid.DesignTools.csproj | 2 +- .../Common/Constants.cs | 3 +- .../Common/MetadataRegistrationBase.cs | 19 +- .../Common/PlatformTypes.cs | 5 - .../Controls/AdaptiveGridView.Metadata.cs | 5 - .../Controls/AdaptiveGridView.Typedata.cs | 7 - .../Controls/BladeItem.Metadata.cs | 5 - .../Controls/BladeItem.Typedata.cs | 7 - .../Controls/BladeView.Metadata.cs | 6 - .../Controls/BladeView.Typedata.cs | 7 - .../Controls/Carousel.Metadata.cs | 5 - .../Controls/Carousel.Typedata.cs | 7 - .../Controls/DropShadowPanel.Metadata.cs | 8 - .../Controls/DropShadowPanel.Typedata.cs | 7 - .../Controls/Expander.Metadata.cs | 5 - .../Controls/Expander.Typedata.cs | 7 - .../Controls/GridSplitter.Metadata.cs | 5 - .../Controls/GridSplitter.Typedata.cs | 7 - .../Controls/ImageEx.Metadata.cs | 6 - .../Controls/ImageEx.Typedata.cs | 7 - .../Controls/InAppNotification.Metadata.cs | 5 - .../Controls/InAppNotification.Typedata.cs | 7 - .../LayoutTransitionControl.Metadata.cs | 5 - .../LayoutTransitionControl.Typedata.cs | 7 - .../Controls/Loading.Metadata.cs | 5 - .../Controls/Loading.Typedata.cs | 7 - .../Controls/MasterDetailsView.Metadata.cs | 5 - .../Controls/MasterDetailsView.Typedata.cs | 7 - .../Controls/Menu.Metadata.cs | 6 - .../Controls/Menu.Typedata.cs | 7 - .../Controls/MenuItem.Metadata.cs | 7 - .../Controls/MenuItem.Typedata.cs | 7 - .../Controls/OrbitView.Metadata.cs | 5 - .../Controls/OrbitView.Typedata.cs | 7 - .../Controls/RadialGauge.Metadata.cs | 7 - .../Controls/RadialGauge.Typedata.cs | 7 - .../Controls/RadialProgressBar.Metadata.cs | 8 - .../Controls/RadialProgressBar.Typedata.cs | 7 - .../Controls/RangeSelector.Metadata.cs | 5 - .../Controls/RangeSelector.Typedata.cs | 7 - .../Controls/RotatorTile.Metadata.cs | 5 - .../Controls/RotatorTile.Typedata.cs | 7 - .../Controls/ScrollHeader.Metadata.cs | 5 - .../Controls/ScrollHeader.Typedata.cs | 7 - .../Controls/TextToolbar.Metadata.cs | 5 - .../Controls/TextToolbar.Typedata.cs | 7 - .../Controls/TileControl.Metadata.cs | 5 - .../Controls/TileControl.Typedata.cs | 7 - .../Controls/WrapPanel.Metadata.cs | 5 - .../Controls/WrapPanel.Typedata.cs | 7 - .../MetadataRegistration.cs | 32 ++-- ...soft.Toolkit.Uwp.UI.Controls.Design.csproj | 163 ------------------ .../Controls/MarkdownTextBlock.Metadata.cs | 6 - .../Controls/MarkdownTextBlock.Typedata.cs | 7 - .../MetadataRegistration.cs | 43 ----- ...kit.Uwp.UI.Controls.Markdown.Design.csproj | 114 ------------ ...wp.UI.Controls.Markdown.DesignTools.csproj | 2 +- Windows Community Toolkit.sln | 75 -------- 62 files changed, 21 insertions(+), 915 deletions(-) delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs index ccc45ad9e97..1ff9ad74304 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs @@ -5,17 +5,10 @@ using System.ComponentModel; using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Features; -using Microsoft.Windows.Design.Metadata; -using Microsoft.Windows.Design.Model; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Features; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; using Microsoft.VisualStudio.DesignTools.Extensibility.Model; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs index 988bd48a9bd..71a73c1d9f5 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Controls/DataGrid.Typedata.cs @@ -6,17 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type DataGrid = typeof(DataGrid); - internal static readonly Type DataGridColumn = typeof(DataGridColumn); - internal static readonly Type DataGridBoundColumn = typeof(DataGridBoundColumn); - internal static readonly Type DataGridTextColumn = typeof(DataGridTextColumn); - internal static readonly Type DataGridCheckBoxColumn = typeof(DataGridCheckBoxColumn); - internal static readonly Type DataGridTemplateColumn = typeof(DataGridTemplateColumn); - } -#else internal static partial class ControlTypes { internal const string DataGrid = RootNamespace + "." + nameof(DataGrid); @@ -111,5 +100,4 @@ internal static class DataGridTemplateColumn internal const string CellEditingTemplate = nameof(CellEditingTemplate); internal const string CellTemplate = nameof(CellTemplate); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs deleted file mode 100644 index 4968dc766df..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/MetadataRegistration.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.Reflection; -using Microsoft.Toolkit.Uwp.Design.Common; -using Microsoft.Toolkit.Uwp.UI.Controls.Design; - -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design.Metadata; -#else -using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif - -[assembly: ProvideMetadata(typeof(MetadataRegistration))] - -namespace Microsoft.Toolkit.Uwp.UI.Controls.Design -{ - public class MetadataRegistration : MetadataRegistrationBase - { - public MetadataRegistration() : base() - { - // Note: - // The default constructor sets value of AssemblyFullName and - // XmlResourceName used by MetadataRegistrationBase.AddDescriptions(). - // The convention here is that the in .design.csproj - // (or Default namespace in Project -> Properties -> Application tab) - // must be the same as runtime assembly's main namespace (t.Namespace) - // plus .Design. -#if VS_DESIGNER_PROCESS_ISOLATION - Type t = typeof(DataGrid); - AssemblyName an = t.Assembly.GetName(); - AssemblyFullName = an.FullName; - XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; -#else - var AssemblyName = ControlTypes.RootNamespace + ".DataGrid"; - AssemblyFullName = $"{AssemblyName}, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null"; - XmlResourceName = $"{AssemblyName}.Design.{AssemblyName}.xml"; -#endif - } - } -} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj deleted file mode 100644 index 6d2d306c6dd..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - - Debug - x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8} - Library - Properties - Microsoft.Toolkit.Uwp.UI.Controls.Design - Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design - 512 - 8.1 - v4.7.2 - false - - - true - ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Debug\uap10.0.17763\Design\ - full - false - TRACE;DEBUG - x86 - - - ..\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid\bin\Release\uap10.0.17763\Design\ - pdbonly - x86 - true - TRACE - - - $(AssetTargetFallback);uap10.0.17763 - $(DefineConstants);VS_DESIGNER_PROCESS_ISOLATION - - - - - - - - False - False - - - False - False - - - - - - - - - - False - $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd - - - - - - {daeb9cec-c817-33b2-74b2-bc379380db72} - Microsoft.Toolkit.Uwp.UI.Controls.DataGrid - False - true - - - - - - - $(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.DataGrid.xml - False - - - - - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj index 71cbce85b89..379b99d06a8 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj @@ -78,9 +78,9 @@ + - Code diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs index c2b4b4eff72..8236858858c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/Constants.cs @@ -9,13 +9,12 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if !VS_DESIGNER_PROCESS_ISOLATION internal static partial class ControlTypes { // HACK: Don't forget to update, if the namespace changes. public const string RootNamespace = "Microsoft.Toolkit.Uwp.UI.Controls"; } -#endif + /// /// Names for ToolboxCategoryAttribute. /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs index e005adff941..024529d9fe9 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/MetadataRegistrationBase.cs @@ -13,13 +13,8 @@ using Microsoft.Toolkit.Uwp.Design.Types; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.Design.Common { @@ -142,11 +137,7 @@ private void AddDescriptions(AttributeTableBuilder builder) } var type = Type.GetType(typeName + ", " + AssemblyFullName); -#if VS_DESIGNER_PROCESS_ISOLATION - var typeID = type; -#else - var typeID = typeName; -#endif + if (type != null && type.IsPublic && type.IsClass && type.IsSubclassOf(PlatformTypes.DependencyObject)) { string desc = ParseDescription(member); @@ -159,11 +150,11 @@ private void AddDescriptions(AttributeTableBuilder builder) { if (IsBrowsable(type)) { - builder.AddCustomAttributes(typeID, new DescriptionAttribute(desc)); + builder.AddCustomAttributes(typeName, new DescriptionAttribute(desc)); } else //Hide from intellisense { - builder.AddCustomAttributes(typeID, + builder.AddCustomAttributes(typeName, new BrowsableAttribute(false), new ToolboxBrowsableAttribute(false), new ToolboxItemAttribute(false)); @@ -177,11 +168,11 @@ private void AddDescriptions(AttributeTableBuilder builder) { if (IsBrowsable(type)) { - builder.AddCustomAttributes(typeID, propertyName, new DescriptionAttribute(desc)); + builder.AddCustomAttributes(typeName, propertyName, new DescriptionAttribute(desc)); } else //Hide from intellisense { - builder.AddCustomAttributes(typeID, new BrowsableAttribute(false)); + builder.AddCustomAttributes(typeName, new BrowsableAttribute(false)); } } } diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs index a4de7f4eb60..57ecf3ec226 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Common/PlatformTypes.cs @@ -5,13 +5,8 @@ using System; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; - -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.Design.Types { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs index f98324d5e1f..32662e780db 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs index 8f7e1c577f8..695c9b99b17 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/AdaptiveGridView.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type AdaptiveGridView = typeof(AdaptiveGridView); - } -#else internal static partial class ControlTypes { internal const string AdaptiveGridView = RootNamespace + "." + nameof(AdaptiveGridView); @@ -25,5 +19,4 @@ internal static class AdaptiveGridView internal const string OneRowModeEnabled = nameof(OneRowModeEnabled); internal const string StretchContentForSingleRow = nameof(StretchContentForSingleRow); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs index 61f783b83f8..e2a172bf8d6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs index f5e9668d35a..6c4447afcba 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeItem.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type BladeItem = typeof(BladeItem); - } -#else internal static partial class ControlTypes { internal const string BladeItem = RootNamespace + "." + nameof(BladeItem); @@ -25,5 +19,4 @@ internal static class BladeItem internal const string TitleBarBackground = nameof(TitleBarBackground); internal const string TitleBarVisibility = nameof(TitleBarVisibility); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs index 7293304a390..98bd4f11c78 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Metadata.cs @@ -6,15 +6,9 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -using Microsoft.Windows.Design.PropertyEditing; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs index 239cc9b3e4c..81c16790594 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/BladeView.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type BladeView = typeof(BladeView); - } -#else internal static partial class ControlTypes { internal const string BladeView = RootNamespace + "." + nameof(BladeView); @@ -24,5 +18,4 @@ internal static class BladeView internal const string BladeMode = nameof(BladeMode); internal const string Items = nameof(Items); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs index d7479e31b6d..1575e9de83f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs index dd3f91b3195..ab82471baf0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Carousel.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type Carousel = typeof(Carousel); - } -#else internal static partial class ControlTypes { internal const string Carousel = RootNamespace + "." + nameof(Carousel); @@ -31,5 +25,4 @@ internal static class Carousel internal const string SelectedItem = nameof(SelectedItem); internal const string TransitionDuration = nameof(TransitionDuration); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs index f827722cd10..465f4ee8568 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Metadata.cs @@ -6,19 +6,11 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Features; -using Microsoft.Windows.Design.Metadata; -using Microsoft.Windows.Design.Model; -using Microsoft.Windows.Design.PropertyEditing; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Features; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; using Microsoft.VisualStudio.DesignTools.Extensibility.Model; using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs index 9cbd156cb25..ba79c8e6ac4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/DropShadowPanel.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type DropShadowPanel = typeof(DropShadowPanel); - } -#else internal static partial class ControlTypes { internal const string DropShadowPanel = RootNamespace + "." + nameof(DropShadowPanel); @@ -26,5 +20,4 @@ internal static class DropShadowPanel internal const string OffsetZ = nameof(OffsetZ); internal const string ShadowOpacity = nameof(ShadowOpacity); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs index cbb1fb62b42..eedfe6a9efd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs index fe171f65d79..becf381ce8d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Expander.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type Expander = typeof(Expander); - } -#else internal static partial class ControlTypes { internal const string Expander = RootNamespace + "." + nameof(Expander); @@ -24,5 +18,4 @@ internal static class Expander internal const string HeaderTemplate = nameof(HeaderTemplate); internal const string IsExpanded = nameof(IsExpanded); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs index e18d236231f..1de36b2c75c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs index 0f91303425e..13c64c02a0e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/GridSplitter.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type GridSplitter = typeof(GridSplitter); - } -#else internal static partial class ControlTypes { internal const string GridSplitter = RootNamespace + "." + nameof(GridSplitter); @@ -28,5 +22,4 @@ internal static class GridSplitter internal const string ResizeBehavior = nameof(ResizeBehavior); internal const string ResizeDirection = nameof(ResizeDirection); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs index ff4f7160344..2a9b9ad82fa 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Metadata.cs @@ -5,14 +5,8 @@ using System.ComponentModel; using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; - -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs index 2e90abfe7bb..e3029c78475 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ImageEx.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type ImageEx = typeof(ImageEx); - } -#else internal static partial class ControlTypes { internal const string ImageEx = RootNamespace + "." + nameof(ImageEx); @@ -21,5 +15,4 @@ internal static class ImageEx { internal const string NineGrid = nameof(NineGrid); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs index c7b8d6070a1..724db19ee14 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs index 9c72fe287b9..dbe727bae8a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/InAppNotification.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type InAppNotification = typeof(InAppNotification); - } -#else internal static partial class ControlTypes { internal const string InAppNotification = RootNamespace + "." + nameof(InAppNotification); @@ -21,5 +15,4 @@ internal static class InAppNotification { internal const string ShowDismissButton = nameof(ShowDismissButton); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs index 1523fab35f1..8bda1cbc9bd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs index 70b048495ef..06464181c80 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/LayoutTransitionControl.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type LayoutTransformControl = typeof(LayoutTransformControl); - } -#else internal static partial class ControlTypes { internal const string LayoutTransformControl = RootNamespace + "." + nameof(LayoutTransformControl); @@ -22,5 +16,4 @@ internal static class LayoutTransformControl internal const string Child = nameof(Child); internal const string Transform = nameof(Transform); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs index d0dd2d05e49..93dae34d60d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs index e2823aec8ea..2f5bbc2468b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Loading.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type Loading = typeof(Loading); - } -#else internal static partial class ControlTypes { internal const string Loading = RootNamespace + "." + nameof(Loading); @@ -21,5 +15,4 @@ internal static class Loading { internal const string IsLoading = nameof(IsLoading); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs index 2d2287dcf24..65c755e9fba 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs index 82cc90b4792..cc68d0b2f71 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MasterDetailsView.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type MasterDetailsView = typeof(MasterDetailsView); - } -#else internal static partial class ControlTypes { internal const string MasterDetailsView = RootNamespace + "." + nameof(MasterDetailsView); @@ -31,5 +25,4 @@ internal static class MasterDetailsView internal const string SelectedItem = nameof(SelectedItem); internal const string ViewState = nameof(ViewState); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs index fc0e06b6f49..120a51f40eb 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Metadata.cs @@ -6,15 +6,9 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -using Microsoft.Windows.Design.PropertyEditing; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs index 6a024be643f..a6fe22ee778 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/Menu.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type Menu = typeof(Menu); - } -#else internal static partial class ControlTypes { internal const string Menu = RootNamespace + "." + nameof(Menu); @@ -21,5 +15,4 @@ internal static class Menu { internal const string Items = nameof(Items); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs index f91ae6d2004..a7ea2464f09 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Metadata.cs @@ -5,16 +5,9 @@ using System.ComponentModel; using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; - -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -using Microsoft.Windows.Design.PropertyEditing; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs index 35a9f6030cb..9d7ebfeb37e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/MenuItem.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type MenuItem = typeof(MenuItem); - } -#else internal static partial class ControlTypes { internal const string MenuItem = RootNamespace + "." + nameof(MenuItem); @@ -24,5 +18,4 @@ internal static class MenuItem internal const string IsOpened = nameof(IsOpened); internal const string Items = nameof(Items); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs index f11c70f904b..d3168d21442 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs index 84f044d48e0..0e10f66fe5c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/OrbitView.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type OrbitView = typeof(OrbitView); - } -#else internal static partial class ControlTypes { internal const string OrbitView = RootNamespace + "." + nameof(OrbitView); @@ -31,5 +25,4 @@ internal static class OrbitView internal const string OrbitsEnabled = nameof(OrbitsEnabled); internal const string OrbitThickness = nameof(OrbitThickness); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs index 41cc5992638..6fc555705ab 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Metadata.cs @@ -4,17 +4,10 @@ using System.ComponentModel; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Features; -using Microsoft.Windows.Design.Metadata; -using Microsoft.Windows.Design.Model; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Features; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; using Microsoft.VisualStudio.DesignTools.Extensibility.Model; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs index 12c06a03103..61c73328e21 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialGauge.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type RadialGauge = typeof(RadialGauge); - } -#else internal static partial class ControlTypes { internal const string RadialGauge = RootNamespace + "." + nameof(RadialGauge); @@ -41,5 +35,4 @@ internal static class RadialGauge internal const string Value = nameof(Value); internal const string ValueStringFormat = nameof(ValueStringFormat); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs index b1e3ef29c39..42200fd225a 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Metadata.cs @@ -3,18 +3,10 @@ // See the LICENSE file in the project root for more information. using System.ComponentModel; - -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Features; -using Microsoft.Windows.Design.Metadata; -using Microsoft.Windows.Design.Model; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Features; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; using Microsoft.VisualStudio.DesignTools.Extensibility.Model; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs index 079cdc98be6..2976c3d19cf 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RadialProgressBar.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type RadialProgressBar = typeof(RadialProgressBar); - } -#else internal static partial class ControlTypes { internal const string RadialProgressBar = RootNamespace + "." + nameof(RadialProgressBar); @@ -23,5 +17,4 @@ internal static class RadialProgressBar internal const string Thickness = nameof(Thickness); internal const string Value = nameof(Value); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs index ea28e6d24f6..2958a9db89d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs index 51dcc9261f8..5e20f55ae81 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RangeSelector.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type RangeSelector = typeof(RangeSelector); - } -#else internal static partial class ControlTypes { internal const string RangeSelector = RootNamespace + "." + nameof(RangeSelector); @@ -24,5 +18,4 @@ internal static class RangeSelector internal const string RangeMax = nameof(RangeMax); internal const string RangeMin = nameof(RangeMin); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs index 3fb48d62133..6fd727eb5f0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs index fe6b3f57784..a24a1e76f1c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/RotatorTile.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type RotatorTile = typeof(RotatorTile); - } -#else internal static partial class ControlTypes { internal const string RotatorTile = RootNamespace + "." + nameof(RotatorTile); @@ -26,5 +20,4 @@ internal static class RotatorTile internal const string RotateDirection = nameof(RotateDirection); internal const string RotationDelay = nameof(RotationDelay); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs index 4580a2efba4..db36b23c826 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs index ee4edbdc33d..2bca70f75b2 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/ScrollHeader.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type ScrollHeader = typeof(ScrollHeader); - } -#else internal static partial class ControlTypes { internal const string ScrollHeader = RootNamespace + "." + nameof(ScrollHeader); @@ -21,5 +15,4 @@ internal static class ScrollHeader { internal const string Mode = nameof(Mode); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs index dd392a17fd8..1dfc57bc7c4 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs index 0e2a04ecded..26b36cba29f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TextToolbar.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type TextToolbar = typeof(TextToolbar); - } -#else internal static partial class ControlTypes { internal const string TextToolbar = RootNamespace + "." + nameof(TextToolbar); @@ -26,5 +20,4 @@ internal static class TextToolbar internal const string Format = nameof(Format); internal const string Formatter = nameof(Formatter); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs index 76b69a3eda1..3b971eba6c6 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs index 988b6c795a8..cbb97da25e5 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/TileControl.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type TileControl = typeof(TileControl); - } -#else internal static partial class ControlTypes { internal const string TileControl = RootNamespace + "." + nameof(TileControl); @@ -31,5 +25,4 @@ internal static class TileControl internal const string ScrollOrientation = nameof(ScrollOrientation); internal const string ScrollViewerContainer = nameof(ScrollViewerContainer); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs index cbef72dab05..3d45d889c7b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Metadata.cs @@ -6,13 +6,8 @@ using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs index e946329f44f..a0c4c11647d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/Controls/WrapPanel.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type WrapPanel = typeof(WrapPanel); - } -#else internal static partial class ControlTypes { internal const string WrapPanel = RootNamespace + "." + nameof(WrapPanel); @@ -23,5 +17,4 @@ internal static class WrapPanel internal const string Orientation = nameof(Orientation); internal const string VerticalSpacing = nameof(VerticalSpacing); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs index d9519960bef..2b755e8893f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Design/MetadataRegistration.cs @@ -7,11 +7,7 @@ using Microsoft.Toolkit.Uwp.Design.Common; using Microsoft.Toolkit.Uwp.UI.Controls.Design; -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif [assembly: ProvideMetadata(typeof(MetadataRegistration))] @@ -22,22 +18,20 @@ public class MetadataRegistration : MetadataRegistrationBase public MetadataRegistration() : base() { // Note: - // The default constructor sets value of AssemblyFullName and - // XmlResourceName used by MetadataRegistrationBase.AddDescriptions(). - // The convention here is that the in .design.csproj + // The default constructor sets value of 'AssemblyFullName' and + // 'XmlResourceName' used by 'MetadataRegistrationBase.AddDescriptions()'. + // The convention here is that the in '.DesignTools.csproj' // (or Default namespace in Project -> Properties -> Application tab) - // must be the same as runtime assembly's main namespace (t.Namespace) - // plus .Design. -#if VS_DESIGNER_PROCESS_ISOLATION - Type t = typeof(GridSplitter); - AssemblyName an = t.Assembly.GetName(); - AssemblyFullName = an.FullName; - XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; -#else - var AssemblyName = ControlTypes.RootNamespace; - AssemblyFullName = $"{AssemblyName}, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null"; - XmlResourceName = $"{AssemblyName}.Design.{AssemblyName}.xml"; -#endif + // must be the same as runtime assembly's main namespace plus ".Design". + Type thisType = this.GetType(); + AssemblyName designLib = thisType.Assembly.GetName(); + + string annexString = ".DesignTools"; + int annexStart = designLib.Name.LastIndexOf(annexString); + string controlLibName = designLib.Name.Remove(annexStart, annexString.Length); + + AssemblyFullName = designLib.FullName; + XmlResourceName = $"{thisType.Namespace}{controlLibName}.xml"; } } } \ No newline at end of file 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 deleted file mode 100644 index 25c730a8862..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.Design.csproj +++ /dev/null @@ -1,163 +0,0 @@ - - - - - Debug - x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB} - Library - Properties - Microsoft.Toolkit.Uwp.UI.Controls.Design - Microsoft.Toolkit.Uwp.UI.Controls.Design - 512 - 8.1 - v4.7.2 - false - - - true - ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Debug\uap10.0.17763\Design\ - full - false - TRACE;DEBUG - x86 - - - ..\Microsoft.Toolkit.Uwp.UI.Controls\bin\Release\uap10.0.17763\Design\ - pdbonly - x86 - true - TRACE - - - $(NoWarn);0618 - $(AssetTargetFallback);uap10.0.17763 - $(DefineConstants);VS_DESIGNER_PROCESS_ISOLATION - - - - - - - - False - False - - - False - False - - - - - - - - - - False - $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd - - - - - - {e9faabfb-d726-42c1-83c1-cb46a29fea81} - Microsoft.Toolkit.Uwp.UI.Controls - False - true - - - - - - - $(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.xml - False - - - - - - - - - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs index 0172b7b8875..7551d3e602f 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs @@ -5,14 +5,8 @@ using System.ComponentModel; using Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties; - -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design; -using Microsoft.Windows.Design.Metadata; -#else using Microsoft.VisualStudio.DesignTools.Extensibility; using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs index cd03a7d38f3..09d4115107b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Typedata.cs @@ -6,12 +6,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design { -#if VS_DESIGNER_PROCESS_ISOLATION - internal static partial class ControlTypes - { - internal static readonly Type MarkdownTextBlock = typeof(MarkdownTextBlock); - } -#else internal static partial class ControlTypes { internal const string MarkdownTextBlock = RootNamespace + "." + nameof(MarkdownTextBlock); @@ -49,5 +43,4 @@ internal static class MarkdownTextBlock internal const string Text = nameof(Text); internal const string TextWrapping = nameof(TextWrapping); } -#endif } \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs deleted file mode 100644 index 0bf905a14a0..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/MetadataRegistration.cs +++ /dev/null @@ -1,43 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; -using System.Reflection; -using Microsoft.Toolkit.Uwp.Design.Common; -using Microsoft.Toolkit.Uwp.UI.Controls.Design; - -#if VS_DESIGNER_PROCESS_ISOLATION -using Microsoft.Windows.Design.Metadata; -#else -using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; -#endif - -[assembly: ProvideMetadata(typeof(MetadataRegistration))] - -namespace Microsoft.Toolkit.Uwp.UI.Controls.Design -{ - public class MetadataRegistration : MetadataRegistrationBase - { - public MetadataRegistration() : base() - { - // Note: - // The default constructor sets value of AssemblyFullName and - // XmlResourceName used by MetadataRegistrationBase.AddDescriptions(). - // The convention here is that the in .design.csproj - // (or Default namespace in Project -> Properties -> Application tab) - // must be the same as runtime assembly's main namespace (t.Namespace) - // plus .Design. -#if VS_DESIGNER_PROCESS_ISOLATION - Type t = typeof(MarkdownTextBlock); - AssemblyName an = t.Assembly.GetName(); - AssemblyFullName = an.FullName; - XmlResourceName = t.Namespace + ".Design." + an.Name + ".xml"; -#else - var AssemblyName = ControlTypes.RootNamespace + ".Markdown"; - AssemblyFullName = $"{AssemblyName}, Version=6.1.0.0, Culture=neutral, PublicKeyToken=null"; - XmlResourceName = $"{AssemblyName}.Design.{AssemblyName}.xml"; -#endif - } - } -} \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj deleted file mode 100644 index c62d1f72d0d..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj +++ /dev/null @@ -1,114 +0,0 @@ - - - - - Debug - x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402} - Library - Properties - Microsoft.Toolkit.Uwp.UI.Controls.Design - Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design - 512 - 8.1 - v4.7.2 - false - - - true - ..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Debug\uap10.0.17763\Design\ - full - false - TRACE;DEBUG - x86 - - - ..\Microsoft.Toolkit.Uwp.UI.Controls.Markdown\bin\Release\uap10.0.17763\Design\ - pdbonly - x86 - true - TRACE - - - $(AssetTargetFallback);uap10.0.17763 - $(DefineConstants);VS_DESIGNER_PROCESS_ISOLATION - - - - - - - - False - False - - - False - False - - - - - - - - - - False - $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd - - - - - - {e9faabfb-d726-42c1-83c1-cb46a29fea81} - Microsoft.Toolkit.Uwp.UI.Controls.Markdown - False - true - - - - - - - $(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.Markdown.xml - False - - - - - - \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj index 2613819d155..2c32a4774c2 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj @@ -78,9 +78,9 @@ + - Code diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index be4d53a5077..44018a85fba 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -55,21 +55,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution settings.xamlstyler = settings.xamlstyler 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", "{749E4D01-D6C1-4B19-903B-712D63925FEB}" - ProjectSection(ProjectDependencies) = postProject - {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Design\Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}" ProjectSection(ProjectDependencies) = postProject {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} = {E9FAABFB-D726-42C1-83C1-CB46A29FEA81} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design.csproj", "{618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}" - ProjectSection(ProjectDependencies) = postProject - {DAEB9CEC-C817-33B2-74B2-BC379380DB72} = {DAEB9CEC-C817-33B2-74B2-BC379380DB72} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj", "{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}" ProjectSection(ProjectDependencies) = postProject {DAEB9CEC-C817-33B2-74B2-BC379380DB72} = {DAEB9CEC-C817-33B2-74B2-BC379380DB72} @@ -120,11 +110,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{88C6FFBE-3 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj", "{6FEDF199-B052-49DD-8F3E-2A9224998E0F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design.csproj", "{6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}" - ProjectSection(ProjectDependencies) = postProject - {6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {6FEDF199-B052-49DD-8F3E-2A9224998E0F} - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj", "{67FE47A0-CA93-4680-B770-A0A48C1DBC40}" ProjectSection(ProjectDependencies) = postProject {6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {6FEDF199-B052-49DD-8F3E-2A9224998E0F} @@ -498,25 +483,6 @@ Global {94994424-5F60-4CD8-ABA2-101779066208}.Release|x64.Build.0 = Release|Any CPU {94994424-5F60-4CD8-ABA2-101779066208}.Release|x86.ActiveCfg = Release|Any CPU {94994424-5F60-4CD8-ABA2-101779066208}.Release|x86.Build.0 = Release|Any CPU - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|Any CPU.ActiveCfg = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|Any CPU.Build.0 = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|ARM.ActiveCfg = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|ARM.Build.0 = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|ARM64.ActiveCfg = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|x64.ActiveCfg = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|x64.Build.0 = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|x86.ActiveCfg = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Debug|x86.Build.0 = Debug|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|Any CPU.ActiveCfg = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|Any CPU.Build.0 = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|ARM.ActiveCfg = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|ARM.Build.0 = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|ARM64.ActiveCfg = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|ARM64.Build.0 = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|x64.ActiveCfg = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|x64.Build.0 = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|x86.ActiveCfg = Release|x86 - {749E4D01-D6C1-4B19-903B-712D63925FEB}.Release|x86.Build.0 = Release|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.ActiveCfg = Debug|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|Any CPU.Build.0 = Debug|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Debug|ARM.ActiveCfg = Debug|x86 @@ -537,25 +503,6 @@ Global {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x64.Build.0 = Release|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.ActiveCfg = Release|x86 {7AEFC959-ED7C-4D96-9E92-72609B40FBE0}.Release|x86.Build.0 = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|Any CPU.ActiveCfg = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|Any CPU.Build.0 = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|ARM.ActiveCfg = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|ARM.Build.0 = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|ARM64.ActiveCfg = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|x64.ActiveCfg = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|x64.Build.0 = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|x86.ActiveCfg = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Debug|x86.Build.0 = Debug|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|Any CPU.ActiveCfg = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|Any CPU.Build.0 = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|ARM.ActiveCfg = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|ARM.Build.0 = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|ARM64.ActiveCfg = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|ARM64.Build.0 = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|x64.ActiveCfg = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|x64.Build.0 = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|x86.ActiveCfg = Release|x86 - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8}.Release|x86.Build.0 = Release|x86 {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|Any CPU.ActiveCfg = Debug|x86 {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|Any CPU.Build.0 = Debug|x86 {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}.Debug|ARM.ActiveCfg = Debug|x86 @@ -917,25 +864,6 @@ Global {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.Build.0 = Release|Any CPU {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.ActiveCfg = Release|Any CPU {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.Build.0 = Release|Any CPU - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|Any CPU.ActiveCfg = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|Any CPU.Build.0 = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|ARM.ActiveCfg = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|ARM.Build.0 = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|ARM64.ActiveCfg = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|x64.ActiveCfg = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|x64.Build.0 = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|x86.ActiveCfg = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Debug|x86.Build.0 = Debug|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|Any CPU.ActiveCfg = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|Any CPU.Build.0 = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|ARM.ActiveCfg = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|ARM.Build.0 = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|ARM64.ActiveCfg = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|ARM64.Build.0 = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|x64.ActiveCfg = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|x64.Build.0 = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|x86.ActiveCfg = Release|x86 - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402}.Release|x86.Build.0 = Release|x86 {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.ActiveCfg = Debug|x86 {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.Build.0 = Debug|x86 {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.ActiveCfg = Debug|x86 @@ -1039,9 +967,7 @@ Global {BAB1CAF4-C400-4A7F-A987-C576DE63CFFD} = {9333C63A-F64F-4797-82B3-017422668A5D} {1AE2CB5C-58A0-4F12-8E6F-2CD4AAADB34C} = {9AD30620-667D-433C-9961-8D885EE7B762} {94994424-5F60-4CD8-ABA2-101779066208} = {9333C63A-F64F-4797-82B3-017422668A5D} - {749E4D01-D6C1-4B19-903B-712D63925FEB} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {7AEFC959-ED7C-4D96-9E92-72609B40FBE0} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} - {618C1EA2-CAA6-4ED8-A53B-E8F4B63AEDB8} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {A122EA02-4DE7-413D-BFBF-AF7DFC668DD6} = {B30036C4-D514-4E5B-A323-587A061772CE} {75F9EE44-3EFA-47BC-AEDD-351B9834A0AF} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} @@ -1060,7 +986,6 @@ Global {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405} = {9AD30620-667D-433C-9961-8D885EE7B762} {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A} = {9AD30620-667D-433C-9961-8D885EE7B762} {6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} - {6E8F0CAF-7B4D-4FFB-A50A-252CA7C75402} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {67FE47A0-CA93-4680-B770-A0A48C1DBC40} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {05C83067-FA46-45E2-BEC4-EDEE84AD18D0} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} = {B30036C4-D514-4E5B-A323-587A061772CE}