Skip to content

added support for avalonia 12 #74

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
KaiIsNA wants to merge 3 commits into
base: master
Choose a base branch
from
Open

added support for avalonia 12 #74

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
a3ba97b
added support for avalonia 12
KaiIsNA May 5, 2026
8855e2d
fixed errors in pipeline
KaiIsNA May 5, 2026
4efb98e
fixing errors in pipeline again
KaiIsNA May 5, 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 Source/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<AvaloniaVersion>11.0.0</AvaloniaVersion>
<OxyPlotCoreVersion>2.1.2</OxyPlotCoreVersion>
<AvaloniaVersion>12.0.2</AvaloniaVersion>
<OxyPlotCoreVersion>2.2.0</OxyPlotCoreVersion>
</PropertyGroup>
</Project>
31 changes: 16 additions & 15 deletions Source/Examples/Avalonia/AvaloniaExamples/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,37 +12,38 @@ public class App : Application
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
base.Initialize();
#if DEBUG
this.AttachDeveloperTools();
#endif
}

public override void OnFrameworkInitializationCompleted()
{
if (!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop))
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
throw new PlatformNotSupportedException();
desktop.MainWindow = new MainWindow();
}

desktop.MainWindow = new MainWindow();

base.OnFrameworkInitializationCompleted();
}
}

static void Main(string[] args)
public class Program
{
public static AppBuilder BuildAvaloniaApp()
{
OxyPlotModule.EnsureLoaded();
AppBuilder.Configure<App>()
.UsePlatformDetect()
var builder = AppBuilder.Configure<App>()
.UsePlatformDetect();
#if DEBUG
.LogToTrace()
builder.LogToTrace();
#endif
.StartWithClassicDesktopLifetime(args);
return builder;
}

public static void AttachDevTools(Window window)
public static void Main(string[] args)
{
#if DEBUG
DevToolsExtensions.AttachDevTools(window);
#endif
}
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
}
}
}
7 changes: 4 additions & 3 deletions Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>WinExe</OutputType>
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>
<ItemGroup>
<AvaloniaResource Include="Images\*" />
<None Remove="Examples\AlignedAxesDemo\MainWindow.xaml" />
<AvaloniaXaml Include="Examples\AlignedAxesDemo\MainWindow.xaml" />
<PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.4" />
<ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public partial class MainWindow : Avalonia.Controls.Window
public MainWindow()
{
this.InitializeComponent();
App.AttachDevTools(this);
}

private void InitializeComponent()
Expand Down
2 changes: 0 additions & 2 deletions Source/Examples/Avalonia/AvaloniaExamples/Examples/BarSeriesDemo/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ public MainWindow()
this.DataContext = new { Model1 = tmp, Items = items };

this.InitializeComponent();

App.AttachDevTools(this);
}

private void InitializeComponent()
Expand Down
1 change: 0 additions & 1 deletion ...s/Avalonia/AvaloniaExamples/Examples/DataTemplateDemo/PlotViewDataTemplateWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ public PlotViewDataTemplateWindow()
private void InitializeComponent()
{
Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
App.AttachDevTools(this);
}

private static Random r = new Random(13);
Expand Down
1 change: 0 additions & 1 deletion Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public MainWindow()
{
this.InitializeComponent();
this.DataContext = new { Model1 = new ViewModel { Title = "Plot1" }, Model2 = new ViewModel { Title = "Plot2" } };
App.AttachDevTools(this);
}

private void InitializeComponent()
Expand Down
1 change: 0 additions & 1 deletion Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow2.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public MainWindow2()
{
this.InitializeComponent();
this.DataContext = new { Models = new List<ViewModel> { new ViewModel { Title = "Plot1" }, new ViewModel { Title = "Plot2" } } };
App.AttachDevTools(this);
}

private void InitializeComponent()
Expand Down
2 changes: 0 additions & 2 deletions Source/Examples/Avalonia/AvaloniaExamples/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ namespace AvaloniaExamples
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.Diagnostics;
using Avalonia.Interactivity;

/// <summary>
Expand All @@ -35,7 +34,6 @@ public MainWindow()
InitializeComponent();
ListBox.ItemsSource = this.Examples = this.GetExamples(this.GetType().Assembly).OrderBy(e => e.Title).ToArray();
this.DataContext = this;
DevToolsExtensions.AttachDevTools(this);
}

private void InitializeComponent()
Expand Down
4 changes: 4 additions & 0 deletions Source/Examples/Avalonia/ExampleBrowser/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;

Expand All @@ -9,6 +10,9 @@ public class App : Application
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
#if DEBUG
this.AttachDeveloperTools();
#endif
}

public override void OnFrameworkInitializationCompleted()
Expand Down
4 changes: 2 additions & 2 deletions Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0" />
<PackageReference Include="OxyPlot.Core" Version="$(OxyPlotCoreVersion)" />
<PackageReference Include="OxyPlot.ExampleLibrary" Version="$(OxyPlotCoreVersion)" />
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions Source/Examples/Avalonia/ExampleBrowser/MainWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
xmlns:exampleBrowser="clr-namespace:ExampleBrowser;assembly=ExampleBrowser"
xmlns:exampleLibrary="clr-namespace:ExampleLibrary;assembly=ExampleLibrary"
x:Class="ExampleBrowser.MainWindow"
x:DataType="exampleBrowser:MainViewModel"
Title="Example Browser">
<Window.DataContext>
<exampleBrowser:MainViewModel />
Expand Down
3 changes: 0 additions & 3 deletions Source/Examples/Avalonia/ExampleBrowser/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ public partial class MainWindow : Window
public MainWindow()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();
#endif
}

