Update Avalonia to 0.10.0-preview1 (#23)

jp2masa · web-flow · commit e48896d5fedf · 2020-07-25T14:20:53.000+03:00
diff --git a/Source/Examples/Avalonia/AvaloniaExamples/App.xaml.cs b/Source/Examples/Avalonia/AvaloniaExamples/App.xaml.cs
@@ -2,9 +2,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Logging.Serilog;
 using Avalonia.Markup.Xaml;
-using Serilog;
 using OxyPlot.Avalonia;
 
 namespace AvaloniaExamples
@@ -33,9 +31,11 @@ public override void OnFrameworkInitializationCompleted()
         static void Main(string[] args)
         {
             OxyPlotModule.EnsureLoaded();
-            InitializeLogging();
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
+#if DEBUG
+                .LogToDebug()
+#endif
                 .StartWithClassicDesktopLifetime(args);
         }
 
@@ -45,15 +45,5 @@ public static void AttachDevTools(Window window)
 			DevToolsExtensions.AttachDevTools(window);
 #endif
 		}
-
-        private static void InitializeLogging()
-        {
-#if DEBUG
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Warning()
-                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-                .CreateLogger());
-#endif
-        }
     }
 }
diff --git a/Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj b/Source/Examples/Avalonia/AvaloniaExamples/AvaloniaExamples.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
     <ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
-    <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj b/Source/Examples/Avalonia/ExampleBrowser/ExampleBrowser.csproj
@@ -12,8 +12,8 @@
     </AvaloniaResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.3" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
     <PackageReference Include="OxyPlot.Core" Version="2.0.0" />
     <PackageReference Include="OxyPlot.ExampleLibrary" Version="2.0.0" />
   </ItemGroup>
diff --git a/Source/Examples/Avalonia/ExampleBrowser/Program.cs b/Source/Examples/Avalonia/ExampleBrowser/Program.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using Avalonia;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Logging.Serilog;
+﻿using Avalonia;
 
 namespace ExampleBrowser
 {
diff --git a/Source/Examples/Avalonia/MemoryTest/App.xaml.cs b/Source/Examples/Avalonia/MemoryTest/App.xaml.cs
@@ -2,9 +2,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Logging.Serilog;
 using Avalonia.Markup.Xaml;
-using Serilog;
 using OxyPlot.Avalonia;
 
 namespace MemoryTest
@@ -33,26 +31,18 @@ public override void OnFrameworkInitializationCompleted()
         static void Main(string[] args)
         {
             OxyPlotModule.EnsureLoaded();
-            InitializeLogging();
             AppBuilder.Configure<App>()
                 .UsePlatformDetect()
+#if DEBUG
+                .LogToDebug()
+#endif
                 .StartWithClassicDesktopLifetime(args);
         }
 
         public static void AttachDevTools(Window window)
         {
 #if DEBUG
 			DevToolsExtensions.AttachDevTools(window);
-#endif
-        }
-
-        private static void InitializeLogging()
-        {
-#if DEBUG
-            SerilogLogger.Initialize(new LoggerConfiguration()
-                .MinimumLevel.Warning()
-                .WriteTo.Trace(outputTemplate: "{Area}: {Message}")
-                .CreateLogger());
 #endif
         }
     }
diff --git a/Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj b/Source/Examples/Avalonia/MemoryTest/MemoryTest.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
     <ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
-    <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/Source/Examples/Avalonia/SimpleDemo/MainWindow.xaml.cs b/Source/Examples/Avalonia/SimpleDemo/MainWindow.xaml.cs
@@ -25,7 +25,7 @@ public class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
-			DevToolsExtensions.AttachDevTools(this);
+			this.AttachDevTools();
         }
 
         private void InitializeComponent()
diff --git a/Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj b/Source/Examples/Avalonia/SimpleDemo/SimpleDemo.csproj
@@ -13,6 +13,7 @@
     <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
     <ProjectReference Include="..\..\..\OxyPlot.Avalonia\OxyPlot.Avalonia.csproj" />
     <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview1" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview1" />
   </ItemGroup>
 </Project>
diff --git a/Source/OxyPlot.Avalonia/Axes/Axis.cs b/Source/OxyPlot.Avalonia/Axes/Axis.cs
@@ -1380,7 +1380,7 @@ protected void OnDataChanged()
         /// The on property changed handler.
         /// </summary>
         /// <param name="e">The event args.</param>
