Skip to content

Commit

Permalink
Merge branch 'main' into ci/diagnostics/debug-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
Arlodotexe authored Jan 4, 2025
2 parents f4653a2 + 3ae9771 commit 4b98b36
Show file tree
Hide file tree
Showing 180 changed files with 1,805 additions and 593 deletions.
7 changes: 2 additions & 5 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.208.0/containers/dotnet/.devcontainer/base.Dockerfile

# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
ARG VARIANT="6.0-bullseye-slim"
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
# See https://github.com/devcontainers/images/tree/main/src/dotnet for image choices
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:9.0

# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
ARG NODE_VERSION="none"
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0
// Append -bullseye or -focal to pin to an OS version.
"VARIANT": "8.0",
"VARIANT": "9.0",
// Options
"NODE_VERSION": "lts/*"
}
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ contact_links:
about: "The Windows Community Toolkit uses Uno Platform for cross-platform WinUI. See the Uno Platform repo for issues specific to running on non-Windows platforms:"
- name: Discord
url: https://aka.ms/wct/discord
about: "Join the UWP Discord Server and talk to us in the #community-toolkit channel."
about: "Join the Windows App Community Discord Server and talk to us in the #community-toolkit channel."
204 changes: 130 additions & 74 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"omnisharp.defaultLaunchSolution": "CommunityToolkit.AllComponents.sln",
"omnisharp.disableMSBuildDiagnosticWarning": true,
"omnisharp.enableRoslynAnalyzers": true,
"omnisharp.useGlobalMono": "never",
Expand All @@ -8,5 +7,6 @@
"csharp.suppressDotnetRestoreNotification": true,
"csharp.semanticHighlighting.enabled": true,
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
"dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true
"dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true,
"dotnet.defaultSolution": "CommunityToolkit.AllComponents.sln"
}
8 changes: 6 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<MajorVersion>8</MajorVersion>
<MinorVersion>1</MinorVersion>
<MinorVersion>2</MinorVersion>

