From 62295d57a6fc59b436b10828f4c0a8ce711f7424 Mon Sep 17 00:00:00 2001 From: Nirmal Guru Date: Sun, 14 Feb 2021 14:02:41 +0530 Subject: [PATCH] Converted Design projects to Sdk-style - Remove 'AssemblyInfo.cs' as it is generated by the .NET SDK. - Move 'MetadataRegistration.cs' into Common folder so that it can be shared across Design projects along with others. - Update Solution to Use CPS for the Design projects. --- .../{ => Common}/MetadataRegistration.cs | 9 +- ...it.Uwp.UI.Controls.Core.DesignTools.csproj | 141 ++---------------- .../Properties/AssemblyInfo.cs | 32 ---- ...wp.UI.Controls.DataGrid.DesignTools.csproj | 112 ++------------ .../Properties/AssemblyInfo.cs | 32 ---- ...t.Uwp.UI.Controls.Input.DesignTools.csproj | 115 ++------------ .../Properties/AssemblyInfo.cs | 32 ---- ....Uwp.UI.Controls.Layout.DesignTools.csproj | 127 ++-------------- .../Properties/AssemblyInfo.cs | 32 ---- ...wp.UI.Controls.Markdown.DesignTools.csproj | 112 ++------------ .../Properties/AssemblyInfo.cs | 32 ---- ....UI.Controls.Primitives.DesignTools.csproj | 114 ++------------ .../Properties/AssemblyInfo.cs | 32 ---- Windows Community Toolkit.sln | 12 +- .../Windows.Toolkit.VisualStudio.Design.props | 35 +++-- ...indows.Toolkit.VisualStudio.Design.targets | 13 ++ 16 files changed, 115 insertions(+), 867 deletions(-) rename Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/{ => Common}/MetadataRegistration.cs (78%) delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Properties/AssemblyInfo.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.Design/Properties/AssemblyInfo.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Input.Design/Properties/AssemblyInfo.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Layout.Design/Properties/AssemblyInfo.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Markdown.Design/Properties/AssemblyInfo.cs delete mode 100644 Microsoft.Toolkit.Uwp.UI.Controls.Primitives.Design/Properties/AssemblyInfo.cs create mode 100644 build/Windows.Toolkit.VisualStudio.Design.targets 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 78% rename from Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs rename to Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistration.cs index 2b755e8893f..076f3b01b57 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/MetadataRegistration.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Common/MetadataRegistration.cs @@ -20,9 +20,10 @@ 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". + // The convention here is that the root namespace plus the Controls category. + // Example: + // "Microsoft.Toolkit.Uwp.UI.Controls" (root namespace) + "." + "Primitives" (Controls category) + ".xml" + Type thisType = this.GetType(); AssemblyName designLib = thisType.Assembly.GetName(); @@ -31,7 +32,7 @@ public MetadataRegistration() : base() string controlLibName = designLib.Name.Remove(annexStart, annexString.Length); AssemblyFullName = designLib.FullName; - XmlResourceName = $"{thisType.Namespace}{controlLibName}.xml"; + XmlResourceName = $"{controlLibName}.xml"; } } } \ No newline at end of file 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..44fbbc27f1c 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,15 @@ - - - + + - 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 + Microsoft.Toolkit.Uwp.UI.Controls + - $(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.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.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.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.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.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/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..89ba19fe3ea 100644 --- a/build/Windows.Toolkit.VisualStudio.Design.props +++ b/build/Windows.Toolkit.VisualStudio.Design.props @@ -1,21 +1,28 @@ - $([MSBuild]::EnsureTrailingSlash($([MSBuild]::ValueOrDefault('$(BaseIntermediateOutputPath)', 'obj')))) + True + 0618 + x86 - - - - $(BaseIntermediateOutputPath)Design\ - - - - - $(BaseIntermediateOutputPath)DesignTools\ - - - - + + False + False + True + uap$(TargetPlatformBaseVersion).$(TargetPlatformMinRevision) + $(MSBuildProjectName.Remove($(MSBuildProjectName.LastIndexOf('.')))) + + $(ParentProjectName.Remove(0, $([MSBuild]::Add($(ParentProjectName.LastIndexOf('.')), '1')))) + + + + + + + $(ParentProjectType).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..842a7ad3c30 --- /dev/null +++ b/build/Windows.Toolkit.VisualStudio.Design.targets @@ -0,0 +1,13 @@ + + + + ..\$(ParentProjectName)\bin\$(Configuration)\$(ParentTargetFramework)\ + $(ParentProjectOutputPath)Design\ + + + + + + + + \ No newline at end of file