Skip to content

Commit fc221a7

Browse files
Merge pull request #3660 from RosarioPulella/split-controls
Split out Controls.Primitives package.
2 parents 7b41c17 + 3ffa9b5 commit fc221a7

File tree

41 files changed

+505
-29
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+505
-29
lines changed

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,6 +1498,10 @@
14981498
<Project>{6fedf199-b052-49dd-8f3e-2a9224998e0f}</Project>
14991499
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Markdown</Name>
15001500
</ProjectReference>
1501+
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj">
1502+
<Project>{84ab7dc5-95c9-4cf8-a370-d077e9e9ef1a}</Project>
1503+
<Name>Microsoft.Toolkit.Uwp.UI.Controls.Primitives</Name>
1504+
</ProjectReference>
15011505
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls\Microsoft.Toolkit.Uwp.UI.Controls.csproj">
15021506
<Project>{e9faabfb-d726-42c1-83c1-cb46a29fea81}</Project>
15031507
<Name>Microsoft.Toolkit.Uwp.UI.Controls</Name>

Microsoft.Toolkit.Uwp.UI.Controls.Design/Microsoft.Toolkit.Uwp.UI.Controls.DesignTools.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
<Compile Include="Common\Constants.cs" />
8080
<Compile Include="Common\MetadataRegistrationBase.cs" />
8181
<Compile Include="Common\PlatformTypes.cs" />
82-
<Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
83-
<Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
8482
<Compile Include="Controls\BladeItem.Metadata.cs" />
8583
<Compile Include="Controls\BladeItem.Typedata.cs" />
8684
<Compile Include="Controls\BladeView.Metadata.cs" />
@@ -123,8 +121,6 @@
123121
<Compile Include="Controls\TextToolbar.Typedata.cs" />
124122
<Compile Include="Controls\TileControl.Metadata.cs" />
125123
<Compile Include="Controls\TileControl.Typedata.cs" />
126-
<Compile Include="Controls\WrapPanel.Metadata.cs" />
127-
<Compile Include="Controls\WrapPanel.Typedata.cs" />
128124
<Compile Include="MetadataRegistration.cs" />
129125
<Compile Include="Properties\AssemblyInfo.cs">
130126
<SubType>Code</SubType>

Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.Designer.cs

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Microsoft.Toolkit.Uwp.UI.Controls.Design/Properties/Resources.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,6 @@
132132
<data name="CategoryInteractions" xml:space="preserve">
133133
<value>Interactions</value>
134134
</data>
135-
<data name="CategoryLayout" xml:space="preserve">
136-
<value>Layout</value>
137-
</data>
138135
<data name="CategoryMarkdownCodeStyle" xml:space="preserve">
139136
<value>Markdown Style - Code</value>
140137
</data>
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
7+
<ProjectGuid>{AF5045DE-0D13-45C2-AC33-50CF5FDB333A}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Controls.Design</RootNamespace>
11+
<AssemblyName>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.DesignTools</AssemblyName>
12+
<FileAlignment>512</FileAlignment>
13+
<TargetPlatformVersion>8.1</TargetPlatformVersion>
14+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
15+
<ValidateFrameworkCompatibility>false</ValidateFrameworkCompatibility>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
18+
<DebugSymbols>true</DebugSymbols>
19+
<OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Debug\uap10.0.17763\Design\</OutputPath>
20+
<DebugType>full</DebugType>
21+
<Optimize>false</Optimize>
22+
<DefineConstants>TRACE;DEBUG</DefineConstants>
23+
<PlatformTarget>x86</PlatformTarget>
24+
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
26+
<OutputPath>..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\Release\uap10.0.17763\Design\</OutputPath>
27+
<DebugType>pdbonly</DebugType>
28+
<PlatformTarget>x86</PlatformTarget>
29+
<Optimize>true</Optimize>
30+
<DefineConstants>TRACE</DefineConstants>
31+
</PropertyGroup>
32+
<PropertyGroup>
33+
<AssetTargetFallback>$(AssetTargetFallback);uap10.0.17763</AssetTargetFallback>
34+
</PropertyGroup>
35+
<ItemGroup>
36+
<Reference Include="System.Runtime" />
37+
<Reference Include="System.ObjectModel" />
38+
<Reference Include="System.Runtime.WindowsRuntime" />
39+
<Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
40+
<Reference Include="Microsoft.VisualStudio.DesignTools.Extensibility">
41+
<SpecificVersion>False</SpecificVersion>
42+
<Private>False</Private>
43+
</Reference>
44+
<Reference Include="Microsoft.VisualStudio.DesignTools.Interaction">
45+
<SpecificVersion>False</SpecificVersion>
46+
<Private>False</Private>
47+
</Reference>
48+
<Reference Include="System" />
49+
<Reference Include="System.Core" />
50+
<Reference Include="System.Xml.Linq" />
51+
<Reference Include="System.Data.DataSetExtensions" />
52+
<Reference Include="Microsoft.CSharp" />
53+
<Reference Include="System.Data" />
54+
<Reference Include="System.Xml" />
55+
<Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
57+
<HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
58+
</Reference>
59+
<Reference Include="WindowsBase" />
60+
<Reference Include="PresentationCore" />
61+
<Reference Include="PresentationFramework" />
62+
</ItemGroup>
63+
<ItemGroup Label="WinRT References">
64+
<Reference Include="System.Xaml" />
65+
<Reference Include="System.Runtime.WindowsRuntime.UI.Xaml" />
66+
<Reference Include="Windows.Foundation.FoundationContract">
67+
<HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.FoundationContract\3.0.0.0\Windows.Foundation.FoundationContract.winmd</HintPath>
68+
<Aliases>WindowsRuntime</Aliases>
69+
<Private>False</Private>
70+
</Reference>
71+
<Reference Include="Windows.Foundation.UniversalApiContract">
72+
<HintPath>$(ProgramFiles)\Windows Kits\10\References\10.0.17763.0\Windows.Foundation.UniversalApiContract\7.0.0.0\Windows.Foundation.UniversalApiContract.winmd</HintPath>
73+
<Aliases>WindowsRuntime</Aliases>
74+
<Private>False</Private>
75+
</Reference>
76+
</ItemGroup>
77+
<ItemGroup>
78+
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\Constants.cs" Link="Common\Constants.cs" />
79+
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\MetadataRegistrationBase.cs" Link="Common\MetadataRegistrationBase.cs" />
80+
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\Common\PlatformTypes.cs" Link="Common\PlatformTypes.cs" />
81+
<Compile Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Design\MetadataRegistration.cs" Link="MetadataRegistration.cs" />
82+
<Compile Include="Controls\AdaptiveGridView.Metadata.cs" />
83+
<Compile Include="Controls\AdaptiveGridView.Typedata.cs" />
84+
<Compile Include="Controls\WrapPanel.Metadata.cs" />
85+
<Compile Include="Controls\WrapPanel.Typedata.cs" />
86+
<Compile Include="Properties\AssemblyInfo.cs">
87+
<SubType>Code</SubType>
88+
</Compile>
89+
<AppDesigner Include="Properties\" />
90+
<Compile Include="Properties\Resources.Designer.cs">
91+
<DependentUpon>Resources.resx</DependentUpon>
92+
<AutoGen>True</AutoGen>
93+
<DesignTime>True</DesignTime>
94+
</Compile>
95+
</ItemGroup>
96+
<ItemGroup>
97+
<EmbeddedResource Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\bin\$(Configuration)\uap10.0.17763\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml">
98+
<Link>Microsoft.Toolkit.Uwp.UI.Controls.Primitives.xml</Link>
99+
<Visible>False</Visible>
100+
</EmbeddedResource>
101+
<EmbeddedResource Include="Properties\Resources.resx">
102+
<Generator>ResXFileCodeGenerator</Generator>
103+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
104+
</EmbeddedResource>
105+
</ItemGroup>
106+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
107+
<!-- No-op to avoid build error when packing solution from commandline -->
108+
<Target Name="Pack" />
109+
</Project>
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using System.Reflection;
6+
using System.Runtime.InteropServices;
7+
8+
// General Information about an assembly is controlled through the following
9+
// set of attributes. Change these attribute values to modify the information
10+
// associated with an assembly.
11+
[assembly: AssemblyTitle("Windows Community Toolkit Primitive Controls (Design)")]
12+
[assembly: AssemblyDescription("Design time support for Windows Community Toolkit Primitive Controls")]
13+
[assembly: AssemblyConfiguration("")]
14+
[assembly: AssemblyCompany("Microsoft")]
15+
[assembly: AssemblyProduct("Windows Community Toolkit")]
16+
[assembly: AssemblyCopyright("Copyright © Microsoft 2020")]
17+
[assembly: AssemblyTrademark("")]
18+
[assembly: AssemblyCulture("")]
19+
20+
// Setting ComVisible to false makes the types in this assembly not visible
21+
// to COM components. If you need to access a type in this assembly from
22+
// COM, set the ComVisible attribute to true on that type.
23+
[assembly: ComVisible(false)]
24+
25+
//In order to begin building localizable applications, set
26+
//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
27+
//inside a <PropertyGroup>. For example, if you are using US English
28+
//in your source files, set the <UICulture> to en-US. Then uncomment
29+
//the NeutralResourceLanguage attribute below. Update the "en-US" in
30+
//the line below to match the UICulture setting in the project file.
31+
32+
//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]

0 commit comments

Comments
 (0)