private void InitializeComponent()
Expand Down
29 changes: 15 additions & 14 deletions Source/Examples/Avalonia/MemoryTest/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,38 @@ class App : Application
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
base.Initialize();
#if DEBUG
this.AttachDeveloperTools();
#endif
}

public override void OnFrameworkInitializationCompleted()
{
if (!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop))
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
throw new PlatformNotSupportedException();
desktop.MainWindow = new MainWindow();
}

desktop.MainWindow = new MainWindow();

base.OnFrameworkInitializationCompleted();
}
}

static void Main(string[] args)
public class Program
{
public static AppBuilder BuildAvaloniaApp()
{
OxyPlotModule.EnsureLoaded();
AppBuilder.Configure<App>()
.UsePlatformDetect()
var builder = AppBuilder.Configure<App>()
.UsePlatformDetect();
#if DEBUG
.LogToTrace()
builder.LogToTrace();
#endif
.StartWithClassicDesktopLifetime(args);
return builder;
}

public static void AttachDevTools(Window window)
public static void Main(string[] args)
{
#if DEBUG
DevToolsExtensions.AttachDevTools(window);
#endif
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
}
}
}
1 change: 0 additions & 1 deletion Source/Examples/Avalonia/MemoryTest/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ public partial class MainWindow : Window
public MainWindow()
{
this.InitializeComponent();
App.AttachDevTools(this);
}

private void InitializeComponent()
Expand Down
6 changes: 3 additions & 3 deletions Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.4" />
<ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions Source/Examples/Avalonia/MemoryTest/Window1.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
xmlns:oxy="http://oxyplot.org/avalonia"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="MemoryTest.Window1"
xmlns:local="clr-namespace:MemoryTest"
x:DataType="local:Window1"
MinWidth="500" MinHeight="300">
<Grid>
<oxy:PlotView Model="{Binding .}"/>
Expand Down
2 changes: 0 additions & 2 deletions Source/Examples/Avalonia/MemoryTest/Window1.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ public Window1()
DataContext = Model;

InitializeComponent();

App.AttachDevTools(this);
}

private void InitializeComponent()
Expand Down
2 changes: 2 additions & 0 deletions Source/Examples/Avalonia/MemoryTest/Window2.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
xmlns:oxy="http://oxyplot.org/avalonia"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
x:Class="MemoryTest.Window2"
xmlns:local="clr-namespace:MemoryTest"
x:DataType="local:Window2"
MinWidth="500" MinHeight="300">
<Grid>
<ScrollViewer>
Expand Down
1 change: 0 additions & 1 deletion Source/Examples/Avalonia/MemoryTest/Window2.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public Window2()
}

InitializeComponent();
App.AttachDevTools(this);

DataContext = Plots;
}
Expand Down
31 changes: 17 additions & 14 deletions Source/Examples/Avalonia/SimpleDemo/App.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using OxyPlot.Avalonia;
Expand All @@ -8,35 +9,37 @@ namespace SimpleDemo
{
class App : Application
{
public App()
{
RegisterServices();
}

public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
base.Initialize();
#if DEBUG
this.AttachDeveloperTools();
#endif
}

public override void OnFrameworkInitializationCompleted()
{
if (!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop))
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
throw new PlatformNotSupportedException();
desktop.MainWindow = new MainWindow();
}

desktop.MainWindow = new MainWindow();

base.OnFrameworkInitializationCompleted();
}
}

public static void Main(string[] args)
public class Program
{
public static AppBuilder BuildAvaloniaApp()
{
OxyPlotModule.EnsureLoaded();
AppBuilder.Configure<App>()
.UsePlatformDetect()
.StartWithClassicDesktopLifetime(args);
return AppBuilder.Configure<App>()
.UsePlatformDetect();
}

public static void Main(string[] args)
{
BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
}
}
}
1 change: 1 addition & 0 deletions Source/Examples/Avalonia/SimpleDemo/MainWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia"
xmlns:simpleDemo="clr-namespace:SimpleDemo;assembly=SimpleDemo"
x:DataType="simpleDemo:MainViewModel"
Title="OxyPlot SimpleDemo" Height="480" Width="640">
<Window.DataContext>
<simpleDemo:MainViewModel />
Expand Down
1 change: 0 additions & 1 deletion Source/Examples/Avalonia/SimpleDemo/MainWindow.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public partial class MainWindow : Window
public MainWindow()
{
InitializeComponent();
this.AttachDevTools();
}

private void InitializeComponent()
Expand Down
6 changes: 3 additions & 3 deletions Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
<PackageReference Include="JetBrains.Annotations" Version="2025.2.4" />
<ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
<PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0" />
</ItemGroup>
</Project>
Loading