Skip to content

chore: Upgrade Avalonia to 12.0 and migrate codebase #1673

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

Draft
yuto-trd wants to merge 21 commits into
base: main
Choose a base branch
from
+1,590 −4,051
Draft

chore: Upgrade Avalonia to 12.0 and migrate codebase #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
209544d
chore: upgrade Avalonia to 12.0 and related dependencies
yuto-trd Apr 14, 2026
ca17ea6
refactor: replace Avalonia.Diagnostics with AvaloniaUI.DiagnosticsSup…
yuto-trd Apr 14, 2026
8d7ebdc
refactor: remove DirectoryViewTest project and related files
yuto-trd Apr 14, 2026
b259576
refactor: remove custom BcTabItem and BcTabView controls
yuto-trd Apr 14, 2026
a2742ff
refactor: update FluentIcons.FluentAvalonia package reference to Beut…
yuto-trd Apr 14, 2026
94a401b
refactor: migrate to FA components across the application
yuto-trd Apr 14, 2026
e7e56c9
refactor: replace Binding with ReflectionBinding for improved data bi…
yuto-trd Apr 14, 2026
b3dd1ad
refactor: add x:DataType attributes to XAML files for improved data b…
yuto-trd Apr 14, 2026
419040f
refactor: replace MathHelpers.Clamp with Math.Clamp for improved cons…
yuto-trd Apr 14, 2026
3fb3b43
refactor: replace Watermark with PlaceholderText in XAML files for co…
yuto-trd Apr 14, 2026
8c0b05d
refactor: store last PointerPressedEventArgs for improved drag-and-dr…
yuto-trd Apr 14, 2026
dfd84bc
refactor: update GotFocus event handlers to use FocusChangedEventArgs…
yuto-trd Apr 14, 2026
dccc101
refactor: replace Binding with ReflectionBinding in XAML files for im…
yuto-trd Apr 14, 2026
76af3ca
refactor: update window decoration properties for consistency across …
yuto-trd Apr 14, 2026
92208f5
refactor: add Avalonia.Input.Platform namespace for improved input ha…
yuto-trd Apr 14, 2026
39f69ae
refactor: add IsEnabled property and update IListEditorViewModel inte…
yuto-trd Apr 14, 2026
4d58254
refactor: update scaling retrieval to use TopLevel for improved accuracy
yuto-trd Apr 14, 2026
392bd36
refactor: update visual tree methods to use logical tree for improved…
yuto-trd Apr 14, 2026
c5ac13d
refactor: add IsEnabled property synchronization and IsEngineObject i…
yuto-trd Apr 15, 2026
e39cce7
refactor: synchronize CurrentCulture with UICulture in Program.cs
yuto-trd Apr 15, 2026
c71c40c
chore: update package versions for Avalonia 12 compatibility
yuto-trd Apr 23, 2026
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
1 change: 0 additions & 1 deletion Beutl.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<Project Path="tests\Beutl.Extensions.AVFoundation.Tests\Beutl.Extensions.AVFoundation.Tests.csproj" />
<Project Path="tests\Beutl.FFmpegBenchmarks\Beutl.FFmpegBenchmarks.csproj" />
<Project Path="tests\Beutl.UnitTests\Beutl.UnitTests.csproj" />
<Project Path="tests\DirectoryViewTest\DirectoryViewTest.csproj" />
<Project Path="tests\EnumerateFontFamilies\EnumerateFontFamilies.csproj" />
<Project Path="tests\KeySplineEditor\KeySplineEditor.csproj" />
<Project Path="tests\PackageSample\PackageSample.csproj" />
Expand Down
44 changes: 22 additions & 22 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Aigamo.ResXGenerator" Version="4.3.0" />
<PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.7.0" />
<PackageVersion Include="Avalonia" Version="11.3.13" />
<PackageVersion Include="Avalonia.Controls.ItemsRepeater" Version="11.1.5" />
<PackageVersion Include="PanAndZoom" Version="11.3.9.1" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.13" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
<PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.8.0" />
<PackageVersion Include="Avalonia" Version="12.0.1" />
<PackageVersion Include="Avalonia.Controls.ItemsRepeater" Version="12.0.0" />
<PackageVersion Include="PanAndZoom" Version="12.0.0.1" />
<PackageVersion Include="Avalonia.Desktop" Version="12.0.1" />
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.1" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="12.0.1" />
<PackageVersion Include="Silk.NET.MoltenVK.Native" Version="2.23.0" />
<PackageVersion Include="Silk.NET.OpenAL" Version="2.23.0" />
<PackageVersion Include="Silk.NET.OpenAL.Soft.Native" Version="1.23.1" />
Expand All @@ -22,10 +22,10 @@
<PackageVersion Include="Silk.NET.Shaderc" Version="2.23.0" />
<PackageVersion Include="Silk.NET.Shaderc.Native" Version="2.23.0" />
<PackageVersion Include="Silk.NET.Assimp" Version="2.23.0" />
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.5" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.13" />
<PackageVersion Include="Xaml.Behaviors.Avalonia" Version="11.3.9.5" />
<PackageVersion Include="Xaml.Behaviors.Interactivity" Version="11.3.9.5" />
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="12.0.0.5" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.1" />
<PackageVersion Include="Xaml.Behaviors.Avalonia" Version="12.0.0" />
<PackageVersion Include="Xaml.Behaviors.Interactivity" Version="12.0.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
Expand All @@ -34,14 +34,14 @@
<PackageVersion Include="FFmpeg.AutoGen.Bindings.DynamicallyLoaded" Version="8.0.0.1" />
<PackageVersion Include="FFmpeg.AutoGen.Abstractions" Version="8.0.0" />
<PackageVersion Include="FFmpeg4Sharp" Version="7.0.1" />
<PackageVersion Include="FluentAvaloniaUI" Version="2.5.1" />
<PackageVersion Include="FluentIcons.FluentAvalonia" Version="1.1.224" />
<PackageVersion Include="FluentAvaloniaUI" Version="3.0.0-preview1" />
<PackageVersion Include="Beutl.FluentIcons.FluentAvalonia" Version="1.1.324" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.5.0" />
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.275" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NAudio.Wasapi" Version="2.3.0" />
<PackageVersion Include="HarfBuzzSharp" Version="8.3.1.3" />
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.3" />
<PackageVersion Include="HarfBuzzSharp" Version="8.3.1.4-preview.1.1" />
<PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.4-preview.1.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="5.3.0" />
Expand All @@ -66,9 +66,9 @@
<PackageVersion Include="OpenTK.OpenAL" Version="5.0.0-pre.8" />
<PackageVersion Include="PanelExtension" Version="1.0.0" />
<PackageVersion Include="ReactiveProperty" Version="9.8.0" />
<PackageVersion Include="Dock.Avalonia" Version="11.3.11.22" />
<PackageVersion Include="Dock.Model.Inpc" Version="11.3.11.22" />
<PackageVersion Include="Dock.Avalonia.Themes.Fluent" Version="11.3.11.22" />
<PackageVersion Include="Dock.Avalonia" Version="12.0.0.1" />
<PackageVersion Include="Dock.Model.Inpc" Version="12.0.0.1" />
<PackageVersion Include="Dock.Avalonia.Themes.Fluent" Version="12.0.0.1" />
<PackageVersion Include="Dock.Serializer.SystemTextJson" Version="11.3.11.22" />
<PackageVersion Include="Refit" Version="10.1.6" />
<PackageVersion Include="Roslynator.Analyzers" Version="4.15.0" />
Expand All @@ -77,9 +77,9 @@
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Serilog.Sinks.OpenTelemetry" Version="1.2.0" />
<PackageVersion Include="SkiaSharp" Version="3.119.2" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.2" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.2" />
<PackageVersion Include="SkiaSharp" Version="3.119.3-preview.1.1" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.3-preview.1.1" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.3-preview.1.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.7" />
<PackageVersion Include="System.Interactive" Version="7.0.1" />
<PackageVersion Include="System.Interactive.Async" Version="7.0.1" />
Expand All @@ -89,4 +89,4 @@
<PackageVersion Include="Vortice.MediaFoundation" Version="3.8.3" />
<PackageVersion Include="Vortice.XAudio2" Version="3.8.3" />
</ItemGroup>
</Project>
</Project>
110 changes: 0 additions & 110 deletions src/Beutl.Controls/BcTabItem/BcTabItem.cs
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions src/Beutl.Controls/BcTabItem/BcTabItem.events.cs
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions src/Beutl.Controls/BcTabItem/BcTabItem.properties.cs
View file
Open in desktop

This file was deleted.

Loading
Loading