<PackageIdPrefix>CommunityToolkit</PackageIdPrefix>
<RepositoryDirectory>$([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)'))</RepositoryDirectory>
Expand All @@ -26,7 +26,11 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>$(NoWarn);Uno0001</NoWarn>
<!-- TODO: Turn off sample pages needing samples for now, for initial commit -->
<NoWarn>$(NoWarn);TKSMPL0014</NoWarn>
<NoWarn>$(NoWarn);TKSMPL0014;</NoWarn>

<!-- See https://github.com/CommunityToolkit/Windows/pull/567#issuecomment-2498739244 -->
<WarningsNotAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
<NoWarn>$(NoWarn);TKSMPL0014;</NoWarn>
</PropertyGroup>

<Import Project="Windows.Toolkit.Common.props" />
Expand Down
6 changes: 5 additions & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<Project>
<ItemGroup>
<!-- Workaround for WebView2 on uap pulling in Microsoft.VCLibs.Desktop when it shouldn't -->
<SDKReference Remove="Microsoft.VCLibs.Desktop, Version=14.0" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.7.0" PrivateAssets="all" Pack="false" />
<PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.12.1" PrivateAssets="all" Pack="false" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions GenerateAllSolution.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@ECHO OFF
SET "IncludeHeads=%1"
IF "%IncludeHeads%"=="" SET "IncludeHeads=all"
SET "MultiTargets=%1"
IF "%MultiTargets%"=="" SET "MultiTargets=uwp,wasdk,wasm"

powershell .\tooling\GenerateAllSolution.ps1 -IncludeHeads %IncludeHeads%
powershell .\tooling\GenerateAllSolution.ps1 -MultiTargets %MultiTargets%
12 changes: 8 additions & 4 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ _Building something cool? Want to engage with other developers? Want to contribu

### [Try out our Sample Gallery from the Microsoft Store](https://aka.ms/windowstoolkitapp)

Want to see the toolkit in action before jumping into the code? Download and play with the [Windows Community Toolkit Gallery](https://www.microsoft.com/store/apps/9nblggh4tlcq) from the Store.
Want to see the toolkit in action before jumping into the code? Download and play with the [Windows Community Toolkit Gallery](https://aka.ms/windowstoolkitapp) from the Store.

Please read the [Getting Started with the Windows Community Toolkit](https://docs.microsoft.com/dotnet/communitytoolkit/windows/getting-started) page for more detailed information about using the toolkit.

If you're updating from a pre-8.x version of the Windows Community Toolkit, see [our migration notes here](https://aka.ms/toolkit/windows/migration).

### Windows Community Toolkit Labs

Have an idea for a new feature? Want to checkout the latest things being built. _[Then head over to Windows Community Toolkit Labs](https://aka.ms/toolkit/labs/windows)_.
Expand All @@ -34,9 +36,11 @@ git clone --recurse-submodules https://github.com/CommunityToolkit/Windows.git
## Build Requirements

- Visual Studio 2022 (UWP & Desktop Workloads for .NET)
- .NET 6 SDK
- Windows App SDK
- Windows SDK 19041
- .NET 8 SDK
- Windows 10 SDK, version 2004 (10.0.19041.0)
- Windows 10 21H1 (Build 19043) or greater
- Run `dotnet tool restore` from the project root to install SlnGen
- Run build scripts from the [Developer Command Prompt for Visual Studio](https://learn.microsoft.com/visualstudio/ide/reference/command-prompt-powershell) or from elsewhere after adding `MSBuild.exe` to your PATH

## 🚀 Contribution

Expand Down
4 changes: 0 additions & 4 deletions Windows.Toolkit.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,4 @@
<IsPublishable>true</IsPublishable>
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>

<ItemGroup>
<Compile Include="$(RepositoryDirectory)tooling\GlobalUsings.cs" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class BooleanNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ExpressionNode" />
public sealed class BooleanNode : ExpressionNode
public sealed partial class BooleanNode : ExpressionNode
{
/// <summary>
/// Initializes a new instance of the <see cref="BooleanNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class ColorNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ExpressionNode" />
public sealed class ColorNode : ExpressionNode
public sealed partial class ColorNode : ExpressionNode
{
/// <summary>
/// Initializes a new instance of the <see cref="ColorNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class Matrix3x2Node. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ExpressionNode" />
public sealed class Matrix3x2Node : ExpressionNode
public sealed partial class Matrix3x2Node : ExpressionNode
{
/// <summary>
/// Initializes a new instance of the <see cref="Matrix3x2Node"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class QuaternionNode. This class cannot be inherited.
/// </summary>
/// <seealso cref=CommunityToolkit.WinUI.Animations.Expressions.ExpressionNode" />
public sealed class QuaternionNode : ExpressionNode
public sealed partial class QuaternionNode : ExpressionNode
{
/// <summary>
/// Initializes a new instance of the <see cref="QuaternionNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class ScalarNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ExpressionNode" />
public sealed class ScalarNode : ExpressionNode
public sealed partial class ScalarNode : ExpressionNode
{
/// <summary>
/// Initializes a new instance of the <see cref="ScalarNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class Vector2Node. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ExpressionNode" />
public sealed class Vector2Node : ExpressionNode
public sealed partial class Vector2Node : ExpressionNode
{
/// <summary>
/// Initializes a new instance of the <see cref="Vector2Node"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class Vector3Node. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ExpressionNode" />
public sealed class Vector3Node : ExpressionNode
public sealed partial class Vector3Node : ExpressionNode
{
/// <summary>
/// Initializes a new instance of the <see cref="Vector3Node"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class Vector4Node. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ExpressionNode" />
public sealed class Vector4Node : ExpressionNode
public sealed partial class Vector4Node : ExpressionNode
{
/// <summary>
/// Initializes a new instance of the <see cref="Vector4Node"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class AmbientLightReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="ReferenceNode" />
public sealed class AmbientLightReferenceNode : ReferenceNode
public sealed partial class AmbientLightReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="AmbientLightReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class ColorBrushReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class ColorBrushReferenceNode : ReferenceNode
public sealed partial class ColorBrushReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="ColorBrushReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class DistantLightReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class DistantLightReferenceNode : ReferenceNode
public sealed partial class DistantLightReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="DistantLightReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class DropShadowReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class DropShadowReferenceNode : ReferenceNode
public sealed partial class DropShadowReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="DropShadowReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class InsetClipReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class InsetClipReferenceNode : ReferenceNode
public sealed partial class InsetClipReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="InsetClipReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class InteractionTrackerReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class InteractionTrackerReferenceNode : ReferenceNode
public sealed partial class InteractionTrackerReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="InteractionTrackerReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class ManipulationPropertySetReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.PropertySetReferenceNode" />
public sealed class ManipulationPropertySetReferenceNode : PropertySetReferenceNode
public sealed partial class ManipulationPropertySetReferenceNode : PropertySetReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="ManipulationPropertySetReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class NineGridBrushReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class NineGridBrushReferenceNode : ReferenceNode
public sealed partial class NineGridBrushReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="NineGridBrushReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class PointLightReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class PointLightReferenceNode : ReferenceNode
public sealed partial class PointLightReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="PointLightReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class PointerPositionPropertySetReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.PropertySetReferenceNode" />
public sealed class PointerPositionPropertySetReferenceNode : PropertySetReferenceNode
public sealed partial class PointerPositionPropertySetReferenceNode : PropertySetReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="PointerPositionPropertySetReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class PropertySetReferenceNode.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public class PropertySetReferenceNode : ReferenceNode
public partial class PropertySetReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="PropertySetReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class SpotLightReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class SpotLightReferenceNode : ReferenceNode
public sealed partial class SpotLightReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="SpotLightReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class SurfaceBrushReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class SurfaceBrushReferenceNode : ReferenceNode
public sealed partial class SurfaceBrushReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="SurfaceBrushReferenceNode"/> class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace CommunityToolkit.WinUI.Animations.Expressions;
/// Class VisualReferenceNode. This class cannot be inherited.
/// </summary>
/// <seealso cref="CommunityToolkit.WinUI.Animations.Expressions.ReferenceNode" />
public sealed class VisualReferenceNode : ReferenceNode
public sealed partial class VisualReferenceNode : ReferenceNode
{
/// <summary>
/// Initializes a new instance of the <see cref="VisualReferenceNode" /> class.
Expand Down
2 changes: 1 addition & 1 deletion components/Animations/src/Xaml/AnimationScope.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace CommunityToolkit.WinUI.Animations;
/// A container of <see cref="ITimeline"/> elements that can be used to conceptually group animations
/// together and to assign shared properties to be applied to all the contained items automatically.
/// </summary>
public sealed class AnimationScope : DependencyObjectCollection, ITimeline
public sealed partial class AnimationScope : DependencyObjectCollection, ITimeline
{
/// <summary>
/// Gets or sets the optional initial delay for the animation.
Expand Down
2 changes: 1 addition & 1 deletion components/Animations/src/Xaml/AnimationSet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ namespace CommunityToolkit.WinUI.Animations;
/// A collection of animations that can be grouped together. This type represents a composite animation
/// (such as <see cref="Storyboard"/>) that can be executed on a given element.
/// </summary>
public sealed class AnimationSet : DependencyObjectCollection
public sealed partial class AnimationSet : DependencyObjectCollection
{
/// <summary>
/// A conditional weak table storing <see cref="CancellationTokenSource"/> instances associated with animations
Expand Down
2 changes: 1 addition & 1 deletion components/Animations/src/Xaml/ImplicitAnimationSet.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace CommunityToolkit.WinUI.Animations;
/// one <see cref="ImplicitAnimationSet"/> to another, and doing so will add unnecessary runtime overhead over time. If you want to apply the same animations
/// to multiple elements, simply create another <see cref="ImplicitAnimationSet"/> instance and another set of animations with the same properties within it.
/// </remarks>
public sealed class ImplicitAnimationSet : DependencyObjectCollection
public sealed partial class ImplicitAnimationSet : DependencyObjectCollection
{
/// <summary>
/// Raised whenever any configuration change occurrs within the current <see cref="ImplicitAnimationSet"/> instance.
Expand Down
Loading

0 comments on commit 4b98b36

Please sign in to comment.