Fix examples

Source/Directory.Build.props

@@ -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>

Source/Examples/Avalonia/AvaloniaExamples/App.axaml.cs

@@ -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);
+        }
     }
 }

Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj

@@ -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>

Source/Examples/Avalonia/AvaloniaExamples/Examples/AlignedAxesDemo/MainWindow.xaml

@@ -1,9 +1,11 @@
 <Window 
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.AlignedAxesDemo"
         xmlns:oxy="http://oxyplot.org/avalonia"
         x:Class="AvaloniaExamples.Examples.AlignedAxesDemo.MainWindow"
-        Title="AlignedAxesDemo" Height="480" Width="640">
+        Title="AlignedAxesDemo" Height="480" Width="640"
+        x:DataType="local:Context">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>

Source/Examples/Avalonia/AvaloniaExamples/Examples/AlignedAxesDemo/MainWindow.xaml.cs

@@ -30,7 +30,7 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             this.InitializeComponent();
-            var models = new { Model0 = CreatePlotModel(0, 10), Model1 = CreatePlotModel(0, 1e8) };
+            var models = new Context(CreatePlotModel(0, 10), CreatePlotModel(0, 1e8));
 
             // TODO: align the vertical axis size without setting PlotMargins
             models.Model0.PlotMargins = models.Model1.PlotMargins = new OxyThickness(70, 40, 20, 20);
@@ -53,4 +53,6 @@ private static PlotModel CreatePlotModel(double min, double max)
             return model;
         }
     }
+
+    internal record Context(PlotModel Model0, PlotModel Model1);
 }

Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/Controls/AnimationSettingsControl.axaml

@@ -1,7 +1,9 @@
 <UserControl xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:animationsdemo="using:AvaloniaExamples.Examples.AnimationsDemo"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             x:Class="AvaloniaExamples.Examples.AnimationsDemo.Controls.AnimationSettingsControl">
+             x:Class="AvaloniaExamples.Examples.AnimationsDemo.Controls.AnimationSettingsControl"
+             x:DataType="animationsdemo:AnimationViewModelBase">
 
     <Grid>
         <Grid.RowDefinitions>

Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/MainWindow.axaml

@@ -2,6 +2,7 @@
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
         xmlns:AnimationsDemoViews="clr-namespace:AvaloniaExamples.Examples.AnimationsDemo.Views;assembly=AvaloniaExamples"
+        xmlns:local="using:AvaloniaExamples.Examples.AnimationsDemo"
         xmlns:AnimationsDemoControls="clr-namespace:AvaloniaExamples.Examples.AnimationsDemo.Controls;assembly=AvaloniaExamples"
         x:Class="AvaloniaExamples.Examples.AnimationsDemo.MainWindow"
         Title="AnimationsDemo" Height="480" Width="740">
@@ -25,7 +26,7 @@
                 <AnimationsDemoViews:AreaSeriesView />
             </TabItem>
         </TabControl>
-        <ContentControl Grid.Row="1" DataContext="{Binding ElementName=tabControl, Path=SelectedItem.Content.DataContext}" >
+        <ContentControl Grid.Row="1" DataContext="{Binding #tabControl.((TabItem)SelectedItem).((Control)Content).DataContext}" >
             <AnimationsDemoControls:AnimationSettingsControl />
         </ContentControl>
     </Grid>

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()

Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/Views/AreaSeriesView.axaml

@@ -1,11 +1,12 @@
 <UserControl 
              xmlns="https://github.com/avaloniaui"
+             xmlns:animationsdemo="using:AvaloniaExamples.Examples.AnimationsDemo"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:oxy="http://oxyplot.org/avalonia"
              x:Class="AvaloniaExamples.Examples.AnimationsDemo.Views.AreaSeriesView"
-             >
+             x:DataType="animationsdemo:AreaSeriesViewModel">
 
     <Grid>
         <oxy:PlotView Model="{Binding PlotModel}" />

Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/Views/LineSeriesView.axaml

@@ -1,11 +1,12 @@
 <UserControl 
              xmlns="https://github.com/avaloniaui"
+             xmlns:animationsdemo="using:AvaloniaExamples.Examples.AnimationsDemo"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:oxy="http://oxyplot.org/avalonia"
              x:Class="AvaloniaExamples.Examples.AnimationsDemo.Views.LineSeriesView"
-             >
+             x:DataType="animationsdemo:LineSeriesViewModel">
 
     <Grid>
         <oxy:PlotView Model="{Binding PlotModel}" />

Source/Examples/Avalonia/AvaloniaExamples/Examples/AnimationsDemo/Views/LinearBarView.axaml

@@ -1,11 +1,12 @@
 <UserControl 
              xmlns="https://github.com/avaloniaui"
