Upgrade Avalonia to 11 rc1

src/Artemis.UI/Screens/ProfileEditor/Panels/MenuBar/MenuBarView.axaml

@@ -8,7 +8,7 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Artemis.UI.Screens.ProfileEditor.MenuBar.MenuBarView"
              x:DataType="menuBar:MenuBarViewModel">
-    <Menu VerticalAlignment="Top" MenuClosed="MenuBase_OnMenuClosed">
+    <Menu VerticalAlignment="Top" Closed="MenuBase_OnMenuClosed">
         <MenuItem Header="_File">
             <MenuItem Header="New">
                 <MenuItem.Icon>

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml

@@ -110,14 +110,14 @@
                         </shared:SelectionRectangle.Background>
                     </shared:SelectionRectangle>
 
-                    <Border Name="SurfaceBounds"
+                    <Rectangle Name="SurfaceBounds"
                             VerticalAlignment="Top"
                             HorizontalAlignment="Left"
                             Width="{Binding MaxTextureSize}"
                             Height="{Binding MaxTextureSize}"
-                            BorderThickness="2"
-                            BorderBrush="{DynamicResource SystemAccentColorLight1}"
-                            BorderDashArray="6,2"
+                            StrokeThickness="2"
+                            Stroke="{DynamicResource SystemAccentColorLight1}"
+                            StrokeDashArray="6,2"
                             Opacity="0.5" />
                 </Grid>
             </paz:ZoomBorder>

src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.axaml.cs

@@ -5,7 +5,6 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.PanAndZoom;
 using Avalonia.Input;
-using Avalonia.Markup.Xaml;
 using Avalonia.Media;
 using Avalonia.ReactiveUI;
 
@@ -30,7 +29,7 @@ public partial class SurfaceEditorView : ReactiveUserControl<SurfaceEditorViewMo
     private void ZoomBorder_OnZoomChanged(object sender, ZoomChangedEventArgs e)
     {
         UpdateZoomBorderBackground();
-        SurfaceBounds.BorderThickness = new Thickness(2 / ContainerZoomBorder.ZoomX);
+        SurfaceBounds.StrokeThickness = 2 / ContainerZoomBorder.ZoomX;
     }
 
     private void SelectionRectangle_OnSelectionUpdated(object? sender, SelectionRectangleEventArgs e)

src/Artemis.UI/Screens/VisualScripting/Pins/PinView.cs

@@ -3,17 +3,22 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.ReactiveUI;
-using Avalonia.Rendering;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 
 namespace Artemis.UI.Screens.VisualScripting.Pins;
 
 public class PinView : ReactiveUserControl<PinViewModel>
 {
-    private Canvas? _container;
+    private readonly DispatcherTimer _updateTimer;
     private bool _dragging;
+    private Canvas? _container;
     private Border? _pinPoint;
-    private PinViewRenderLoopTaks _renderLoopTask;
+
+    public PinView()
+    {
+        _updateTimer = new DispatcherTimer(TimeSpan.FromMilliseconds(16), DispatcherPriority.Render, UpdatePosition);
+    }
 
     protected void InitializePin(Border pinPoint)
     {
@@ -21,7 +26,6 @@ public class PinView : ReactiveUserControl<PinViewModel>
         _pinPoint.PointerMoved += PinPointOnPointerMoved;
         _pinPoint.PointerReleased += PinPointOnPointerReleased;
         _pinPoint.PropertyChanged += PinPointOnPropertyChanged;
-        _renderLoopTask = new PinViewRenderLoopTaks(this);
     }
 
     private void PinPointOnPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
@@ -74,19 +78,17 @@ public class PinView : ReactiveUserControl<PinViewModel>
     /// <inheritdoc />
     protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
-        base.OnAttachedToVisualTree(e);
         _container = this.FindAncestorOfType<Canvas>();
-        AvaloniaLocator.Current.GetRequiredService<IRenderLoop>().Add(_renderLoopTask);
+        _updateTimer.Start();
     }
 
     /// <inheritdoc />
     protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e)
     {
-        base.OnDetachedFromVisualTree(e);
-        AvaloniaLocator.Current.GetRequiredService<IRenderLoop>().Remove(_renderLoopTask);
+        _updateTimer.Stop();
     }
 
-    public void UpdatePosition()
+    public void UpdatePosition(object? sender, EventArgs eventArgs)
     {
         if (_container == null || _pinPoint == null || ViewModel == null)
             return;
@@ -97,25 +99,4 @@ public class PinView : ReactiveUserControl<PinViewModel>
     }
 
     #endregion
-}
-
-public class PinViewRenderLoopTaks : IRenderLoopTask
-{
-    private readonly PinView _pinView;
-
-    public PinViewRenderLoopTaks(PinView pinView)
-    {
-        _pinView = pinView;
-    }
-
-    public void Update(TimeSpan time)
-    {
-        _pinView.UpdatePosition();
-    }
-
-    public void Render()
-    {
-    }
-
-    public bool NeedsUpdate => true;
 }