dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Dan Clark
2025-02-06 21:21:29 +00:00
parent 8bbfc415e6
commit 63f448f490
11 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.Avalonia/Toolkit.Avalonia.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.1" /> <PackageReference Include="Avalonia" Version="11.2.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" /> <ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" />
Toolkit.Foundation/Toolkit.Foundation.csproj
+3 -3
View File
@@ -6,9 +6,9 @@
<Platforms>AnyCPU;x64;x86</Platforms> <Platforms>AnyCPU;x64;x86</Platforms>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview2" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Json.More.Net" Version="2.0.2" /> <PackageReference Include="Json.More.Net" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.1" />
<PackageReference Include="System.Reactive" Version="6.0.1" /> <PackageReference Include="System.Reactive" Version="6.0.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>
Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj
+2 -2
View File
@@ -6,8 +6,8 @@
<Platforms>AnyCPU;x64;x86</Platforms> <Platforms>AnyCPU;x64;x86</Platforms>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.1" /> <PackageReference Include="Avalonia" Version="11.2.3" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.8" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" /> <ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" />
Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj
+3 -3
View File
@@ -13,10 +13,10 @@
<AvaloniaResource Include="Fonts\FluentSystemIcons-Resizable.ttf" /> <AvaloniaResource Include="Fonts\FluentSystemIcons-Resizable.ttf" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.1" /> <PackageReference Include="Avalonia" Version="11.2.3" />
<PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.2.0" /> <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.2.0" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.8" />
<PackageReference Include="Avalonia.Labs.Controls" Version="11.2.0" /> <PackageReference Include="Avalonia.Labs.Controls" Version="11.2.0" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0" /> <PackageReference Include="FluentAvaloniaUI" Version="2.2.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
Toolkit.UI.WinUI/ComparisonCondition.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using Microsoft.UI.Xaml; using Microsoft.UI.Xaml;
using Microsoft.Xaml.Interactions.Core; using Microsoft.Xaml.Interactivity;
using Toolkit.Foundation; using Toolkit.Foundation;
namespace Toolkit.UI.WinUI; namespace Toolkit.UI.WinUI;
Toolkit.UI.WinUI/ComparisonLogic.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using Microsoft.Xaml.Interactions.Core; using Microsoft.Xaml.Interactivity;
using System; using System;
using System.ComponentModel; using System.ComponentModel;
using System.Globalization; using System.Globalization;
Toolkit.UI.WinUI/Toolkit.UI.WinUI.csproj
+3 -4
View File
@@ -10,16 +10,15 @@
win10-x86;win10-x64;win10-arm64 win10-x86;win10-x64;win10-arm64
</RuntimeIdentifiers> </RuntimeIdentifiers>
<UseWinUI>true</UseWinUI> <UseWinUI>true</UseWinUI>
<WindowsSdkPackageVersion>10.0.19041.41</WindowsSdkPackageVersion>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
<PackageReference Include="WinUIEx" Version="2.5.0" /> <PackageReference Include="WinUIEx" Version="2.5.1" />
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" /> <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
Toolkit.UI.WinUI/WindowExtensions.cs
+1 -1
View File
@@ -166,7 +166,7 @@ public static partial class WindowExtensions
HBRUSH hBrush = PInvoke.CreateSolidBrush(new COLORREF((uint)ToWin32(Color.Black))); HBRUSH hBrush = PInvoke.CreateSolidBrush(new COLORREF((uint)ToWin32(Color.Black)));
_ = PInvoke.FillRect(new HDC((nint)wParam.Value), _ = PInvoke.FillRect(new HDC((nint)wParam.Value),
&rect, hBrush); &rect, hBrush);
_ = PInvoke.DeleteObject(new HGDIOBJ(hBrush)); _ = PInvoke.DeleteObject(new HGDIOBJ((void*)hBrush));
return new LRESULT(1); return new LRESULT(1);
} }
Toolkit.WinUI/Toolkit.WinUI.csproj
+1 -2
View File
@@ -13,12 +13,11 @@
win10-x86;win10-x64;win10-arm64 win10-x86;win10-x64;win10-arm64
</RuntimeIdentifiers> </RuntimeIdentifiers>
<UseWinUI>true</UseWinUI> <UseWinUI>true</UseWinUI>
<WindowsSdkPackageVersion>10.0.19041.41</WindowsSdkPackageVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" /> <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" /> <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
Toolkit.Windows/Toolkit.Windows.csproj
+1 -1
View File
@@ -11,7 +11,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106"> <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.162">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
Toolkit.sln
+2 -2
View File
@@ -75,8 +75,8 @@ Global
{9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x64.Build.0 = Release|Any CPU {9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x64.Build.0 = Release|Any CPU
{9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x86.ActiveCfg = Release|Any CPU {9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x86.ActiveCfg = Release|Any CPU
{9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x86.Build.0 = Release|Any CPU {9585A317-4405-4E39-BDBE-23EF822FBF34}.Release|x86.Build.0 = Release|Any CPU
{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|Any CPU.ActiveCfg = Debug|x64 {08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|Any CPU.Build.0 = Debug|x64 {08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x64.ActiveCfg = Debug|x64 {08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x64.ActiveCfg = Debug|x64
{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x64.Build.0 = Debug|x64 {08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x64.Build.0 = Debug|x64
{08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x86.ActiveCfg = Debug|x86 {08F06CCE-86F9-4885-84F0-B23B2E5A0813}.Debug|x86.ActiveCfg = Debug|x86