-        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> e)
         {
             base.OnPropertyChanged(e);
             if (e.Property.OwnerType == GetType())
diff --git a/Source/OxyPlot.Avalonia/Axes/LinearColorAxis.cs b/Source/OxyPlot.Avalonia/Axes/LinearColorAxis.cs
@@ -41,15 +41,7 @@ public class LinearColorAxis : Axis
         /// <summary>
         /// Identifies the <see cref="PaletteSizeProperty"/> dependency property.
         /// </summary>
-        public static readonly StyledProperty<int> PaletteSizeProperty = AvaloniaProperty.Register<LinearColorAxis, int>(nameof(PaletteSize), 20, validate: (obj, val) =>
-        {
-            if (!ValidatePaletteSize(val))
-            {
-                throw new System.ArgumentException();
-            }
-
-            return val;
-        });
+        public static readonly StyledProperty<int> PaletteSizeProperty = AvaloniaProperty.Register<LinearColorAxis, int>(nameof(PaletteSize), 20, validate: ValidatePaletteSize);
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LinearColorAxis"/> class.
@@ -209,9 +201,9 @@ private static OxyPalette Interpolate(List<GradientStop> stops, int paletteSize)
         /// <returns>
         /// The validation result.
         /// </returns>
-        private static bool ValidatePaletteSize(object value)
+        private static bool ValidatePaletteSize(int value)
         {
-            return (int)value >= 1;
+            return value >= 1;
         }
 
         static LinearColorAxis()
diff --git a/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj b/Source/OxyPlot.Avalonia/OxyPlot.Avalonia.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="**\*.xaml;Assets\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
-    <PackageReference Include="Avalonia" Version="0.9.3" />
+    <PackageReference Include="Avalonia" Version="0.10.0-preview1" />
     <PackageReference Include="OxyPlot.Core" Version="2.0.0" />
   </ItemGroup>
 </Project>
diff --git a/Source/OxyPlot.Avalonia/PlotBase.Events.cs b/Source/OxyPlot.Avalonia/PlotBase.Events.cs
@@ -31,7 +31,7 @@ protected override void OnKeyDown(KeyEventArgs e)
                 return;
             }
 
-            var args = new OxyKeyEventArgs { ModifierKeys = e.Modifiers.ToModifierKeys(), Key = e.Key.Convert() };
+            var args = new OxyKeyEventArgs { ModifierKeys = e.KeyModifiers.ToModifierKeys(), Key = e.Key.Convert() };
             e.Handled = ActualController.HandleKeyDown(this, args);
         }
 
diff --git a/Source/OxyPlot.Avalonia/PlotBase.cs b/Source/OxyPlot.Avalonia/PlotBase.cs
@@ -259,9 +259,9 @@ public void InvalidatePlot(bool updateData = true)
         /// just before a UI element displays in an application. For more information, see Remarks.
         /// </summary>
         /// <param name="e">Event data for applying the template.</param>
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
+            base.OnApplyTemplate(e);
             panel = e.NameScope.Find(PartPanel) as Panel;
             if (panel == null)
             {
diff --git a/Source/OxyPlot.Avalonia/Series/HeatMapSeries.cs b/Source/OxyPlot.Avalonia/Series/HeatMapSeries.cs
@@ -21,15 +21,7 @@ public class HeatMapSeries : XYAxisSeries
         /// <summary>
         /// Identifies this <see cref="DataProperty"/> dependency property.
         /// </summary>
-        public static readonly StyledProperty<double[,]> DataProperty = AvaloniaProperty.Register<HeatMapSeries, double[,]>(nameof(Data), new double[0, 0], validate: (obj, val) =>
-        {
-            if (val == null)
-            {
-                throw new System.ArgumentException();
-            }
-
-            return val;
-        });
+        public static readonly StyledProperty<double[,]> DataProperty = AvaloniaProperty.Register<HeatMapSeries, double[,]>(nameof(Data), new double[0, 0], validate: val => val != null);
 
         /// <summary>
         /// Identifies this <see cref="X0Property"/> dependency property.
diff --git a/Source/OxyPlot.Avalonia/Tracker/TrackerControl.cs b/Source/OxyPlot.Avalonia/Tracker/TrackerControl.cs
@@ -316,9 +316,9 @@ public ScreenPoint Position
             }
         }
 
