Skip to content

chore: 更新至Avalonia 12 #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Qianyiaz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: 更新至Avalonia 12 #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PCL.Neo.Core/Models/Minecraft/Mod/ModInfoReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static async Task<IEnumerable<ModInfo>> GetModInfo(string modDir)
mods.Add(modInfo);
break;
case ModInfoType.MetaInf:
var tomlContent = Toml.ToModel<MetaModInfo>(rawContent).Mods.First();
var tomlContent = TomlSerializer.Deserialize<MetaModInfo>(rawContent)!.Mods.First();

// copy mod icon
if (!string.IsNullOrEmpty(tomlContent.LogoFile))
Expand Down
12 changes: 6 additions & 6 deletions PCL.Neo.Core/PCL.Neo.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.10" />
<PackageReference Include="Avalonia" Version="12.0.4" />
<PackageReference Include="LZMA-SDK" Version="22.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.8" />
<PackageReference Include="SevenZip" Version="19.0.0" />
<PackageReference Include="SkiaSharp" Version="3.119.1" />
<PackageReference Include="SkiaSharp" Version="3.119.4" />
<PackageReference Include="System.Reactive" Version="6.1.0" />
<PackageReference Include="System.Reactive.Linq" Version="6.1.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Tomlyn" Version="0.19.0" />
<PackageReference Include="Tomlyn" Version="2.4.2" />
<PackageReference Include="UltimateLogSystem" Version="1.1.0" />
</ItemGroup>

Expand Down
16 changes: 0 additions & 16 deletions PCL.Neo/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ public override void OnFrameworkInitializationCompleted()
Task.Run(Ioc.Default.GetRequiredService<IJavaManager>().JavaListInitAsync);
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
// Avoid duplicate validations from both Avalonia and the CommunityToolkit.
// More info: https://docs.avaloniaui.net/docs/guides/development-guides/data-validation#manage-validationplugins
DisableAvaloniaDataAnnotationValidation();
desktop.MainWindow = new MainWindow { DataContext = vm };
// 由于导航改成了异步方法，在构造函数中无法正常导向首页，需要在此处导向
Ioc.Default.GetRequiredService<INavigationService>().GoToAsync<HomeViewModel>()
Expand All @@ -68,17 +65,4 @@ public override void OnFrameworkInitializationCompleted()

base.OnFrameworkInitializationCompleted();
}

private void DisableAvaloniaDataAnnotationValidation()
{
// Get an array of plugins to remove
var dataValidationPluginsToRemove =
BindingPlugins.DataValidators.OfType<DataAnnotationsValidationPlugin>().ToArray();

// remove each entry found
foreach (var plugin in dataValidationPluginsToRemove)
{
BindingPlugins.DataValidators.Remove(plugin);
}
}
}
30 changes: 14 additions & 16 deletions PCL.Neo/PCL.Neo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<OutputType>WinExe</OutputType>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationManifest>app.manifest</ApplicationManifest>
<ApplicationIcon>Assets/Icon.ico</ApplicationIcon>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<CFBundleName>PCL.Neo</CFBundleName>
<CFBundleDisplayName>PCL.Neo</CFBundleDisplayName>
<CFBundleIdentifier>github.com/PCL-Community/PCL.Neo</CFBundleIdentifier>
Expand All @@ -33,24 +31,24 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.10" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.10" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.10">
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
</PackageReference>
<PackageReference Include="Avalonia.Controls.DataGrid" Version="12.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="12.0.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.4" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="12.0.4" />
<PackageReference Include="DotNet.Bundle" Version="0.9.13" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
<PackageReference Include="LZMA-SDK" Version="22.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.8" />
<PackageReference Include="System.Reactive" Version="6.1.0" />
<PackageReference Include="System.Reactive.Linq" Version="6.1.0" />
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.9" />
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="12.0.0.1" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Debug'">
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.2"/>
<PackageReference Include="HotAvalonia" Version="3.1.1" PrivateAssets="All"/>
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="12.0.4" PrivateAssets="All"/>
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions PCL.Neo/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ public static AppBuilder BuildAvaloniaApp()
{
return AppBuilder.Configure<App>()
.UsePlatformDetect()
#if DEBUG
.WithDeveloperTools()
#endif
.WithInterFont()
.LogToTrace()
.With(() => new FontManagerOptions
Expand Down
2 changes: 1 addition & 1 deletion PCL.Neo/Views/MainWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Height="500"
MinHeight="470"
MinWidth="810"
SystemDecorations="None"
WindowDecorations="None"
Title="PCL.Neo"
TransparencyLevelHint="Transparent"
Width="850"
Expand Down
2 changes: 1 addition & 1 deletion PCL.Neo/Views/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
using PCL.Neo.Animations.Easings;
using PCL.Neo.Helpers;
using PCL.Neo.Messages;
using PCL.Neo.Services;
using System;
using System.Numerics;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using CubicEaseOut = Avalonia.Animation.Easings.CubicEaseOut;
using NavigationType = PCL.Neo.Services.NavigationType;

namespace PCL.Neo.Views;

Expand Down
5 changes: 2 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"sdk": {
"version": "9.0.0",
"rollForward": "latestMajor",
"allowPrerelease": true
"version": "10.0.0",
"rollForward": "latestMajor"
}
}
Loading