+             xmlns:animationsdemo="using:AvaloniaExamples.Examples.AnimationsDemo"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:oxy="http://oxyplot.org/avalonia"
              x:Class="AvaloniaExamples.Examples.AnimationsDemo.Views.LinearBarView"
-             >
+             x:DataType="animationsdemo:LinearBarViewModel">
 
     <Grid>
         <oxy:PlotView Model="{Binding PlotModel}" />

Source/Examples/Avalonia/AvaloniaExamples/Examples/AnnotationDemo/MainWindow.axaml

@@ -3,8 +3,10 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia" 
         xmlns:OxyPlot="clr-namespace:OxyPlot;assembly=OxyPlot"
+        xmlns:local="using:AvaloniaExamples.Examples.AnnotationDemo"
         x:Class="AvaloniaExamples.Examples.AnnotationDemo.MainWindow"
-        Title="AnnotationDemo" Height="480" Width="640">
+        Title="AnnotationDemo" Height="480" Width="640"
+        x:DataType="local:Context">
     <TabControl>
         <TabItem Header="ArrowAnnotation">
             <oxy:Plot Title="ArrowAnnotation">

Source/Examples/Avalonia/AvaloniaExamples/Examples/AnnotationDemo/MainWindow.axaml.cs

@@ -29,7 +29,7 @@ public MainWindow()
             {
                 new DataPoint(10, 10), new DataPoint(80, 30), new DataPoint(60, 70)
             };
-            this.DataContext = new { Points };
+            this.DataContext = new Context(Points);
         }
 
         private void InitializeComponent()
@@ -42,4 +42,6 @@ private void InitializeComponent()
         /// </summary>
         public IList<DataPoint> Points { get; private set; }
     }
+
+    internal record Context(IList<DataPoint> Points);
 }

Source/Examples/Avalonia/AvaloniaExamples/Examples/AreaDemo/MainWindow.axaml

@@ -1,9 +1,11 @@
 <Window 
         xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.AreaDemo" 
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia" 
         x:Class="AvaloniaExamples.Examples.AreaDemo.MainWindow"
-        Title="AreaDemo" Height="480" Width="640">
+        Title="AreaDemo" Height="480" Width="640"
+        x:DataType="local:MainViewModel">
     <DockPanel>
         <oxy:Plot Title="LineSeries and AreaSeries">
 			<oxy:Plot.Legends>

Source/Examples/Avalonia/AvaloniaExamples/Examples/AxesDemo/MainWindow.axaml

@@ -1,9 +1,11 @@
 <Window 
         xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.AxesDemo" 
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia" 
         x:Class="AvaloniaExamples.Examples.AxesDemo.MainWindow"
-        Title="AxesDemo" Height="480" Width="640">
+        Title="AxesDemo" Height="480" Width="640"
+        x:DataType="local:MainViewModel">
 
     <DockPanel>
         <TabControl Margin="8">

Source/Examples/Avalonia/AvaloniaExamples/Examples/BarSeriesDemo/MainWindow.axaml

@@ -1,9 +1,11 @@
 <Window 
         xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.BarSeriesDemo" 
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia" 
         x:Class="AvaloniaExamples.Examples.BarSeriesDemo.MainWindow"
-        Title="BarSeriesDemo" Height="480" Width="640">
+        Title="BarSeriesDemo" Height="480" Width="640"
+        x:DataType="local:Context">
     <TabControl>
         <TabItem Header="Binding to PlotModel">
             <oxy:PlotView Model="{Binding Model1}"/>

Source/Examples/Avalonia/AvaloniaExamples/Examples/BarSeriesDemo/MainWindow.axaml.cs

@@ -47,11 +47,9 @@ public MainWindow()
             tmp.Series.Add(new BarSeries { Title = "2011", ItemsSource = items, ValueField = "Value3" });
             tmp.Series.Add(new BarSeries { Title = "2012", ItemsSource = items, ValueField = "Value4" });
 
-            this.DataContext = new { Model1 = tmp, Items = items };
+            this.DataContext = new Context(tmp, items);
 
             this.InitializeComponent();
-
-            App.AttachDevTools(this);
         }
 
         private void InitializeComponent()
@@ -68,4 +66,6 @@ public class Item : BarItem
         public double Value3 { get; set; }
         public double Value4 { get; set; }
     }
+
+    internal record Context(PlotModel Model1, Collection<Item> Items);
 }

Source/Examples/Avalonia/AvaloniaExamples/Examples/BindingDemo/MainWindow.axaml

@@ -1,10 +1,12 @@
 <Window 
         xmlns="https://github.com/avaloniaui" 
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.BindingDemo"
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia"
         x:Class="AvaloniaExamples.Examples.BindingDemo.MainWindow"
         Title="BindingDemo" Width="640"
