Skip to content

Commit 5c190b2

Browse files
michael-hawkermichael-hawker
authored
Merge branch 'master' into sample-app-updates
2 parents a3f4ce4 + af7297a commit 5c190b2

File tree

9 files changed

+69
-2
lines changed

9 files changed

+69
-2
lines changed

‎Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ private static Type LookForTypeByName(string typeName)
659659
GridSplitter.GridResizeDirection.Auto.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Layout
660660
typeof(MarkdownTextBlock), // Microsoft.Toolkit.Uwp.UI.Controls.Markdown
661661
BitmapFileFormat.Bmp.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Media
662+
typeof(AlphaMode), // Microsoft.Toolkit.Uwp.UI.Media
662663
StretchChild.Last.GetType() // Microsoft.Toolkit.Uwp.UI.Controls.Primitivs
663664
};
664665

‎Microsoft.Toolkit.Uwp.UI.Controls.Core/Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
3434
</ItemGroup>
3535

36+
<ItemGroup>
37+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
38+
</ItemGroup>
39+
3640
<ItemGroup>
3741
<PRIResource Include="Strings\en-us\Resources.resw" />
3842
</ItemGroup>

‎Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
1818
</ItemGroup>
1919

20+
<ItemGroup>
21+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
22+
</ItemGroup>
23+
2024
<ItemGroup>
2125
<Compile Update="Properties\Resources.Designer.cs">
2226
<DesignTime>True</DesignTime>

‎Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
3131
</ItemGroup>
3232

33+
<ItemGroup>
34+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
35+
</ItemGroup>
36+
3337
<ItemGroup>
3438
<PRIResource Include="Strings\en-us\Resources.resw" />
3539
</ItemGroup>

‎Microsoft.Toolkit.Uwp.UI.Controls.Layout/Microsoft.Toolkit.Uwp.UI.Controls.Layout.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
3434
</ItemGroup>
3535

36+
<ItemGroup>
37+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
38+
</ItemGroup>
39+
3640
<ItemGroup>
3741
<PRIResource Include="Strings\en-us\Resources.resw" />
3842
</ItemGroup>

‎Microsoft.Toolkit.Uwp.UI.Controls.Markdown/Microsoft.Toolkit.Uwp.UI.Controls.Markdown.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="ColorCode.UWP" Version="2.0.6" />
22+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
2223
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
2324
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
2425
</ItemGroup>

‎Microsoft.Toolkit.Uwp.UI.Controls.Media/Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
2122
<PackageReference Include="System.Text.Json" Version="4.7.2" />
2223
<PackageReference Include="Win2D.uwp" Version="1.25.0" />
2324
</ItemGroup>

‎Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
<Project Sdk="MSBuild.Sdk.Extras">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22
<PropertyGroup>
33
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
44
<Title>Windows Community Toolkit Controls</Title>
5+
<Description>
6+
This library provides Controls, Panels, ItemsRepeater Layouts, and various other classes &amp; helpers for XAML UI development with UWP. It is part of the Windows Community Toolkit.
7+
8+
This package provides no actual code and is only an aggregate of its dependencies. You can find out how to optimize your app after development at https://aka.ms/wct/optimize
9+
</Description>
510
<IncludeBuildOutput>false</IncludeBuildOutput>
611
</PropertyGroup>
7-
12+
813
<ItemGroup>
14+
<None Include="$(MSBuildThisFileDirectory)readme.txt" Pack="true" PackagePath="\"/>
915
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
1016
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
1117
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj" />

‎Microsoft.Toolkit.Uwp.UI.Controls/readme.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
Thanks for installing the Windows Community Toolkit Controls NuGet package!
2+
3+
This is a meta-package made up of various Windows Community Toolkit packages.
4+
It is for your ease and convenience to use all of the controls available!
5+
6+
You also have the option to only use packages you need which can help optimize the
7+
size of your application once you are ready to ship. Visit https://aka.ms/wct/optimize to learn more.
8+
9+
You can find out more about the Windows Community Toolkit at https://aka.ms/windowstoolkit
10+
Or even try our controls in our sample app at https://aka.ms/windowstoolkitapp
11+
Docs are available here: https://aka.ms/windowstoolkitdocs
12+
13+
The Windows Community Toolkit is made possible by our developer community!
14+
Every contribution made to the Toolkit helps everyone, to learn how to contribute visit https://aka.ms/wct/wiki
15+
16+
----
17+
18+
This package also depends on the WinUI library, so you'll need to set XamlControlsResources as your Application resources in App.xaml:
19+
20+
<Application>
21+
<Application.Resources>
22+
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
23+
</Application.Resources>
24+
</Application>
25+
26+
If you have other resources, then we recommend you add those to the XamlControlsResources' MergedDictionaries.
27+
This works with the platform's resource system to allow overrides of the XamlControlsResources resources.
28+
29+
<Application
30+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
31+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
32+
xmlns:controls="using:Microsoft.UI.Xaml.Controls">
33+
<Application.Resources>
34+
<controls:XamlControlsResources>
35+
<controls:XamlControlsResources.MergedDictionaries>
36+
<!-- Other app resources here -->
37+
</controls:XamlControlsResources.MergedDictionaries>
38+
</controls:XamlControlsResources>
39+
</Application.Resources>
40+
</Application>
41+
42+
See http://aka.ms/winui for more information about the WinUI library.

0 commit comments

Comments
 (0)