From e9cc769bc929bb9494c1fff2a469ad27e0ef0ced Mon Sep 17 00:00:00 2001
From: Visne <39844191+Visne@users.noreply.github.com>
Date: Wed, 13 Dec 2023 21:16:37 +0100
Subject: [PATCH] Upgrade to Avalonia 11 (#110)

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
---
 Directory.Packages.props                        | 11 ++++++-----
 SS14.Launcher/App.xaml                          |  3 +--
 SS14.Launcher/App.xaml.cs                       |  4 +---
 SS14.Launcher/IconsLoader.cs                    |  4 +---
 SS14.Launcher/SS14.Launcher.csproj              |  5 +++--
 SS14.Launcher/Theme/Theme.xaml                  | 10 +++++-----
 SS14.Launcher/Theme/ThemeDropDown.xaml          |  3 +--
 SS14.Launcher/Theme/ThemeTabControl.xaml        |  4 +---
 SS14.Launcher/Theme/ThemeTabItem.xaml           |  2 +-
 SS14.Launcher/ViewLocator.cs                    |  7 +++++--
 .../ViewModels/AccountDropDownViewModel.cs      | 12 +++++++++---
 SS14.Launcher/ViewModels/ConnectingViewModel.cs |  4 ++++
 .../MainWindowTabs/ServerEntryViewModel.cs      |  2 --
 SS14.Launcher/Views/AccountDropDown.xaml        |  2 +-
 SS14.Launcher/Views/AddFavoriteDialog.xaml.cs   |  9 +--------
 SS14.Launcher/Views/ConnectingOverlay.xaml      |  6 +++++-
 SS14.Launcher/Views/ConnectingOverlay.xaml.cs   |  4 +++-
 SS14.Launcher/Views/DropDown.cs                 | 12 ++++++------
 SS14.Launcher/Views/HubSettingsDialog.xaml      |  4 ++--
 SS14.Launcher/Views/HubSettingsDialog.xaml.cs   |  4 ----
 .../Views/Login/AuthErrorsOverlayView.xaml      |  4 ++--
 .../Views/Login/AuthErrorsOverlayView.xaml.cs   |  6 ++++--
 .../Views/Login/ForgotPasswordView.xaml.cs      |  4 +---
 SS14.Launcher/Views/Login/LoginView.xaml.cs     |  7 ++-----
 SS14.Launcher/Views/Login/RegisterView.xaml.cs  | 10 ++++------
 .../Views/Login/ResendConfirmationView.xaml.cs  |  4 +---
 SS14.Launcher/Views/MainWindow.xaml             |  2 +-
 SS14.Launcher/Views/MainWindow.xaml.cs          | 17 +++++------------
 .../Views/MainWindowTabs/HomePageView.xaml      |  2 +-
 .../Views/MainWindowTabs/NewsTabView.xaml       |  2 +-
 .../Views/MainWindowTabs/OptionsTabView.xaml.cs |  3 +--
 .../Views/MainWindowTabs/ServerEntryView.xaml   |  5 ++---
 .../MainWindowTabs/ServerListFiltersView.xaml   | 10 +++++-----
 .../Views/MainWindowTabs/ServerListTabView.xaml |  2 +-
 34 files changed, 87 insertions(+), 103 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6c64058b..c000ba42 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,13 +7,15 @@
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.4"/>
     <PackageVersion Include="NSec.Cryptography" Version="22.4.0"/>
     <PackageVersion Include="SharpZstd.Interop" Version="1.5.2-beta2"/>
+    <PackageVersion Include="JetBrains.Annotations" Version="2023.2.0-eap3" />
     <!-- Loader -->
     <PackageVersion Include="Robust.Natives" Version="0.1.1"/>
     <!-- Launcher -->
-    <PackageVersion Include="Avalonia" Version="0.10.19"/>
-    <PackageVersion Include="Avalonia.Desktop" Version="0.10.19"/>
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="0.10.19"/>
-    <PackageVersion Include="Avalonia.Diagnostics" Version="0.10.19"/>
+    <PackageVersion Include="Avalonia" Version="11.0.5"/>
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.5"/>
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.5"/>
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.5"/>
+    <PackageVersion Include="Avalonia.Themes.Simple" Version="11.0.5"/>
     <PackageVersion Include="CodeHollow.FeedReader" Version="1.2.6"/>
     <PackageVersion Include="Dapper" Version="2.0.123"/>
     <PackageVersion Include="DynamicData" Version="7.13.1"/>
@@ -24,7 +26,6 @@
     <PackageVersion Include="Serilog" Version="2.12.0"/>
     <PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0"/>
     <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0"/>
-    <PackageVersion Include="XamlNameReferenceGenerator" Version="1.6.1"/>
     <PackageVersion Include="YamlDotNet" Version="13.0.2"/>
     <PackageVersion Include="TerraFX.Interop.Windows" Version="10.0.22621.1"/>
     <PackageVersion Include="Mono.Posix.NETStandard" Version="1.0.0"/>
diff --git a/SS14.Launcher/App.xaml b/SS14.Launcher/App.xaml
index 8b450210..03893c3c 100644
--- a/SS14.Launcher/App.xaml
+++ b/SS14.Launcher/App.xaml
@@ -7,8 +7,7 @@
   </Application.DataTemplates>
 
   <Application.Styles>
-    <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml" />
-    <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseDark.xaml" />
+    <StyleInclude Source="avares://Avalonia.Themes.Simple/SimpleTheme.xaml" />
     <StyleInclude Source="/Theme/Theme.xaml" />
     <StyleInclude Source="/Theme/ThemeResources.xaml" />
     <StyleInclude Source="/Theme/ThemeAngleBox.xaml" />
diff --git a/SS14.Launcher/App.xaml.cs b/SS14.Launcher/App.xaml.cs
index 9f4e6557..b3fc5db7 100644
--- a/SS14.Launcher/App.xaml.cs
+++ b/SS14.Launcher/App.xaml.cs
@@ -48,11 +48,9 @@ public override void Initialize()
 
     private void LoadBaseAssets()
     {
-        var loader = AvaloniaLocator.Current.GetService<IAssetLoader>()!;
-
         foreach (var (name, (path, type)) in AssetDefs)
         {
-            using var dataStream = loader.Open(new Uri($"avares://SS14.Launcher/Assets/{path}"));
+            using var dataStream = AssetLoader.Open(new Uri($"avares://SS14.Launcher/Assets/{path}"));
 
             var asset = LoadAsset(type, dataStream);
 
diff --git a/SS14.Launcher/IconsLoader.cs b/SS14.Launcher/IconsLoader.cs
index fae39c0b..3dfeecb4 100644
--- a/SS14.Launcher/IconsLoader.cs
+++ b/SS14.Launcher/IconsLoader.cs
@@ -18,11 +18,9 @@ private static readonly (string path, string resource)[] Icons =
 
     public static void Load(App app)
     {
-        var loader = AvaloniaLocator.Current.GetService<IAssetLoader>()!;
-
         foreach (var (path, resource) in Icons)
         {
-            using var file = loader.Open(new Uri($"avares://SS14.Launcher/Assets/{path}"));
+            using var file = AssetLoader.Open(new Uri($"avares://SS14.Launcher/Assets/{path}"));
             var bitmap = new Bitmap(file);
             app.Resources.Add(resource, bitmap);
         }
diff --git a/SS14.Launcher/SS14.Launcher.csproj b/SS14.Launcher/SS14.Launcher.csproj
index 6e5578c7..a0d5f1c4 100644
--- a/SS14.Launcher/SS14.Launcher.csproj
+++ b/SS14.Launcher/SS14.Launcher.csproj
@@ -23,7 +23,7 @@
       <SubType>Designer</SubType>
     </AvaloniaResource>
 
-    <AdditionalFiles Include="**\*.xaml" />
+    <AdditionalFiles Include="**\*.xaml" SourceItemGroup="AvaloniaXaml" />
 
     <Compile Update="Views\MainWindowTabs\ServerFilterView.xaml.cs">
       <DependentUpon>ServerFilterView.xaml</DependentUpon>
@@ -34,6 +34,7 @@
     <PackageReference Include="Avalonia.Desktop" />
     <PackageReference Include="Avalonia.ReactiveUI" />
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
+    <PackageReference Include="Avalonia.Themes.Simple" />
     <PackageReference Include="CodeHollow.FeedReader" />
     <PackageReference Include="Dapper" />
     <PackageReference Include="DynamicData" />
@@ -45,13 +46,13 @@
     <PackageReference Include="Serilog" />
     <PackageReference Include="Serilog.Sinks.Console" />
     <PackageReference Include="Serilog.Sinks.File" />
-    <PackageReference Include="XamlNameReferenceGenerator" />
     <PackageReference Include="YamlDotNet" />
     <PackageReference Include="TerraFX.Interop.Windows" />
     <PackageReference Include="NSec.Cryptography" />
     <PackageReference Include="Mono.Posix.NETStandard" />
     <PackageReference Include="SharpZstd.Interop" />
     <PackageReference Include="SpaceWizards.Sodium" />
+    <PackageReference Include="JetBrains.Annotations" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="Utility\runtime.json" />
diff --git a/SS14.Launcher/Theme/Theme.xaml b/SS14.Launcher/Theme/Theme.xaml
index b54b612d..88479248 100644
--- a/SS14.Launcher/Theme/Theme.xaml
+++ b/SS14.Launcher/Theme/Theme.xaml
@@ -45,19 +45,19 @@
   </Style>
 
   <!-- TabItem -->
-  <Style Selector="TabItem:pointerover">
+  <Style Selector="TabItem:pointerover /template/ ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ThemeTabItemHoveredBrush}" />
   </Style>
-  <Style Selector="TabItem:selected">
+  <Style Selector="TabItem:selected /template/ ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ThemeTabItemSelectedBrush}" />
   </Style>
-  <Style Selector="TabItem:selected:focus">
+  <Style Selector="TabItem:selected:focus /template/ ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ThemeTabItemSelectedBrush}" />
   </Style>
-  <Style Selector="TabItem:selected:pointerover">
+  <Style Selector="TabItem:selected:pointerover /template/ ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ThemeTabItemSelectedBrush}" />
   </Style>
-  <Style Selector="TabItem:selected:focus:pointerover">
+  <Style Selector="TabItem:selected:focus:pointerover /template/ ContentPresenter">
     <Setter Property="Background" Value="{DynamicResource ThemeTabItemSelectedBrush}" />
   </Style>
 
diff --git a/SS14.Launcher/Theme/ThemeDropDown.xaml b/SS14.Launcher/Theme/ThemeDropDown.xaml
index 551f3370..21e03301 100644
--- a/SS14.Launcher/Theme/ThemeDropDown.xaml
+++ b/SS14.Launcher/Theme/ThemeDropDown.xaml
@@ -26,8 +26,7 @@
                 MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
                 Name="PART_Popup"
                 PlacementTarget="{TemplateBinding}"
-                IsOpen="{TemplateBinding IsDropDownOpen,Mode=TwoWay}"
-                StaysOpen="False">
+                IsOpen="{TemplateBinding IsDropDownOpen,Mode=TwoWay}">
                 <ContentPresenter Content="{TemplateBinding Content}"
                                   ContentTemplate="{TemplateBinding ContentTemplate}" />
               </Popup>
diff --git a/SS14.Launcher/Theme/ThemeTabControl.xaml b/SS14.Launcher/Theme/ThemeTabControl.xaml
index 96bd01df..512f502f 100644
--- a/SS14.Launcher/Theme/ThemeTabControl.xaml
+++ b/SS14.Launcher/Theme/ThemeTabControl.xaml
@@ -21,9 +21,7 @@ Taken & modified from Avalonia's git repo.
               Background="{DynamicResource ThemeStripeBackBrush}">
               <ItemsPresenter
                 Name="PART_ItemsPresenter"
-                Items="{TemplateBinding Items}"
-                ItemsPanel="{TemplateBinding ItemsPanel}"
-                ItemTemplate="{TemplateBinding ItemTemplate}" />
+                ItemsPanel="{TemplateBinding ItemsPanel}"/>
             </Panel>
             <Panel Name="PART_Edge" Background="{DynamicResource ThemeStripebackEdgeBrush}" />
             <ContentPresenter
diff --git a/SS14.Launcher/Theme/ThemeTabItem.xaml b/SS14.Launcher/Theme/ThemeTabItem.xaml
index 6ddf9526..1925a1ac 100644
--- a/SS14.Launcher/Theme/ThemeTabItem.xaml
+++ b/SS14.Launcher/Theme/ThemeTabItem.xaml
@@ -1,7 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-  <Style Selector="TabItem">
+  <Style Selector="TabItem /template/ ContentPresenter">
     <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
   </Style>
 </Styles>
diff --git a/SS14.Launcher/ViewLocator.cs b/SS14.Launcher/ViewLocator.cs
index 1406daa3..ec150e2d 100644
--- a/SS14.Launcher/ViewLocator.cs
+++ b/SS14.Launcher/ViewLocator.cs
@@ -12,8 +12,11 @@ public class ViewLocator : IDataTemplate
 {
     public bool SupportsRecycling => false;
 
-    public IControl Build(object data)
+    public Control? Build(object? data)
     {
+        if (data == null)
+            return null;
+
         var name = data.GetType().FullName!.Replace("ViewModel", "View");
         var type = Type.GetType(name);
 
@@ -27,7 +30,7 @@ public IControl Build(object data)
         }
     }
 
-    public bool Match(object data)
+    public bool Match(object? data)
     {
         return data is IViewModelBase;
     }
diff --git a/SS14.Launcher/ViewModels/AccountDropDownViewModel.cs b/SS14.Launcher/ViewModels/AccountDropDownViewModel.cs
index 82897d5c..545d48bb 100644
--- a/SS14.Launcher/ViewModels/AccountDropDownViewModel.cs
+++ b/SS14.Launcher/ViewModels/AccountDropDownViewModel.cs
@@ -5,6 +5,7 @@
 using JetBrains.Annotations;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using Serilog;
 using Splat;
 using SS14.Launcher.Api;
 using SS14.Launcher.Models.Data;
@@ -87,11 +88,16 @@ public async void LogoutPressed()
     }
 
     [UsedImplicitly]
-    public void AccountButtonPressed(LoggedInAccount account)
+    public void AccountButtonPressed(object account)
     {
-        IsDropDownOpen = false;
+        if (account is not LoggedInAccount loggedInAccount)
+        {
+            Log.Warning($"Tried to switch account but parameter was not of type {nameof(LoggedInAccount)}");
+            return;
+        }
 
-        _mainVm.TrySwitchToAccount(account);
+        IsDropDownOpen = false;
+        _mainVm.TrySwitchToAccount(loggedInAccount);
     }
 
     public void AddAccountPressed()
diff --git a/SS14.Launcher/ViewModels/ConnectingViewModel.cs b/SS14.Launcher/ViewModels/ConnectingViewModel.cs
index f85f7619..1f1e9caf 100644
--- a/SS14.Launcher/ViewModels/ConnectingViewModel.cs
+++ b/SS14.Launcher/ViewModels/ConnectingViewModel.cs
@@ -28,6 +28,8 @@ public class ConnectingViewModel : ViewModelBase
                              _connectorStatus == Connector.ConnectionStatus.ClientExited &&
                              _connector.ClientExitedBadly;
 
+    public static event Action? StartedConnecting;
+
     public ConnectingViewModel(Connector connector, MainWindowViewModel windowVm, string? givenReason)
     {
         _updater = Locator.Current.GetRequiredService<Updater>();
@@ -186,6 +188,7 @@ public static void StartConnect(MainWindowViewModel windowVm, string address, st
         var vm = new ConnectingViewModel(connector, windowVm, givenReason);
         windowVm.ConnectingVM = vm;
         vm.Start(address);
+        StartedConnecting?.Invoke();
     }
 
     public static void StartContentBundle(MainWindowViewModel windowVm, string fileName)
@@ -194,6 +197,7 @@ public static void StartContentBundle(MainWindowViewModel windowVm, string fileN
         var vm = new ConnectingViewModel(connector, windowVm, null);
         windowVm.ConnectingVM = vm;
         vm.StartContentBundle(fileName);
+        StartedConnecting?.Invoke();
     }
 
     private void Start(string address)
diff --git a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
index f1a49c25..eb125512 100644
--- a/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
+++ b/SS14.Launcher/ViewModels/MainWindowTabs/ServerEntryViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using Avalonia.Input;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.Messaging;
 using SS14.Launcher.Models.Data;
@@ -50,7 +49,6 @@ public ServerEntryViewModel(
 
     public void ConnectPressed()
     {
-        FocusManager.Instance?.Focus(null);
         ConnectingViewModel.StartConnect(_windowVm, Address);
     }
 
diff --git a/SS14.Launcher/Views/AccountDropDown.xaml b/SS14.Launcher/Views/AccountDropDown.xaml
index 812e9fca..b08fd708 100644
--- a/SS14.Launcher/Views/AccountDropDown.xaml
+++ b/SS14.Launcher/Views/AccountDropDown.xaml
@@ -23,7 +23,7 @@
         <StackPanel Orientation="Vertical" IsVisible="{Binding AccountSwitchVisible}">
           <TextBlock Text="{Binding AccountSwitchText}" Margin="4" />
 
-          <ItemsControl Name="Items" Items="{Binding Accounts}">
+          <ItemsControl Name="Items" ItemsSource="{Binding Accounts}">
             <ItemsControl.ItemTemplate>
               <DataTemplate DataType="vm:AvailableAccountViewModel">
                 <Button Content="{Binding StatusText}" Margin="4"
diff --git a/SS14.Launcher/Views/AddFavoriteDialog.xaml.cs b/SS14.Launcher/Views/AddFavoriteDialog.xaml.cs
index fa81e094..66c71030 100644
--- a/SS14.Launcher/Views/AddFavoriteDialog.xaml.cs
+++ b/SS14.Launcher/Views/AddFavoriteDialog.xaml.cs
@@ -1,5 +1,4 @@
 using System;
-using Avalonia;
 using Avalonia.Controls;
 using ReactiveUI;
 
@@ -24,12 +23,6 @@ public AddFavoriteDialog()
 
         this.WhenAnyValue(x => x._addressBox.Text)
             .Subscribe(_ => UpdateSubmitValid());
-
-#if DEBUG
-
-        this.AttachDevTools();
-
-#endif
     }
 
     protected override void OnOpened(EventArgs e)
@@ -52,4 +45,4 @@ private void UpdateSubmitValid()
         SubmitButton.IsEnabled = valid;
         TxtInvalid.IsVisible = !validAddr;
     }
-}
\ No newline at end of file
+}
diff --git a/SS14.Launcher/Views/ConnectingOverlay.xaml b/SS14.Launcher/Views/ConnectingOverlay.xaml
index 4f97349b..1fa3debf 100644
--- a/SS14.Launcher/Views/ConnectingOverlay.xaml
+++ b/SS14.Launcher/Views/ConnectingOverlay.xaml
@@ -23,7 +23,11 @@
                 Command="{Binding ErrorDismissed}" MinWidth="75" />
 
         <DockPanel LastChildFill="False">
-          <Button DockPanel.Dock="Left" Content="Cancel" Command="{Binding Cancel}" IsVisible="{Binding !IsErrored}" />
+          <Button DockPanel.Dock="Left"
+                  Name="CancelButton"
+                  Content="Cancel"
+                  Command="{Binding Cancel}"
+                  IsVisible="{Binding !IsErrored}" />
 
           <TextBlock DockPanel.Dock="Right" Margin="8 4 0 4" Text="{Binding ProgressText}"
                      TextWrapping="Wrap"
diff --git a/SS14.Launcher/Views/ConnectingOverlay.xaml.cs b/SS14.Launcher/Views/ConnectingOverlay.xaml.cs
index 9eb701e8..b6fe3193 100644
--- a/SS14.Launcher/Views/ConnectingOverlay.xaml.cs
+++ b/SS14.Launcher/Views/ConnectingOverlay.xaml.cs
@@ -1,5 +1,6 @@
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
+using Avalonia.Threading;
+using SS14.Launcher.ViewModels;
 
 namespace SS14.Launcher.Views;
 
@@ -8,5 +9,6 @@ public partial class ConnectingOverlay : UserControl
     public ConnectingOverlay()
     {
         InitializeComponent();
+        ConnectingViewModel.StartedConnecting += () => Dispatcher.UIThread.Post(() => CancelButton.Focus());
     }
 }
