Merge branch 'master' into sample-app-updates
This commit is contained in:
Michael Hawker MSFT (XAML Llama)
GitHub
Коммит
5c190b2b09
|
|
@ -659,6 +659,7 @@ namespace Microsoft.Toolkit.Uwp.SampleApp
|
|||
GridSplitter.GridResizeDirection.Auto.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Layout
|
||||
typeof(MarkdownTextBlock), // Microsoft.Toolkit.Uwp.UI.Controls.Markdown
|
||||
BitmapFileFormat.Bmp.GetType(), // Microsoft.Toolkit.Uwp.UI.Controls.Media
|
||||
typeof(AlphaMode), // Microsoft.Toolkit.Uwp.UI.Media
|
||||
StretchChild.Last.GetType() // Microsoft.Toolkit.Uwp.UI.Controls.Primitivs
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@
|
|||
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PRIResource Include="Strings\en-us\Resources.resw" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@
|
|||
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="Properties\Resources.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@
|
|||
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PRIResource Include="Strings\en-us\Resources.resw" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -33,6 +33,10 @@
|
|||
<None Include="$(OutDir)\Design\$(MSBuildProjectName).Design*.dll;$(OutDir)\Design\$(MSBuildProjectName).Design*.pdb" Pack="true" PackagePath="lib\$(TargetFramework)\Design" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PRIResource Include="Strings\en-us\Resources.resw" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="ColorCode.UWP" Version="2.0.6" />
|
||||
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI\Microsoft.Toolkit.Uwp.UI.csproj" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
|
||||
<PackageReference Include="System.Text.Json" Version="4.7.2" />
|
||||
<PackageReference Include="Win2D.uwp" Version="1.25.0" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,17 @@
|
|||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
<Project Sdk="MSBuild.Sdk.Extras">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>uap10.0.17763</TargetFrameworks>
|
||||
<Title>Windows Community Toolkit Controls</Title>
|
||||
<Description>
|
||||
This library provides Controls, Panels, ItemsRepeater Layouts, and various other classes & helpers for XAML UI development with UWP. It is part of the Windows Community Toolkit.
|
||||
|
||||
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
|
||||
</Description>
|
||||
<IncludeBuildOutput>false</IncludeBuildOutput>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<None Include="$(MSBuildThisFileDirectory)readme.txt" Pack="true" PackagePath="\"/>
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj" />
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
Thanks for installing the Windows Community Toolkit Controls NuGet package!
|
||||
|
||||
This is a meta-package made up of various Windows Community Toolkit packages.
|
||||
It is for your ease and convenience to use all of the controls available!
|
||||
|
||||
You also have the option to only use packages you need which can help optimize the
|
||||
size of your application once you are ready to ship. Visit https://aka.ms/wct/optimize to learn more.
|
||||
|
||||
You can find out more about the Windows Community Toolkit at https://aka.ms/windowstoolkit
|
||||
Or even try our controls in our sample app at https://aka.ms/windowstoolkitapp
|
||||
Docs are available here: https://aka.ms/windowstoolkitdocs
|
||||
|
||||
The Windows Community Toolkit is made possible by our developer community!
|
||||
Every contribution made to the Toolkit helps everyone, to learn how to contribute visit https://aka.ms/wct/wiki
|
||||
|
||||
----
|
||||
|
||||
This package also depends on the WinUI library, so you'll need to set XamlControlsResources as your Application resources in App.xaml:
|
||||
|
||||
<Application>
|
||||
<Application.Resources>
|
||||
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
|
||||
</Application.Resources>
|
||||
</Application>
|
||||
|
||||
If you have other resources, then we recommend you add those to the XamlControlsResources' MergedDictionaries.
|
||||
This works with the platform's resource system to allow overrides of the XamlControlsResources resources.
|
||||
|
||||
<Application
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:controls="using:Microsoft.UI.Xaml.Controls">
|
||||
<Application.Resources>
|
||||
<controls:XamlControlsResources>
|
||||
<controls:XamlControlsResources.MergedDictionaries>
|
||||
<!-- Other app resources here -->
|
||||
</controls:XamlControlsResources.MergedDictionaries>
|
||||
</controls:XamlControlsResources>
|
||||
</Application.Resources>
|
||||
</Application>
|
||||
|
||||
See http://aka.ms/winui for more information about the WinUI library.
|
||||
Загрузка…
Ссылка в новой задаче