From 25e3de1769f49be927938e08203112b96e433232 Mon Sep 17 00:00:00 2001 From: izaksuilov Date: Sat, 24 Oct 2026 13:44:58 +0000 Subject: [PATCH 01/52] Update to Avalonia 12 and OxyPlot 2.2.0 --- README.md | 4 +++- Source/Directory.Build.props | 4 ++-- Source/Examples/Avalonia/AvaloniaExamples/App.axaml.cs | 6 ------ .../Avalonia/AvaloniaExamples/AvaloniaExamples.csproj | 2 +- .../Examples/AnimationsDemo/MainWindow.axaml.cs | 1 - .../Examples/BarSeriesDemo/MainWindow.axaml.cs | 1 - .../DataTemplateDemo/PlotViewDataTemplateWindow.axaml.cs | 1 - .../Examples/UserControlDemo/MainWindow.axaml.cs | 1 - .../Examples/UserControlDemo/MainWindow2.axaml.cs | 1 - .../Examples/Avalonia/AvaloniaExamples/MainWindow.axaml.cs | 2 -- .../Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj | 2 +- .../Examples/Avalonia/ExampleBrowser/MainWindow.axaml.cs | 3 --- Source/Examples/Avalonia/MemoryTest/App.axaml.cs | 6 ------ Source/Examples/Avalonia/MemoryTest/MainWindow.axaml.cs | 1 - Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj | 2 +- Source/Examples/Avalonia/MemoryTest/Window1.axaml.cs | 1 - Source/Examples/Avalonia/MemoryTest/Window2.axaml.cs | 1 - Source/Examples/Avalonia/SimpleDemo/MainWindow.axaml.cs | 2 -- Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj | 2 +- Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj | 4 ++-- Source/OxyPlot.Avalonia/PlotBase.cs | 1 + Source/OxyPlot.Avalonia/Themes/Default.axaml | 7 +++++-- 22 files changed, 17 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 73ec877..9565c7a 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ dotnet add package OxyPlot.Avalonia ``` +The package targets Avalonia 12 and requires .NET 8 or later. + ### Usage To use the library, add the following to your `App.xaml`: @@ -23,7 +25,7 @@ To use the library, add the following to your `App.xaml`: - + diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props index 3f15db6..69caaa0 100644 --- a/Source/Directory.Build.props +++ b/Source/Directory.Build.props @@ -1,6 +1,6 @@ - 11.0.0 - 2.1.2 + 12.1.4 + 2.2.0 \ No newline at end of file diff --git a/Source/Examples/Avalonia/AvaloniaExamples/App.axaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/App.axaml.cs index 3d40e69..edbb4c7 100644 --- a/Source/Examples/Avalonia/AvaloniaExamples/App.axaml.cs +++ b/Source/Examples/Avalonia/AvaloniaExamples/App.axaml.cs @@ -38,11 +38,5 @@ static void Main(string[] args) .StartWithClassicDesktopLifetime(args); } - public static void AttachDevTools(Window window) - { -#if DEBUG - DevToolsExtensions.AttachDevTools(window); -#endif - } } } diff --git a/Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj b/Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj index 3540b23..58627f7 100644 --- a/Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj +++ b/Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj @@ -2,6 +2,7 @@ net8.0 WinExe + false @@ -11,6 +12,5 @@ - \ No newline at end of file diff --git a/Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/MainWindow.axaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/MainWindow.axaml.cs index 5add1fc..c0b1fd7 100644 --- a/Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/MainWindow.axaml.cs +++ b/Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/MainWindow.axaml.cs @@ -22,7 +22,6 @@ public partial class MainWindow : Avalonia.Controls.Window public MainWindow() { this.InitializeComponent(); - App.AttachDevTools(this); } private void InitializeComponent() diff --git a/Source/Examples/Avalonia/AvaloniaExamples/Examples/BarSeriesDemo/MainWindow.axaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/Examples/BarSeriesDemo/MainWindow.axaml.cs index e7b290a..4fdaeb6 100644 --- a/Source/Examples/Avalonia/AvaloniaExamples/Examples/BarSeriesDemo/MainWindow.axaml.cs +++ b/Source/Examples/Avalonia/AvaloniaExamples/Examples/BarSeriesDemo/MainWindow.axaml.cs @@ -51,7 +51,6 @@ public MainWindow() this.InitializeComponent(); - App.AttachDevTools(this); } private void InitializeComponent() diff --git a/Source/Examples/Avalonia/AvaloniaExamples/Examples/DataTemplateDemo/PlotViewDataTemplateWindow.axaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/Examples/DataTemplateDemo/PlotViewDataTemplateWindow.axaml.cs index 75e9beb..dfaccca 100644 --- a/Source/Examples/Avalonia/AvaloniaExamples/Examples/DataTemplateDemo/PlotViewDataTemplateWindow.axaml.cs +++ b/Source/Examples/Avalonia/AvaloniaExamples/Examples/DataTemplateDemo/PlotViewDataTemplateWindow.axaml.cs @@ -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); diff --git a/Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow.axaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow.axaml.cs index 8bca701..d085f83 100644 --- a/Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow.axaml.cs +++ b/Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow.axaml.cs @@ -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() diff --git a/Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow2.axaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow2.axaml.cs index a166c1e..9d5123c 100644 --- a/Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow2.axaml.cs +++ b/Source/Examples/Avalonia/AvaloniaExamples/Examples/UserControlDemo/MainWindow2.axaml.cs @@ -24,7 +24,6 @@ public MainWindow2() { this.InitializeComponent(); this.DataContext = new { Models = new List { new ViewModel { Title = "Plot1" }, new ViewModel { Title = "Plot2" } } }; - App.AttachDevTools(this); } private void InitializeComponent() diff --git a/Source/Examples/Avalonia/AvaloniaExamples/MainWindow.axaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/MainWindow.axaml.cs index 74b48dc..75fedd6 100644 --- a/Source/Examples/Avalonia/AvaloniaExamples/MainWindow.axaml.cs +++ b/Source/Examples/Avalonia/AvaloniaExamples/MainWindow.axaml.cs @@ -19,7 +19,6 @@ namespace AvaloniaExamples using Avalonia; using Avalonia.Controls; using Avalonia.Markup.Xaml; - using Avalonia.Diagnostics; using Avalonia.Interactivity; /// @@ -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() diff --git a/Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj b/Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj index 90ea5f9..ca3cce2 100644 --- a/Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj +++ b/Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj @@ -2,11 +2,11 @@ WinExe net8.0 + false - diff --git a/Source/Examples/Avalonia/ExampleBrowser/MainWindow.axaml.cs b/Source/Examples/Avalonia/ExampleBrowser/MainWindow.axaml.cs index 671653a..c8a0e51 100644 --- a/Source/Examples/Avalonia/ExampleBrowser/MainWindow.axaml.cs +++ b/Source/Examples/Avalonia/ExampleBrowser/MainWindow.axaml.cs @@ -9,9 +9,6 @@ public partial class MainWindow : Window public MainWindow() { InitializeComponent(); -#if DEBUG - this.AttachDevTools(); -#endif } private void InitializeComponent() diff --git a/Source/Examples/Avalonia/MemoryTest/App.axaml.cs b/Source/Examples/Avalonia/MemoryTest/App.axaml.cs index 361180d..7dc3cef 100644 --- a/Source/Examples/Avalonia/MemoryTest/App.axaml.cs +++ b/Source/Examples/Avalonia/MemoryTest/App.axaml.cs @@ -39,11 +39,5 @@ static void Main(string[] args) .StartWithClassicDesktopLifetime(args); } - public static void AttachDevTools(Window window) - { -#if DEBUG - DevToolsExtensions.AttachDevTools(window); -#endif - } } } diff --git a/Source/Examples/Avalonia/MemoryTest/MainWindow.axaml.cs b/Source/Examples/Avalonia/MemoryTest/MainWindow.axaml.cs index 6c19274..a46d688 100644 --- a/Source/Examples/Avalonia/MemoryTest/MainWindow.axaml.cs +++ b/Source/Examples/Avalonia/MemoryTest/MainWindow.axaml.cs @@ -8,7 +8,6 @@ public partial class MainWindow : Window public MainWindow() { this.InitializeComponent(); - App.AttachDevTools(this); } private void InitializeComponent() diff --git a/Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj b/Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj index c13c26a..2f64e36 100644 --- a/Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj +++ b/Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj @@ -2,12 +2,12 @@ net8.0 Exe + false - \ No newline at end of file diff --git a/Source/Examples/Avalonia/MemoryTest/Window1.axaml.cs b/Source/Examples/Avalonia/MemoryTest/Window1.axaml.cs index b04f0db..0722c51 100644 --- a/Source/Examples/Avalonia/MemoryTest/Window1.axaml.cs +++ b/Source/Examples/Avalonia/MemoryTest/Window1.axaml.cs @@ -18,7 +18,6 @@ public Window1() InitializeComponent(); - App.AttachDevTools(this); } private void InitializeComponent() diff --git a/Source/Examples/Avalonia/MemoryTest/Window2.axaml.cs b/Source/Examples/Avalonia/MemoryTest/Window2.axaml.cs index 71745e0..9382e75 100644 --- a/Source/Examples/Avalonia/MemoryTest/Window2.axaml.cs +++ b/Source/Examples/Avalonia/MemoryTest/Window2.axaml.cs @@ -22,7 +22,6 @@ public Window2() } InitializeComponent(); - App.AttachDevTools(this); DataContext = Plots; } diff --git a/Source/Examples/Avalonia/SimpleDemo/MainWindow.axaml.cs b/Source/Examples/Avalonia/SimpleDemo/MainWindow.axaml.cs index 44352a2..ef55e84 100644 --- a/Source/Examples/Avalonia/SimpleDemo/MainWindow.axaml.cs +++ b/Source/Examples/Avalonia/SimpleDemo/MainWindow.axaml.cs @@ -9,7 +9,6 @@ using Avalonia; using Avalonia.Controls; -using Avalonia.Diagnostics; using Avalonia.Markup.Xaml; namespace SimpleDemo @@ -25,7 +24,6 @@ public partial class MainWindow : Window public MainWindow() { InitializeComponent(); - this.AttachDevTools(); } private void InitializeComponent() diff --git a/Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj b/Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj index e84ede3..168bcf8 100644 --- a/Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj +++ b/Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj @@ -2,6 +2,7 @@ net8.0 Exe + false @@ -9,6 +10,5 @@ - \ No newline at end of file diff --git a/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj b/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj index 7874ce4..ed03d9b 100644 --- a/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj +++ b/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + net8.0 Oxyplot.Avalonia True OxyPlot is a plotting library for .NET. This is a support library for OxyPlot to work with AvaloniaUI. @@ -12,7 +12,7 @@ plotting plot charting chart git https://github.com/oxyplot/oxyplot.git - 2.1.2 + 2.2.0 latest diff --git a/Source/OxyPlot.Avalonia/PlotBase.cs b/Source/OxyPlot.Avalonia/PlotBase.cs index 1d43d90..173abbd 100644 --- a/Source/OxyPlot.Avalonia/PlotBase.cs +++ b/Source/OxyPlot.Avalonia/PlotBase.cs @@ -7,6 +7,7 @@ // // -------------------------------------------------------------------------------------------------------------------- +using Avalonia.Input.Platform; using Avalonia.Reactive; namespace OxyPlot.Avalonia diff --git a/Source/OxyPlot.Avalonia/Themes/Default.axaml b/Source/OxyPlot.Avalonia/Themes/Default.axaml index 9395e97..d5880d8 100644 --- a/Source/OxyPlot.Avalonia/Themes/Default.axaml +++ b/Source/OxyPlot.Avalonia/Themes/Default.axaml @@ -1,6 +1,7 @@ - -