diff --git a/SS14.Launcher/Views/DropDown.cs b/SS14.Launcher/Views/DropDown.cs
index 546a3f31..fdeff6ec 100644
--- a/SS14.Launcher/Views/DropDown.cs
+++ b/SS14.Launcher/Views/DropDown.cs
@@ -14,10 +14,10 @@ public sealed class DropDown : TemplatedControl
         AvaloniaProperty.RegisterDirect<DropDown, bool>(nameof(IsDropDownOpen), down => down.IsDropDownOpen,
             (down, b) => down.IsDropDownOpen = b);
 
-    public static readonly StyledProperty<object> ContentProperty =
+    public static readonly StyledProperty<object?> ContentProperty =
         ContentControl.ContentProperty.AddOwner<DropDown>();
 
-    public static readonly StyledProperty<IDataTemplate> ContentTemplateProperty =
+    public static readonly StyledProperty<IDataTemplate?> ContentTemplateProperty =
         ContentControl.ContentTemplateProperty.AddOwner<DropDown>();
 
     public static readonly StyledProperty<object> HeaderContentProperty =
@@ -30,13 +30,13 @@ public sealed class DropDown : TemplatedControl
     private Popup? _popup;
 
     [Content]
-    public object Content
+    public object? Content
     {
         get => GetValue(ContentProperty);
         set => SetValue(ContentProperty, value);
     }
 