-        Height="480">
+        Height="480"
+        x:DataType="local:MainViewModel">
   <Grid>
     <oxy:Plot Title="Binding ItemsSource" Subtitle="{Binding Subtitle}">
       <oxy:Plot.Series>

Source/Examples/Avalonia/AvaloniaExamples/Examples/BindingObservableCollectionDemo/MainWindow.axaml

@@ -1,10 +1,12 @@
 <Window 
         xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.BindingObservableCollectionDemo" 
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia"
         x:Class="AvaloniaExamples.Examples.BindingObservableCollectionDemo.MainWindow"
         Title="BindingDemo" Width="640"
-        Height="480">
+        Height="480"
+        x:DataType="local:MainViewModel">
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />

Source/Examples/Avalonia/AvaloniaExamples/Examples/BindingObservableCollectionDemo/MainWindow.axaml.cs

@@ -22,7 +22,7 @@ public partial class MainWindow : Avalonia.Controls.Window
         public MainWindow()
         {
             this.InitializeComponent();
-            var vm = new BindingObservableCollectionDemo.MainViewModel();
+            var vm = new MainViewModel();
             this.DataContext = vm;
         }
 

Source/Examples/Avalonia/AvaloniaExamples/Examples/BoxPlotSeriesDemo/MainWindow.axaml

@@ -1,11 +1,13 @@
 <Window 
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.BoxPlotSeriesDemo"
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia"
         x:Class="AvaloniaExamples.Examples.BoxPlotSeriesDemo.MainWindow"
         Title="BoxPlotSeriesDemo"
         Width="640"
-        Height="480">
+        Height="480"
+        x:DataType="local:Context">
     <TabControl>
         <TabItem Header="Binding to PlotModel">
             <oxy:PlotView Model="{Binding Model1}" />

Source/Examples/Avalonia/AvaloniaExamples/Examples/BoxPlotSeriesDemo/MainWindow.axaml.cs

@@ -54,12 +54,14 @@ public MainWindow()
             // Add the series, note that the BarSeries are using the same ItemsSource as the CategoryAxis.
             tmp.Series.Add(new BoxPlotSeries { Title = "Values", ItemsSource = items, Fill = Colors.LightBlue.ToOxyColor() });
 
-            this.DataContext = new { Model1 = tmp, Items = items };
+            this.DataContext = new Context(tmp, items);
         }
 
         private void InitializeComponent()
         {
             Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
         }
     }
+
+    internal record Context(PlotModel Model1, Collection<BoxPlotItem> Items);
 }

Source/Examples/Avalonia/AvaloniaExamples/Examples/ColorBindingDemo/MainWindow.axaml

@@ -4,7 +4,8 @@
         xmlns:oxy="http://oxyplot.org/avalonia"
         xmlns:ColorBindingDemo="clr-namespace:AvaloniaExamples.Examples.ColorBindingDemo;assembly=AvaloniaExamples"
         x:Class="AvaloniaExamples.Examples.ColorBindingDemo.MainWindow"
-        Title="ColorBindingDemo" Height="480" Width="640">
+        Title="ColorBindingDemo" Height="480" Width="640"
+        x:DataType="ColorBindingDemo:MainViewModel">
     <Window.DataContext>
         <ColorBindingDemo:MainViewModel/>
     </Window.DataContext>

Source/Examples/Avalonia/AvaloniaExamples/Examples/ContextMenuDemo/MainWindow.axaml

@@ -1,9 +1,11 @@
 <Window 
         xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.ContextMenuDemo"
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia" 
         x:Class="AvaloniaExamples.Examples.ContextMenuDemo.MainWindow"
-        Title="ContextMenuDemo" Height="480" Width="640">
+        Title="ContextMenuDemo" Height="480" Width="640"
+        x:DataType="local:MainWindow">
     <oxy:PlotView Model="{Binding Model}">
         <oxy:PlotView.ContextMenu>
             <ContextMenu>

Source/Examples/Avalonia/AvaloniaExamples/Examples/ContourDemo/MainWindow.axaml

@@ -1,8 +1,10 @@
 <Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="using:AvaloniaExamples.Examples.ContourDemo" 
         xmlns:oxy="clr-namespace:OxyPlot.Avalonia;assembly=OxyPlot.Avalonia" 
         x:Class="AvaloniaExamples.Examples.ContourDemo.MainWindow"
-        Title="ContourDemo" Height="480" Width="640">
+        Title="ContourDemo" Height="480" Width="640"
+        x:DataType="local:MainViewModel">
     <DockPanel>
         <Menu DockPanel.Dock="Top">
             <MenuItem Header="File">