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

Update mnigets

Browse Source
This commit is contained in:
Dan Clark
2024-11-02 21:33:17 +00:00
parent 116c83f130
commit 469a52efaa
6 changed files with 28 additions and 10 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.0-rc1" /> <PackageReference Include="Avalonia" Version="11.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" /> <ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" />
Toolkit.Foundation/Toolkit.Foundation.csproj
+2 -2
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.3.2" /> <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview1" />
<PackageReference Include="Json.More.Net" Version="2.0.2" /> <PackageReference Include="Json.More.Net" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.1.24431.7" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.2.24473.5" />
<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.0-rc1" /> <PackageReference Include="Avalonia" Version="11.2.0" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0.4" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0" />
</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
+4 -4
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.0-rc1" /> <PackageReference Include="Avalonia" Version="11.2.0" />
<PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.1.0.1" /> <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.2.0" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0.4" /> <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0" />
<PackageReference Include="Avalonia.Labs.Controls" Version="11.1.0" /> <PackageReference Include="Avalonia.Labs.Controls" Version="11.2.0" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0" /> <PackageReference Include="FluentAvaloniaUI" Version="2.1.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
Toolkit.WinUI/IServiceCollectionExtensions.cs
+18
View File
@@ -0,0 +1,18 @@
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Toolkit.Foundation;
namespace Toolkit.WinUI;
public static class IServiceCollectionExtensions
{
public static IServiceCollection AddWinUI(this IServiceCollection services)
{
services.AddTransient<IDispatcherTimerFactory, DispatcherTimerFactory>();
return services;
}
}
Toolkit.Windows/Toolkit.Windows.csproj
+1 -1
View File
@@ -15,7 +15,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="WindowsShortcutFactory" Version="1.0.1" /> <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>