-    public IDataTemplate ContentTemplate
+    public IDataTemplate? ContentTemplate
     {
         get => GetValue(ContentTemplateProperty);
         set => SetValue(ContentTemplateProperty, value);
@@ -74,7 +74,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
     {
         if (!e.Handled)
         {
-            if (e.Source != null && _popup?.IsInsidePopup((IVisual) e.Source) == false)
+            if (e.Source != null && _popup?.IsInsidePopup((Visual) e.Source) == false)
             {
                 IsDropDownOpen ^= true;
                 e.Handled = true;
@@ -90,4 +90,4 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 
         base.OnApplyTemplate(e);
     }
-}
\ No newline at end of file
+}
diff --git a/SS14.Launcher/Views/HubSettingsDialog.xaml b/SS14.Launcher/Views/HubSettingsDialog.xaml
index fe3a4d83..40c68885 100644
--- a/SS14.Launcher/Views/HubSettingsDialog.xaml
+++ b/SS14.Launcher/Views/HubSettingsDialog.xaml
@@ -70,7 +70,7 @@ take precedence.
     <ScrollViewer DockPanel.Dock="Top">
       <StackPanel Spacing="2">
         <TextBlock DockPanel.Dock="Left" Text="Default" Classes="NanoHeadingSmall" />
-        <ItemsControl Items="{Binding DefaultHubs}" Classes="Spaced">
+        <ItemsControl ItemsSource="{Binding DefaultHubs}" Classes="Spaced">
           <ItemsControl.ItemTemplate>
             <DataTemplate>
               <TextBox Text="{Binding}" IsEnabled="False" />
@@ -78,7 +78,7 @@ take precedence.
           </ItemsControl.ItemTemplate>
         </ItemsControl>
         <TextBlock DockPanel.Dock="Left" Text="Custom" Classes="NanoHeadingSmall" />
-        <ItemsControl Items="{Binding HubList}" Name="Hubs" Classes="Spaced">
+        <ItemsControl ItemsSource="{Binding HubList}" Name="Hubs" Classes="Spaced">
           <ItemsControl.ItemTemplate>
             <DataTemplate>
               <DockPanel>
diff --git a/SS14.Launcher/Views/HubSettingsDialog.xaml.cs b/SS14.Launcher/Views/HubSettingsDialog.xaml.cs
index 08bea27a..8f0d8678 100644
--- a/SS14.Launcher/Views/HubSettingsDialog.xaml.cs
+++ b/SS14.Launcher/Views/HubSettingsDialog.xaml.cs
@@ -17,10 +17,6 @@ public HubSettingsDialog()
     {
         InitializeComponent();
 
-#if DEBUG
-        this.AttachDevTools();
-#endif
-
         _viewModel = (DataContext as HubSettingsViewModel)!; // Should have been set in XAML
         _viewModel.HubList.CollectionChanged += (_, _) => Verify();
     }
diff --git a/SS14.Launcher/Views/Login/AuthErrorsOverlayView.xaml b/SS14.Launcher/Views/Login/AuthErrorsOverlayView.xaml
index 14ac4661..bafba5ce 100644
--- a/SS14.Launcher/Views/Login/AuthErrorsOverlayView.xaml
+++ b/SS14.Launcher/Views/Login/AuthErrorsOverlayView.xaml
@@ -14,9 +14,9 @@
   <DockPanel>
     <TextBlock HorizontalAlignment="Center" DockPanel.Dock="Top" Classes="NanoHeadingMedium" Text="{Binding Title}" />
 
-    <Button DockPanel.Dock="Bottom" Content="Ok" MinWidth="60" HorizontalAlignment="Center"
+    <Button Name="OkButton" DockPanel.Dock="Bottom" Content="Ok" MinWidth="60" HorizontalAlignment="Center"
             Command="{Binding Ok}" />
-    <ItemsControl Items="{Binding Errors}" Margin="0, 20" HorizontalAlignment="Center" MaxWidth="400">
+    <ItemsControl ItemsSource="{Binding Errors}" Margin="0, 20" HorizontalAlignment="Center" MaxWidth="400">
       <ItemsControl.ItemTemplate>
         <DataTemplate DataType="system:String">
           <TextBlock Text="{Binding}" TextWrapping="Wrap" />
diff --git a/SS14.Launcher/Views/Login/AuthErrorsOverlayView.xaml.cs b/SS14.Launcher/Views/Login/AuthErrorsOverlayView.xaml.cs
index 8793e84a..1c1145f9 100644
--- a/SS14.Launcher/Views/Login/AuthErrorsOverlayView.xaml.cs
+++ b/SS14.Launcher/Views/Login/AuthErrorsOverlayView.xaml.cs
@@ -2,11 +2,13 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Markup.Xaml;
+using Avalonia.VisualTree;
 using SS14.Launcher.ViewModels.Login;
+using YamlDotNet.Core;
 
 namespace SS14.Launcher.Views.Login;
 
-public sealed partial class AuthErrorsOverlayView : UserControl, IFocusScope
+public sealed partial class AuthErrorsOverlayView : UserControl
 {
     public AuthErrorsOverlayView()
     {
@@ -17,7 +19,7 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
     {
         base.OnAttachedToVisualTree(e);
 
-        FocusManager.Instance?.SetFocusScope(this);
+        OkButton.Focus();
     }
 
     protected override void OnKeyDown(KeyEventArgs e)
diff --git a/SS14.Launcher/Views/Login/ForgotPasswordView.xaml.cs b/SS14.Launcher/Views/Login/ForgotPasswordView.xaml.cs
index 199ec75b..40be1701 100644
--- a/SS14.Launcher/Views/Login/ForgotPasswordView.xaml.cs
+++ b/SS14.Launcher/Views/Login/ForgotPasswordView.xaml.cs
@@ -11,9 +11,7 @@ public ForgotPasswordView()
     {
         InitializeComponent();
 
-        var emailBox = this.FindControl<TextBox>("EmailBox");
-
-        emailBox.KeyDown += InputBoxOnKeyDown;
+        EmailBox.KeyDown += InputBoxOnKeyDown;
     }
 
     private void InputBoxOnKeyDown(object? sender, KeyEventArgs args)
diff --git a/SS14.Launcher/Views/Login/LoginView.xaml.cs b/SS14.Launcher/Views/Login/LoginView.xaml.cs
index 5c6aa125..a8f10b36 100644
--- a/SS14.Launcher/Views/Login/LoginView.xaml.cs
+++ b/SS14.Launcher/Views/Login/LoginView.xaml.cs
@@ -11,11 +11,8 @@ public LoginView()
     {
         InitializeComponent();
 
-        var nameBox = this.FindControl<TextBox>("NameBox");
-        var passwordBox = this.FindControl<TextBox>("PasswordBox");
-
-        nameBox.KeyDown += InputBoxOnKeyDown;
-        passwordBox.KeyDown += InputBoxOnKeyDown;
+        NameBox.KeyDown += InputBoxOnKeyDown;
+        PasswordBox.KeyDown += InputBoxOnKeyDown;
     }
 
     private void InputBoxOnKeyDown(object? sender, KeyEventArgs args)
diff --git a/SS14.Launcher/Views/Login/RegisterView.xaml.cs b/SS14.Launcher/Views/Login/RegisterView.xaml.cs
index b357b16a..b8a6c982 100644
--- a/SS14.Launcher/Views/Login/RegisterView.xaml.cs
+++ b/SS14.Launcher/Views/Login/RegisterView.xaml.cs
@@ -11,12 +11,10 @@ public RegisterView()
     {
         InitializeComponent();
 
-        void AddKeyDown(string name) => this.FindControl<TextBox>(name).KeyDown += OnTextBoxKeyDown;
-
-        AddKeyDown("NameBox");
-        AddKeyDown("EmailBox");
-        AddKeyDown("PasswordBox");
-        AddKeyDown("PasswordConfirmBox");
+        NameBox.KeyDown += OnTextBoxKeyDown;
+        EmailBox.KeyDown += OnTextBoxKeyDown;
+        PasswordBox.KeyDown += OnTextBoxKeyDown;
+        PasswordConfirmBox.KeyDown += OnTextBoxKeyDown;
     }
 
     private void OnTextBoxKeyDown(object? sender, KeyEventArgs args)
diff --git a/SS14.Launcher/Views/Login/ResendConfirmationView.xaml.cs b/SS14.Launcher/Views/Login/ResendConfirmationView.xaml.cs
index 1875ef62..8f72d638 100644
--- a/SS14.Launcher/Views/Login/ResendConfirmationView.xaml.cs
+++ b/SS14.Launcher/Views/Login/ResendConfirmationView.xaml.cs
@@ -11,9 +11,7 @@ public ResendConfirmationView()
     {
         InitializeComponent();
 
-        var emailBox = this.FindControl<TextBox>("EmailBox");
-
-        emailBox.KeyDown += InputBoxOnKeyDown;
+        EmailBox.KeyDown += InputBoxOnKeyDown;
     }
 
     private void InputBoxOnKeyDown(object? sender, KeyEventArgs args)
diff --git a/SS14.Launcher/Views/MainWindow.xaml b/SS14.Launcher/Views/MainWindow.xaml
index 6a6ecb83..bb74fb87 100644
--- a/SS14.Launcher/Views/MainWindow.xaml
+++ b/SS14.Launcher/Views/MainWindow.xaml
@@ -57,7 +57,7 @@
       <Panel DockPanel.Dock="Top" Classes="GoldLineHorizontal" />
       <Grid>
         <!-- Main tabbed layout when logged in -->
-        <TabControl IsVisible="{Binding LoggedIn}" Items="{Binding Tabs}" TabStripPlacement="Bottom"
+        <TabControl IsVisible="{Binding LoggedIn}" ItemsSource="{Binding Tabs}" TabStripPlacement="Bottom"
                     SelectedIndex="{Binding SelectedIndex,Mode=TwoWay}" Margin="0 4 0 0">
           <TabControl.ItemTemplate>
             <DataTemplate DataType="mainWindowTabs:MainWindowTabViewModel">
diff --git a/SS14.Launcher/Views/MainWindow.xaml.cs b/SS14.Launcher/Views/MainWindow.xaml.cs
index b89ee06b..2c05e629 100644
--- a/SS14.Launcher/Views/MainWindow.xaml.cs
+++ b/SS14.Launcher/Views/MainWindow.xaml.cs
@@ -5,7 +5,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Win32;
 using SS14.Launcher.ViewModels;
 using TerraFX.Interop.Windows;
 using IDataObject = Avalonia.Input.IDataObject;
@@ -22,10 +21,6 @@ public MainWindow()
 
         DarkMode();
 
-#if DEBUG
-        this.AttachDevTools();
-#endif
-
         AddHandler(DragDrop.DragEnterEvent, DragEnter);
         AddHandler(DragDrop.DragLeaveEvent, DragLeave);
         AddHandler(DragDrop.DragOverEvent, DragOver);
@@ -51,18 +46,16 @@ protected override void OnDataContextChanged(EventArgs e)
 
     private unsafe void DarkMode()
     {
-        if (PlatformImpl is not WindowImpl windowImpl || Environment.OSVersion.Version.Build < 22000)
+        if (!OperatingSystem.IsWindows() || Environment.OSVersion.Version.Build < 22000)
             return;
 
-        var type = windowImpl.GetType();
-        var prop = type.GetProperty("Hwnd", BindingFlags.NonPublic | BindingFlags.Instance);
-        if (prop == null)
+        if (TryGetPlatformHandle() is not { HandleDescriptor: "HWND" } handle)
         {
             // No need to log a warning, PJB will notice when this breaks.
             return;
         }
 
-        var hWnd = (HWND)(nint)prop.GetValue(windowImpl)!;
+        var hWnd = (HWND)handle.Handle;
 
         COLORREF r = 0x00262121;
         Windows.DwmSetWindowAttribute(hWnd, 35, &r, (uint) sizeof(COLORREF));
@@ -121,9 +114,9 @@ private bool IsDragDropValid(IDataObject dataObject)
 
     private static string? GetDragDropFileName(IDataObject dataObject)
     {
-        if (!dataObject.Contains(DataFormats.FileNames))
+        if (!dataObject.Contains(DataFormats.Files))
             return null;
 
-        return dataObject.GetFileNames()?.SingleOrDefault();
+        return dataObject.GetFiles()?.SingleOrDefault()?.Path.AbsolutePath;
     }
 }
diff --git a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
index 51269c6c..e7e02301 100644
--- a/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/HomePageView.xaml
@@ -42,7 +42,7 @@
             <Button Content="Go to the servers tab" Command="{Binding MainWindowViewModel.SelectTabServers}"
                     HorizontalAlignment="Center" />
             </StackPanel>
-            <ItemsControl Items="{Binding Favorites}"
+            <ItemsControl ItemsSource="{Binding Favorites}"
                           Classes="ServerList" />
           </DockPanel>
           <StackPanel IsVisible="{Binding FavoritesEmpty}"
diff --git a/SS14.Launcher/Views/MainWindowTabs/NewsTabView.xaml b/SS14.Launcher/Views/MainWindowTabs/NewsTabView.xaml
index f5bc3226..77caa39b 100644
--- a/SS14.Launcher/Views/MainWindowTabs/NewsTabView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/NewsTabView.xaml
@@ -16,7 +16,7 @@
 
     <Panel Background="{DynamicResource StripeBackBrush}">
       <ScrollViewer IsVisible="{Binding NewsPulled}">
-        <ItemsControl Items="{Binding NewsEntries}">
+        <ItemsControl ItemsSource="{Binding NewsEntries}">
           <ItemsControl.ItemTemplate>
             <DataTemplate DataType="mainWindowTabs:NewsEntryViewModel">
               <Button Margin="4, 4" Command="{Binding Open}">
diff --git a/SS14.Launcher/Views/MainWindowTabs/OptionsTabView.xaml.cs b/SS14.Launcher/Views/MainWindowTabs/OptionsTabView.xaml.cs
index e0639aca..3c6a530b 100644
--- a/SS14.Launcher/Views/MainWindowTabs/OptionsTabView.xaml.cs
+++ b/SS14.Launcher/Views/MainWindowTabs/OptionsTabView.xaml.cs
@@ -15,8 +15,7 @@ public OptionsTabView()
     {
         InitializeComponent();
 
-        var flip = this.FindControl<Button>("Flip");
-        flip.Command = ReactiveCommand.Create(() =>
+        Flip.Command = ReactiveCommand.Create(() =>
         {
             var window = (Window?) VisualRoot;
             if (window == null)
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml
index 1221395c..e2b69dd1 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerEntryView.xaml
@@ -22,8 +22,7 @@
                      MinWidth="80"
                      Margin="10, 0" />
           <Rectangle DockPanel.Dock="Right" Classes="VerticalSeparator" />
-          <!-- TODO: Enable text trimming here when Avalonia 0.10 is out of preview and we switch to it. -->
-          <TextBlock VerticalAlignment="Center" Text="{Binding Name}" />
+          <TextBlock VerticalAlignment="Center" Text="{Binding Name}" TextTrimming="CharacterEllipsis"/>
         </DockPanel>
       </Expander.Header>
       <DockPanel Margin="4">
@@ -54,7 +53,7 @@
                   Command="{Binding FavoriteRaiseButtonPressed}" />
         </Grid>
 
-        <ItemsControl VerticalAlignment="Bottom" Items="{Binding CacheData.Links}">
+        <ItemsControl VerticalAlignment="Bottom" ItemsSource="{Binding CacheData.Links}">
           <ItemsControl.ItemsPanel>
             <ItemsPanelTemplate>
               <WrapPanel Orientation="Horizontal" />
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerListFiltersView.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerListFiltersView.xaml
index aad8249b..0ff0eefb 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerListFiltersView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerListFiltersView.xaml
@@ -29,17 +29,17 @@
       <StackPanel Orientation="Vertical">
         <DockPanel Classes="ServerFilterGroup">
           <TextBlock MinWidth="150" DockPanel.Dock="Left" Classes="SubText" Text="Language" />
-          <ItemsControl Items="{Binding FiltersLanguage}"
+          <ItemsControl ItemsSource="{Binding FiltersLanguage}"
                         ItemsPanel="{StaticResource PanelTemplate}" ItemTemplate="{StaticResource FilterTemplate}"/>
         </DockPanel>
         <DockPanel Classes="ServerFilterGroup">
           <TextBlock MinWidth="150" DockPanel.Dock="Left" Classes="SubText" Text="Region" />
-          <ItemsControl Items="{Binding FiltersRegion}"
+          <ItemsControl ItemsSource="{Binding FiltersRegion}"
                         ItemsPanel="{StaticResource PanelTemplate}" ItemTemplate="{StaticResource FilterTemplate}"/>
         </DockPanel>
         <DockPanel Classes="ServerFilterGroup">
           <TextBlock MinWidth="150" DockPanel.Dock="Left" Classes="SubText" Text="Role-play level" />
-          <ItemsControl Items="{Binding FiltersRolePlay}"
+          <ItemsControl ItemsSource="{Binding FiltersRolePlay}"
                         ItemsPanel="{StaticResource PanelTemplate}" ItemTemplate="{StaticResource FilterTemplate}"/>
         </DockPanel>
         <DockPanel Classes="ServerFilterGroup">
@@ -53,13 +53,13 @@
         </DockPanel>
         <DockPanel Classes="ServerFilterGroup">
           <TextBlock MinWidth="150" DockPanel.Dock="Left" VerticalAlignment="Center" Classes="SubText" Text="18+" />
-          <ItemsControl Items="{Binding FiltersEighteenPlus}"
+          <ItemsControl ItemsSource="{Binding FiltersEighteenPlus}"
                         ItemsPanel="{StaticResource PanelTemplate}" ItemTemplate="{StaticResource FilterTemplate}"/>
         </DockPanel>
 
         <DockPanel Classes="ServerFilterGroup">
           <TextBlock MinWidth="150" DockPanel.Dock="Left" Classes="SubText" Text="Hub" />
-          <ItemsControl Items="{Binding FiltersHub}"
+          <ItemsControl ItemsSource="{Binding FiltersHub}"
                         ItemsPanel="{StaticResource PanelTemplate}" ItemTemplate="{StaticResource WideFilterTemplate}">
           </ItemsControl>
         </DockPanel>
diff --git a/SS14.Launcher/Views/MainWindowTabs/ServerListTabView.xaml b/SS14.Launcher/Views/MainWindowTabs/ServerListTabView.xaml
index 60aea7f3..2884e9b4 100644
--- a/SS14.Launcher/Views/MainWindowTabs/ServerListTabView.xaml
+++ b/SS14.Launcher/Views/MainWindowTabs/ServerListTabView.xaml
@@ -50,7 +50,7 @@
           </Panel.Background>
           <ScrollViewer MinHeight="150" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Visible">
             <Grid RowDefinitions="Auto,Auto,Auto">
-              <ItemsControl Grid.Row="0" Items="{Binding SearchedServers}" Classes="ServerList" />
+              <ItemsControl Grid.Row="0" ItemsSource="{Binding SearchedServers}" Classes="ServerList" />
               <TextBlock Grid.Row="1" IsVisible="{Binding ListTextVisible}" TextAlignment="Center" VerticalAlignment="Center"
                          Text="{Binding ListText}" />
               <views:DungSpinner Grid.Row="2" IsVisible="{Binding SpinnerVisible}" HorizontalAlignment="Center" />