diff --git a/Directory.Build.props b/Directory.Build.props index f9e78de1fa7..5b59fa7a93d 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ https://raw.githubusercontent.com/windows-toolkit/WindowsCommunityToolkit/master/build/nuget.png images\nuget.png https://github.com/windows-toolkit/WindowsCommunityToolkit - MIT + MIT https://github.com/windows-toolkit/WindowsCommunityToolkit/releases (c) .NET Foundation and Contributors. All rights reserved. en-US diff --git a/Directory.Build.targets b/Directory.Build.targets index 2101233710b..112cde71423 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -13,7 +13,7 @@ - + diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistration.cs similarity index 100% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistration.cs diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj index 8ddeb05d50a..f82617c847e 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj @@ -1,136 +1,14 @@ - - - + + - Debug - x86 - {7AEFC959-ED7C-4D96-9E92-72609B40FBE0} - Library - Properties - Microsoft.Toolkit.Uwp.UI.Controls.Design - Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools - 512 - 8.1 - v4.7.2 - false - - - true - ..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\Debug\uap10.0.17763\Design\ - full - false - TRACE;DEBUG - x86 - - - ..\Microsoft.Toolkit.Uwp.UI.Controls.Core\bin\Release\uap10.0.17763\Design\ - pdbonly - x86 - true - TRACE + net472 + - $(NoWarn);0618 - $(AssetTargetFallback);uap10.0.17763 + Windows Community Toolkit Controls (DesignTools) + Design time support for Windows Community Toolkit Controls - - - - - - - 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.Core.xml - False - - - - - - - - - + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs deleted file mode 100644 index bfa162fde30..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +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.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")] -[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Windows Community Toolkit")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US English -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx index 55cac3ca36f..438f75392b1 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/Resources.resx @@ -1,17 +1,17 @@  - 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 ae9be61bced..c095b04df01 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 @@ -1,107 +1,19 @@ - - - + + - 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 + net472 + Microsoft.Toolkit.Uwp.UI.Controls + - $(AssetTargetFallback);uap10.0.17763 + Windows Community Toolkit DataGrid Control (Design) + Design time support for Windows Community Toolkit DataGrid Control + - - - - - - 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.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs deleted file mode 100644 index a9b6d64a3bd..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +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.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Windows Community Toolkit Controls DataGrid (Design)")] -[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls DataGrid")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Windows Community Toolkit")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US English -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs index ac6a535501e..5548723e83d 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ internal Resources() { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ internal Resources() { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Appearance. /// @@ -68,7 +68,7 @@ internal static string CategoryAppearance { return ResourceManager.GetString("CategoryAppearance", resourceCulture); } } - + /// /// Looks up a localized string similar to Cell Binding. /// @@ -77,7 +77,7 @@ internal static string CategoryCellBinding { return ResourceManager.GetString("CategoryCellBinding", resourceCulture); } } - + /// /// Looks up a localized string similar to Cell Template. /// @@ -86,7 +86,7 @@ internal static string CategoryCellTemplate { return ResourceManager.GetString("CategoryCellTemplate", resourceCulture); } } - + /// /// Looks up a localized string similar to Columns. /// @@ -95,7 +95,7 @@ internal static string CategoryColumns { return ResourceManager.GetString("CategoryColumns", resourceCulture); } } - + /// /// Looks up a localized string similar to Common. /// @@ -104,7 +104,7 @@ internal static string CategoryCommon { return ResourceManager.GetString("CategoryCommon", resourceCulture); } } - + /// /// Looks up a localized string similar to Grid Lines. /// @@ -113,7 +113,7 @@ internal static string CategoryGridLines { return ResourceManager.GetString("CategoryGridLines", resourceCulture); } } - + /// /// Looks up a localized string similar to Header. /// @@ -122,7 +122,7 @@ internal static string CategoryHeader { return ResourceManager.GetString("CategoryHeader", resourceCulture); } } - + /// /// Looks up a localized string similar to Headers. /// @@ -131,7 +131,7 @@ internal static string CategoryHeaders { return ResourceManager.GetString("CategoryHeaders", resourceCulture); } } - + /// /// Looks up a localized string similar to Layout. /// @@ -140,7 +140,7 @@ internal static string CategoryLayout { return ResourceManager.GetString("CategoryLayout", resourceCulture); } } - + /// /// Looks up a localized string similar to Rows. /// @@ -149,7 +149,7 @@ internal static string CategoryRows { return ResourceManager.GetString("CategoryRows", resourceCulture); } } - + /// /// Looks up a localized string similar to Sort. /// @@ -158,7 +158,7 @@ internal static string CategorySort { return ResourceManager.GetString("CategorySort", resourceCulture); } } - + /// /// Looks up a localized string similar to Text. /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.resx index c30051191c9..a2d8bcbd360 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/Resources.resx @@ -1,17 +1,17 @@  - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj index 2782bd400e5..0fc4bc742a3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj @@ -1,110 +1,19 @@ - - - + + - Debug - x86 - {3307BC1D-5D71-41C6-A1B3-B113B8242D08} - Library - Properties - Microsoft.Toolkit.Uwp.UI.Controls.Design - Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools - 512 - 8.1 - v4.7.2 - false - - - true - ..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\Debug\uap10.0.17763\Design\ - full - false - TRACE;DEBUG - x86 - - - ..\Microsoft.Toolkit.Uwp.UI.Controls.Input\bin\Release\uap10.0.17763\Design\ - pdbonly - x86 - true - TRACE + net472 + Microsoft.Toolkit.Uwp.UI.Controls + - $(NoWarn);0618 - $(AssetTargetFallback);uap10.0.17763 + Windows Community Toolkit Input Controls (Design) + Design time support for Windows Community Toolkit Input Controls + - - - - - - False - False - - - False - False - - - - - - - - - - False - $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd - - - - - - - - - - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd - WindowsRuntime - False - - - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd - WindowsRuntime - False - - - - - - - - - - - - - Code - - - True - True - Resources.resx - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - Microsoft.Toolkit.Uwp.UI.Controls.Input.xml - False - + - - - + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs deleted file mode 100644 index bfa162fde30..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +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.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")] -[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Windows Community Toolkit")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US English -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs index a17591769f6..355f585a678 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ internal Resources() { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ internal Resources() { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Appearance. /// @@ -68,7 +68,7 @@ internal static string CategoryAppearance { return ResourceManager.GetString("CategoryAppearance", resourceCulture); } } - + /// /// Looks up a localized string similar to Brush. /// @@ -77,7 +77,7 @@ internal static string CategoryBrush { return ResourceManager.GetString("CategoryBrush", resourceCulture); } } - + /// /// Looks up a localized string similar to Common. /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx index 8a8f1b3f3ba..fb7eb4857de 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/Resources.resx @@ -1,17 +1,17 @@  - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs deleted file mode 100644 index 8236858858c..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/Constants.cs +++ /dev/null @@ -1,28 +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; - -[assembly: SuppressMessage("General", "SWC1001:XmlDocumentationCommentShouldBeSpelledCorrectly", MessageId = "Theming", Justification = "Correct spelling")] - -namespace Microsoft.Toolkit.Uwp.UI.Controls.Design -{ - internal static partial class ControlTypes - { - // HACK: Don't forget to update, if the namespace changes. - public const string RootNamespace = "Microsoft.Toolkit.Uwp.UI.Controls"; - } - - /// - /// 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.Layout.Design/Common/MetadataRegistrationBase.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/MetadataRegistrationBase.cs deleted file mode 100644 index 024529d9fe9..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.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 System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Reflection; -using System.Xml.Linq; - -using Microsoft.Toolkit.Uwp.Design.Types; - -using Microsoft.VisualStudio.DesignTools.Extensibility; -using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; - -namespace Microsoft.Toolkit.Uwp.Design.Common -{ - public abstract class MetadataRegistrationBase : IProvideAttributeTable - { - private AttributeTable masterMetadataTable; - - internal MetadataRegistrationBase() { } - - /// - /// Build design time metadata attribute table. - /// - /// Custom attribute table. - protected virtual AttributeTable BuildAttributeTable() - { - 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. - /// - /// 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 - { - var 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; - try - { - xDoc = XDocument.Load(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); - 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:" - } - else - { - lastDot = name.LastIndexOf('.'); - typeName = name.Substring(2, lastDot - 2); - } - - 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 = string.Join(" ", desc.Trim().Split(new char[] { ' ', '\t', '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries)); - - if (isType) - { - if (IsBrowsable(type)) - { - builder.AddCustomAttributes(typeName, new DescriptionAttribute(desc)); - } - else //Hide from intellisense - { - builder.AddCustomAttributes(typeName, - new BrowsableAttribute(false), - new ToolboxBrowsableAttribute(false), - new ToolboxItemAttribute(false)); - } - } - else - { - var propertyName = name.Substring(lastDot + 1); - PropertyInfo pi = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly); - if (pi != null) - { - if (IsBrowsable(type)) - { - builder.AddCustomAttributes(typeName, propertyName, new DescriptionAttribute(desc)); - } - else //Hide from intellisense - { - builder.AddCustomAttributes(typeName, new BrowsableAttribute(false)); - } - } - } - } - } - } - catch - { - } - } - } - - private static bool IsBrowsable(MemberInfo typeOrMember) - { - EditorBrowsableAttribute attribute; - try - { - attribute = typeOrMember.GetCustomAttribute(false); - } - catch - { - return true; // If there is no [EditorBrowsable] attribute present, we'll show it by default. - } - return attribute.State != EditorBrowsableState.Never; - } - - /// - /// 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.Layout.Design/Common/PlatformTypes.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs deleted file mode 100644 index 57ecf3ec226..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Common/PlatformTypes.cs +++ /dev/null @@ -1,41 +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 Windows.UI.Xaml; -using Windows.UI.Xaml.Controls; -using Microsoft.VisualStudio.DesignTools.Extensibility; -using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; - -namespace Microsoft.Toolkit.Uwp.Design.Types -{ - internal class PlatformTypes - { - 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"); - 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"); - } - - 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.Layout.Design/MetadataRegistration.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs deleted file mode 100644 index 2b755e8893f..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/MetadataRegistration.cs +++ /dev/null @@ -1,37 +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; - -using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata; - -[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 '.DesignTools.csproj' - // (or Default namespace in Project -> Properties -> Application tab) - // 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.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj index b3dbfced410..42f1a712ea3 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj @@ -1,122 +1,19 @@ - - - + + - Debug - x86 - {1B55A026-5BF8-4D04-B7C0-A82AB49BA017} - Library - Properties - Microsoft.Toolkit.Uwp.UI.Controls.Design - Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools - 512 - 8.1 - v4.7.2 - false - - - true - ..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\Debug\uap10.0.17763\Design\ - full - false - TRACE;DEBUG - x86 - - - ..\Microsoft.Toolkit.Uwp.UI.Controls.Layout\bin\Release\uap10.0.17763\Design\ - pdbonly - x86 - true - TRACE + net472 + Microsoft.Toolkit.Uwp.UI.Controls + - $(NoWarn);0618 - $(AssetTargetFallback);uap10.0.17763 + Windows Community Toolkit Layout Controls (Design) + Design time support for Windows Community Toolkit Layout Controls + - - - - - - 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.Layout.xml - False - + - - - + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs deleted file mode 100644 index bfa162fde30..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +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.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Windows Community Toolkit Controls (Design)")] -[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Controls")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Windows Community Toolkit")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US English -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs index a17591769f6..355f585a678 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ internal Resources() { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ internal Resources() { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Appearance. /// @@ -68,7 +68,7 @@ internal static string CategoryAppearance { return ResourceManager.GetString("CategoryAppearance", resourceCulture); } } - + /// /// Looks up a localized string similar to Brush. /// @@ -77,7 +77,7 @@ internal static string CategoryBrush { return ResourceManager.GetString("CategoryBrush", resourceCulture); } } - + /// /// Looks up a localized string similar to Common. /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx index 8a8f1b3f3ba..fb7eb4857de 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/Resources.resx @@ -1,17 +1,17 @@  - 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 e8ba7d46a80..73af00b515a 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 @@ -1,107 +1,19 @@ - - - + + - 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 + net472 + Microsoft.Toolkit.Uwp.UI.Controls + - $(AssetTargetFallback);uap10.0.17763 + Windows Community Toolkit Markdown Control (Design) + Design time support for Windows Community Toolkit Markdown Control + - - - - - - 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.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs deleted file mode 100644 index 7adc149cd6d..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +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.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Windows Community Toolkit Controls Markdown (Design)")] -[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Markdown Controls")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Windows Community Toolkit")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US English -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs index e160035a377..e22f34ec314 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ internal Resources() { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ internal Resources() { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Appearance. /// @@ -68,7 +68,7 @@ internal static string CategoryAppearance { return ResourceManager.GetString("CategoryAppearance", resourceCulture); } } - + /// /// Looks up a localized string similar to Brush. /// @@ -77,7 +77,7 @@ internal static string CategoryBrush { return ResourceManager.GetString("CategoryBrush", resourceCulture); } } - + /// /// Looks up a localized string similar to Common. /// @@ -86,7 +86,7 @@ internal static string CategoryCommon { return ResourceManager.GetString("CategoryCommon", resourceCulture); } } - + /// /// Looks up a localized string similar to Drop Shadow. /// @@ -95,7 +95,7 @@ internal static string CategoryDropShadow { return ResourceManager.GetString("CategoryDropShadow", resourceCulture); } } - + /// /// Looks up a localized string similar to Interactions. /// @@ -104,7 +104,7 @@ internal static string CategoryInteractions { return ResourceManager.GetString("CategoryInteractions", resourceCulture); } } - + /// /// Looks up a localized string similar to Layout. /// @@ -113,7 +113,7 @@ internal static string CategoryLayout { return ResourceManager.GetString("CategoryLayout", resourceCulture); } } - + /// /// Looks up a localized string similar to Markdown Style - Code. /// @@ -122,7 +122,7 @@ internal static string CategoryMarkdownCodeStyle { return ResourceManager.GetString("CategoryMarkdownCodeStyle", resourceCulture); } } - + /// /// Looks up a localized string similar to Markdown Style - Header {0}. /// @@ -131,7 +131,7 @@ internal static string CategoryMarkdownHeaderStyle { return ResourceManager.GetString("CategoryMarkdownHeaderStyle", resourceCulture); } } - + /// /// Looks up a localized string similar to Markdown Style - List. /// @@ -140,7 +140,7 @@ internal static string CategoryMarkdownListStyle { return ResourceManager.GetString("CategoryMarkdownListStyle", resourceCulture); } } - + /// /// Looks up a localized string similar to Markdown Style - Quote. /// @@ -149,7 +149,7 @@ internal static string CategoryMarkdownQuoteStyle { return ResourceManager.GetString("CategoryMarkdownQuoteStyle", resourceCulture); } } - + /// /// Looks up a localized string similar to Markdown Style. /// @@ -158,7 +158,7 @@ internal static string CategoryMarkdownStyle { return ResourceManager.GetString("CategoryMarkdownStyle", resourceCulture); } } - + /// /// Looks up a localized string similar to Markdown Style - Table. /// @@ -167,7 +167,7 @@ internal static string CategoryMarkdownTableStyle { return ResourceManager.GetString("CategoryMarkdownTableStyle", resourceCulture); } } - + /// /// Looks up a localized string similar to Text. /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx index e8903ef43b7..0dfa544c91b 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/Resources.resx @@ -1,17 +1,17 @@  - diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj index 351fd292c13..c56974a7b1c 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj @@ -1,109 +1,19 @@ - - - + + - Debug - x86 - {AF5045DE-0D13-45C2-AC33-50CF5FDB333A} - Library - Properties - Microsoft.Toolkit.Uwp.UI.Controls.Design - Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools - 512 - 8.1 - v4.7.2 - false - - - true - ..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Debug\uap10.0.17763\Design\ - full - false - TRACE;DEBUG - x86 - - - ..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Release\uap10.0.17763\Design\ - pdbonly - x86 - true - TRACE + net472 + Microsoft.Toolkit.Uwp.UI.Controls + - $(AssetTargetFallback);uap10.0.17763 + Windows Community Toolkit Primitive Controls (Design) + Design time support for Windows Community Toolkit Primitive Controls + - - - - - - False - False - - - False - False - - - - - - - - - - False - $(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd - - - - - - - - - - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd - WindowsRuntime - False - - - $(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd - WindowsRuntime - False - - - - - - - - - - - - - Code - - - - Resources.resx - True - True - - - - - Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml - False - - - ResXFileCodeGenerator - Resources.Designer.cs - + - - - + + + \ No newline at end of file diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs deleted file mode 100644 index 9fd890b71a6..00000000000 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,32 +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.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Windows Community Toolkit Primitive Controls (Design)")] -[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitive Controls")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Windows Community Toolkit")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2020")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US English -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs index bad69d9bf25..35acb0b25a0 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs @@ -10,8 +10,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { using System; - - + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -23,15 +23,15 @@ namespace Microsoft.Toolkit.Uwp.UI.Controls.Design.Properties { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { - + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// @@ -45,7 +45,7 @@ internal Resources() { return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. @@ -59,7 +59,7 @@ internal Resources() { resourceCulture = value; } } - + /// /// Looks up a localized string similar to Common. /// @@ -68,7 +68,7 @@ internal static string CategoryCommon { return ResourceManager.GetString("CategoryCommon", resourceCulture); } } - + /// /// Looks up a localized string similar to Layout. /// diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx index 550ed935b51..6d2e88846dd 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/Resources.resx @@ -1,17 +1,17 @@  - diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index e25cc6bab07..c56b3b06522 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -53,12 +53,12 @@ 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.Core.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools.csproj", "{7AEFC959-ED7C-4D96-9E92-72609B40FBE0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Core.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Core.Design\Microsoft.Toolkit.Uwp.UI.Controls.Core.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.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design\Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.DesignTools.csproj", "{6BD0BA4A-DE6D-3E87-8F83-63518C31ECD1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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 @@ -106,7 +106,7 @@ 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.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design\Microsoft.Toolkit.Uwp.UI.Controls.Markdown.DesignTools.csproj", "{67FE47A0-CA93-4680-B770-A0A48C1DBC40}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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 @@ -139,19 +139,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj", "{84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj", "{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools.csproj", "{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}" ProjectSection(ProjectDependencies) = postProject {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} = {84AB7DC5-95C9-4CF8-A370-D077E9E9EF1A} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design\Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj", "{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design\Microsoft.Toolkit.Uwp.UI.Controls.Layout.DesignTools.csproj", "{1B55A026-5BF8-4D04-B7C0-A82AB49BA017}" ProjectSection(ProjectDependencies) = postProject {CB444381-18BA-4A51-BB32-3A498BCC1E99} = {CB444381-18BA-4A51-BB32-3A498BCC1E99} EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input", "Microsoft.Toolkit.Uwp.UI.Controls.Input\Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj", "{AF1BE4E9-E2E1-4729-B076-B3725D8E21EE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Input.Design\Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj", "{3307BC1D-5D71-41C6-A1B3-B113B8242D08}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools", "Microsoft.Toolkit.Uwp.UI.Controls.Input.Design\Microsoft.Toolkit.Uwp.UI.Controls.Input.DesignTools.csproj", "{3307BC1D-5D71-41C6-A1B3-B113B8242D08}" ProjectSection(ProjectDependencies) = postProject {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} = {AF1BE4E9-E2E1-4729-B076-B3725D8E21EE} EndProjectSection diff --git a/build/Windows.Toolkit.VisualStudio.Design.props b/build/Windows.Toolkit.VisualStudio.Design.props index de91a09dfad..8252b86f4b8 100644 --- a/build/Windows.Toolkit.VisualStudio.Design.props +++ b/build/Windows.Toolkit.VisualStudio.Design.props @@ -1,21 +1,24 @@ - $([MSBuild]::EnsureTrailingSlash($([MSBuild]::ValueOrDefault('$(BaseIntermediateOutputPath)', 'obj')))) + True + 0618 + x86 - - - - $(BaseIntermediateOutputPath)Design\ - - - - - $(BaseIntermediateOutputPath)DesignTools\ - - - - + + True + $(MSBuildProjectName.Remove($(MSBuildProjectName.LastIndexOf('.')))) + uap$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision) + + + + + + + $(ParentProjectName).xml + False + + \ No newline at end of file diff --git a/build/Windows.Toolkit.VisualStudio.Design.targets b/build/Windows.Toolkit.VisualStudio.Design.targets new file mode 100644 index 00000000000..2a1bd1136ab --- /dev/null +++ b/build/Windows.Toolkit.VisualStudio.Design.targets @@ -0,0 +1,21 @@ + + + + ..\$(ParentProjectName)\bin\$(Configuration)\$(ParentTargetFramework)\ + $(ParentProjectOutputPath)Design\ + + + + + False + False + True + + + + + + + + + \ No newline at end of file