Skip to content

Avalonia 12 support #104

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 3 commits into from
Apr 7, 2026
Merged

Avalonia 12 support #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ae2f00
Update to Avalonia 12.0
SKProCH Feb 19, 2026
0abc52c
Merge branch 'main' into release/avalonia12
SKProCH Mar 26, 2026
09048d1
Update to avalonia 12
SKProCH Apr 7, 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
4 changes: 2 additions & 2 deletions DialogHost.Avalonia/DialogHost.Avalonia.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>12</LangVersion>
<Nullable>enable</Nullable>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
Expand Down Expand Up @@ -29,6 +29,6 @@
</AvaloniaResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.1.0"/>
<PackageReference Include="Avalonia" Version="12.0.0"/>
</ItemGroup>
</Project>
8 changes: 4 additions & 4 deletions DialogHost.Demo/DialogHost.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RootNamespace>DialogHostDemo</RootNamespace>
<IsPackable>false</IsPackable>

<AvaloniaVersion>11.2.3</AvaloniaVersion>
<AvaloniaVersion>12.0.0</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
<Folder Include="Models\"/>
Expand All @@ -15,10 +15,10 @@
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Material.Icons.Avalonia" Version="2.1.0"/>
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0-beta2"/>
<PackageReference Include="ReactiveUI.Avalonia" Version="11.3.8"/>
<PackageReference Include="Material.Icons.Avalonia" Version="3.0.0-avalonia12"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DialogHost.Avalonia\DialogHost.Avalonia.csproj"/>
Expand Down
5 changes: 3 additions & 2 deletions DialogHost.Demo/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Avalonia;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;

namespace DialogHostDemo;

Expand All @@ -16,5 +16,6 @@ public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.LogToTrace()
.UseReactiveUI();
.UseReactiveUI()
.WithDeveloperTools();
}
2 changes: 1 addition & 1 deletion DialogHost.Demo/Views/FruitBowl.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
Margin="16 0"
HorizontalAlignment="Right"
Grid.Row="1"
Content="{avalonia:MaterialIconExt Kind=Plus, Size=22}" />
Content="{avalonia:MaterialIconExt Kind=Plus, IconSize=22}" />
</Grid>
</dialogHostAvalonia:DialogHost>
</UserControl>
3 changes: 0 additions & 3 deletions DialogHost.Demo/Views/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ namespace DialogHostDemo.Views;
public partial class MainWindow : Window {
public MainWindow() {
InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
}

private async void OpenNoAnimationDialog(object? sender, RoutedEventArgs e) {
Expand Down
Loading