-        protected override void OnTemplateApplied(TemplateAppliedEventArgs e)
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
-            base.OnTemplateApplied(e);
+            base.OnApplyTemplate(e);
             path = e.NameScope.Get<Path>(PartPath);
             content = e.NameScope.Get<ContentPresenter>(PartContent);
             contentContainer = e.NameScope.Get<Panel>(PartContentContainer);
diff --git a/Source/OxyPlot.Avalonia/Utilities/ConverterExtensions.cs b/Source/OxyPlot.Avalonia/Utilities/ConverterExtensions.cs
@@ -372,25 +372,25 @@ public static OxyMouseButton Convert(this MouseButton button)
             }
         }
 
-        public static OxyModifierKeys ToModifierKeys(this InputModifiers modifiers)
+        public static OxyModifierKeys ToModifierKeys(this KeyModifiers modifiers)
         {
             var modifierKeys = OxyModifierKeys.None;
-            if ((modifiers & InputModifiers.Shift) != 0)
+            if ((modifiers & KeyModifiers.Shift) != 0)
             {
                 modifierKeys |= OxyModifierKeys.Shift;
             }
 
-            if ((modifiers & InputModifiers.Control) != 0)
+            if ((modifiers & KeyModifiers.Control) != 0)
             {
                 modifierKeys |= OxyModifierKeys.Control;
             }
 
-            if ((modifiers & InputModifiers.Alt) != 0)
+            if ((modifiers & KeyModifiers.Alt) != 0)
             {
                 modifierKeys |= OxyModifierKeys.Alt;
             }
 
-            if ((modifiers & InputModifiers.Windows) != 0)
+            if ((modifiers & KeyModifiers.Meta) != 0)
             {
                 modifierKeys |= OxyModifierKeys.Windows;
             }
@@ -427,7 +427,7 @@ public static OxyMouseDownEventArgs ToMouseDownEventArgs(this PointerPressedEven
                 ChangedButton = e.MouseButton.Convert(),
                 ClickCount = e.ClickCount,
                 Position = e.GetPosition(relativeTo).ToScreenPoint(),
-                ModifierKeys = e.InputModifiers.ToModifierKeys()
+                ModifierKeys = e.KeyModifiers.ToModifierKeys()
             };
         }
 
@@ -442,7 +442,7 @@ public static OxyMouseEventArgs ToMouseReleasedEventArgs(this PointerReleasedEve
             return new OxyMouseEventArgs
             {
                 Position = e.GetPosition(relativeTo).ToScreenPoint(),
-                ModifierKeys = e.InputModifiers.ToModifierKeys()
+                ModifierKeys = e.KeyModifiers.ToModifierKeys()
             };
         }
 
@@ -457,7 +457,7 @@ public static OxyMouseEventArgs ToMouseEventArgs(this PointerEventArgs e, IInput
             return new OxyMouseEventArgs
             {
                 Position = e.GetPosition(relativeTo).ToScreenPoint(),
-                ModifierKeys = e.InputModifiers.ToModifierKeys()
+                ModifierKeys = e.KeyModifiers.ToModifierKeys()
             };
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using Avalonia;`
`3`		`-using Avalonia.Controls.ApplicationLifetimes;`
`4`		`-using Avalonia.Logging.Serilog;`
	`1`	`+using Avalonia;`
`5`	`2`
`6`	`3`	`namespace ExampleBrowser`
`7`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class MainWindow : Window`
`25`	`25`	`public MainWindow()`
`26`	`26`	`{`
`27`	`27`	`InitializeComponent();`
`28`		`- DevToolsExtensions.AttachDevTools(this);`
	`28`	`+ this.AttachDevTools();`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`private void InitializeComponent()`
Original file line number	Diff line number	Diff line change
`@@ -1380,7 +1380,7 @@ protected void OnDataChanged()`
`1380`	`1380`	`/// The on property changed handler.`
`1381`	`1381`	`/// </summary>`
`1382`	`1382`	`/// <param name="e">The event args.</param>`
`1383`		`- protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs e)`
	`1383`	`+ protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> e)`
`1384`	`1384`	`{`
`1385`	`1385`	`base.OnPropertyChanged(e);`
`1386`	`1386`	`if (e.Property.OwnerType == GetType())`