Skip to content

Commit 6956c73

Browse files
committed
Move some controls to Primitives.
1 parent 5fe63f4 commit 6956c73

27 files changed

+106
-12
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>
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<Project Sdk="MSBuild.Sdk.Extras">
2+
3+
<PropertyGroup>
4+
<TargetFramework>uap10.0.17763</TargetFramework>
5+
<Title>Windows Community Toolkit Controls</Title>
6+
<Description>
7+
This library provides XAML templated controls. It is part of the Windows Community Toolkit.
8+
9+
Controls:
10+
- AdaptiveGridView: Presents items in an evenly-spaced set of columns to fill the total available space.
11+
- DockPanel: Define areas where you can arrange child elements either horizontally or vertically, relative to each other.
12+
- StaggeredPanel: Layout of items in a column approach where an item will be added to whichever column has used the least amount of space.
13+
- UniformGrid: Presents items in an evenly-spaced set of rows or columns to fill the total available display space.
14+
- WrapPanel: Positions child elements in sequential position from left to right and breaks content to the next line.
15+
</Description>
16+
<PackageTags>UWP Toolkit Windows Controls XAML WrapPanel Adaptive DockPanel StaggeredPanel Staggered UniformGrid Uniform Grid</PackageTags>
17+
<!-- ARM64 builds for managed apps use .NET Native. We can't use the Reflection Provider for that. -->
18+
<EnableTypeInfoReflection Condition="'$(Configuration)' == 'Debug'">false</EnableTypeInfoReflection>
19+
<LangVersion>8.0</LangVersion>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj" />
28+
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
29+
</ItemGroup>
30+
31+
<ItemGroup>
32+
<None Include="VisualStudioToolsManifest.xml" Pack="true" PackagePath="tools" />
33+
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design.dll;$(OutDir)\Design\$(MSBuildProjectName).Design.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
34+
</ItemGroup>
35+
36+
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
37+
38+
<!-- https://weblogs.asp.net/rweigelt/disable-warnings-in-generated-c-files-of-uwp-app -->
39+
<Target Name="PragmaWarningDisablePrefixer" AfterTargets="MarkupCompilePass2">
40+
<ItemGroup>
41+
<GeneratedCSFiles Include="**\*.g.cs;**\*.g.i.cs" />
42+
</ItemGroup>
43+
<Message Text="CSFiles: @(GeneratedCSFiles->'&quot;%(Identity)&quot;')" />
44+
<Exec Command="for %%f in (@(GeneratedCSFiles->'&quot;%(Identity)&quot;')) do echo #pragma warning disable &gt; %%f.temp &amp;&amp; type %%f &gt;&gt; %%f.temp &amp;&amp; move /y %%f.temp %%f &gt; NUL" />
45+
</Target>
46+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=adaptivegridview/@EntryIndexedValue">True</s:Boolean>
3+
</wpf:ResourceDictionary>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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.Resources;
6+
using System.Runtime.CompilerServices;
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: InternalsVisibleTo("UnitTests.UWP")]
12+
[assembly: InternalsVisibleTo("UnitTests.XamlIslands.UWPApp")]
13+
[assembly: NeutralResourcesLanguage("en-US")]

0 commit comments

Comments
 (0)