Skip to content

Avalonia 12 support #44

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

Merged
SKProCH merged 2 commits into from
Apr 19, 2026
Merged

Avalonia 12 support #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d79626
fix!(Avalonia12): Avalonia 12 drops .net framework/net standard, only…
TemuWolverine Apr 19, 2026
e771e95
Migrate to single target framework, downgrade Avalonia version, adjus…
SKProCH Apr 19, 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
2 changes: 1 addition & 1 deletion AsyncImageLoader.Avalonia.Demo/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public override void OnFrameworkInitializationCompleted() {
desktop.MainWindow = new MainWindow {
DataContext = new MainWindowViewModel(),
};
desktop.MainWindow.AttachDevTools();
this.AttachDeveloperTools();
}

base.OnFrameworkInitializationCompleted();
Expand Down
6 changes: 3 additions & 3 deletions AsyncImageLoader.Avalonia.Demo/AsyncImageLoader.Avalonia.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>

<AvaloniaVersion>11.3.2</AvaloniaVersion>
<AvaloniaVersion>12.0.1</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Assets/avalonia-logo.ico" />
Expand All @@ -13,8 +13,8 @@
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" />
<PackageReference Include="Avalonia.Themes.Fluent" />
<PackageReference Include="Avalonia.Diagnostics" />
<PackageReference Include="Avalonia.ReactiveUI" />
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" />
<PackageReference Include="ReactiveUI.Avalonia" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AsyncImageLoader.Avalonia\AsyncImageLoader.Avalonia.csproj" />
Expand Down
12 changes: 6 additions & 6 deletions AsyncImageLoader.Avalonia.Demo/Controls/HamburgerMenu.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="clr-namespace:AsyncImageLoader.Avalonia.Demo.Controls">
<Design.PreviewWith>
<!-- <Design.PreviewWith>
<Border Width="400"
Height="150">
<controls:HamburgerMenu>
Expand All @@ -18,7 +18,7 @@
<TabItem Header="Item2" />
</controls:HamburgerMenu>
</Border>
</Design.PreviewWith>
</Design.PreviewWith> -->

<x:Double x:Key="PaneCompactWidth">40</x:Double>
<x:Double x:Key="PaneExpandWidth">220</x:Double>
Expand Down Expand Up @@ -188,7 +188,7 @@
</SplitView.Pane>
<SplitView.Content>
<DockPanel>
<Border Height="{StaticResource HeaderHeight}" DockPanel.Dock="Top">
<!-- <Border Height="{StaticResource HeaderHeight}" DockPanel.Dock="Top">
<TextBlock x:Name="HeaderHolder"
VerticalAlignment="Center"
Classes="h1"
Expand All @@ -202,7 +202,7 @@
</Transitions>
</TextBlock.Transitions>
</TextBlock>
</Border>
</Border> -->
<Border x:Name="BackgroundBorder">
<Border.Transitions>
<Transitions>
Expand Down Expand Up @@ -252,10 +252,10 @@
<Setter Property="PaneBackground" Value="{TemplateBinding PaneBackground}" />
</Style>
<Style Selector="^ /template/ SplitView[DisplayMode=Overlay]">
<Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
<Setter Property="Background" Value="{Binding $parent[controls:HamburgerMenu].ContentBackground}" />
</Style>
<Style Selector="^ /template/ SplitView[DisplayMode=Inline] Border#BackgroundBorder">
<Setter Property="Background" Value="{Binding $parent[TabControl].ContentBackground}" />
<Setter Property="Background" Value="{Binding $parent[controls:HamburgerMenu].ContentBackground}" />
<Setter Property="BoxShadow" Value="{StaticResource NavigationContentShadow}" />
</Style>
<Style Selector="^ /template/ SplitView[DisplayMode=Inline][IsPaneOpen=True] Border#BackgroundBorder">
Expand Down
4 changes: 2 additions & 2 deletions AsyncImageLoader.Avalonia.Demo/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;

namespace AsyncImageLoader.Avalonia.Demo;

Expand All @@ -18,5 +18,5 @@ public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.LogToTrace()
.UseReactiveUI();
.UseReactiveUI(rxui => { });
}
1 change: 0 additions & 1 deletion AsyncImageLoader.Avalonia.Demo/Views/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace AsyncImageLoader.Avalonia.Demo.Views;
public partial class MainWindow : Window {
public MainWindow() {
InitializeComponent();
this.AttachDevTools();
}

private void InitializeComponent() {
Expand Down
4 changes: 2 additions & 2 deletions AsyncImageLoader.Avalonia/AsyncImageLoader.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>AsyncImageLoader</RootNamespace>

<Title>AsyncImageLoader.Avalonia</Title>
Expand Down
10 changes: 5 additions & 5 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
<AvaloniaVersion>11.1.0</AvaloniaVersion>
<AvaloniaVersion>12.0.0</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" />
Expand All @@ -11,9 +11,9 @@
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
<!--For _build-->
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.1" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.102" />
</ItemGroup>
</Project>
</Project>