Update to Avalonia 11

LosManos · LosManos · commit 188326914c4b · 2023-09-21T19:29:10.000+02:00
This commit contains, what I hope is, the bare necessities for updating to Avalonia 11 without changing any functionality. This commit is the result of an experienced developer solving a problem in a new framework. This commit solves telstrapurple#91.
diff --git a/PurpleExplorer/App.axaml b/PurpleExplorer/App.axaml
@@ -3,16 +3,16 @@
              xmlns:local="clr-namespace:PurpleExplorer"
              xmlns:vm="clr-namespace:PurpleExplorer.ViewModels;assembly=PurpleExplorer"
              x:Class="PurpleExplorer.App"
+             RequestedThemeVariant="Default"
              Name="Purple Explorer">
     <Application.DataTemplates>
         <local:ViewLocator />
     </Application.DataTemplates>
 
     <Application.Styles>
-        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml" />
-        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml" />
-        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Default.xaml"/>
         <StyleInclude Source="/Styles/CommonStyles.xaml" />
+        <SimpleTheme/>
+        <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Simple.xaml"/>
     </Application.Styles>
 
     <Design.DataContext>
diff --git a/PurpleExplorer/App.axaml.cs b/PurpleExplorer/App.axaml.cs
@@ -31,7 +31,7 @@ public override void OnFrameworkInitializationCompleted()
         RxApp.SuspensionHost.CreateNewAppState = () => new AppState();
         RxApp.SuspensionHost.SetupDefaultSuspendResume(new NewtonsoftJsonSuspensionDriver(appStatePath));
         suspension.OnFrameworkInitializationCompleted();
-        var state = RxApp.SuspensionHost.GetAppState<AppState>();
+        var state = RxApp.SuspensionHost.GetAppState<AppState>() ?? new AppState();
 
         Locator.CurrentMutable.RegisterLazySingleton(() => state, typeof(IAppState));
         Locator.CurrentMutable.RegisterLazySingleton(() => new LoggingService(), typeof(ILoggingService));
diff --git a/PurpleExplorer/Helpers/MessageBoxHelper.cs b/PurpleExplorer/Helpers/MessageBoxHelper.cs
@@ -1,7 +1,7 @@
 ﻿using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using MessageBox.Avalonia.DTO;
-using MessageBox.Avalonia.Enums;
+using MsBox.Avalonia.Dto;
+using MsBox.Avalonia.Enums;
 using System.Threading.Tasks;
 
 namespace PurpleExplorer.Helpers;
@@ -27,7 +27,7 @@ public static async Task<ButtonResult> ShowMessage(string title, string message)
 
     private static async Task<ButtonResult> ShowMessageBox(ButtonEnum buttons, Icon icon, string title, string message)
     {
-        var msBoxStandardWindow = MessageBox.Avalonia.MessageBoxManager.GetMessageBoxStandardWindow(new MessageBoxStandardParams
+        var msBoxStandardWindow = MsBox.Avalonia.MessageBoxManager.GetMessageBoxStandard(new MessageBoxStandardParams
         {
             ButtonDefinitions = buttons,
             ContentTitle = title,
@@ -37,8 +37,6 @@ private static async Task<ButtonResult> ShowMessageBox(ButtonEnum buttons, Icon
             CanResize = true,
             WindowStartupLocation = Avalonia.Controls.WindowStartupLocation.CenterOwner
         });
-
-        return await msBoxStandardWindow.ShowDialog((Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime)
-            .Windows[0]);
+        return await msBoxStandardWindow.ShowAsync();
     }
 }
diff --git a/PurpleExplorer/Helpers/TopicHelper.cs b/PurpleExplorer/Helpers/TopicHelper.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AvaloniaEdit.Utils;
 using Message = PurpleExplorer.Models.Message;
 using AzureMessage = Microsoft.Azure.ServiceBus.Message;
 
diff --git a/PurpleExplorer/Program.cs b/PurpleExplorer/Program.cs
@@ -15,10 +15,13 @@ public static void Main(string[] args) => BuildAvaloniaApp()
 
     // Avalonia configuration, don't remove; also used by visual designer.
     public static AppBuilder BuildAvaloniaApp()
-        => AppBuilder.Configure<App>()
+    {
+        IconProvider.Current
+            .Register<FontAwesomeIconProvider>();
+        
+        return AppBuilder.Configure<App>()
             .UsePlatformDetect()
             .LogToTrace()
-            .UseReactiveUI()
-            .WithIcons(container => container
-                .Register<FontAwesomeIconProvider>());
-}
+            .UseReactiveUI();
+    }
+}
diff --git a/PurpleExplorer/PurpleExplorer.csproj b/PurpleExplorer/PurpleExplorer.csproj
@@ -18,16 +18,17 @@
         <AvaloniaResource Include="Assets\**" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="0.10.18" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
-        <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+        <PackageReference Include="Avalonia" Version="11.0.4" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.4" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.18" />
-        <PackageReference Include="MessageBox.Avalonia" Version="2.1.0" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.4" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.4" />
+        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.4" />
+        <PackageReference Include="MessageBox.Avalonia" Version="3.1.4" />
         <PackageReference Include="Microsoft.Azure.ServiceBus" Version="5.2.0" />
-        <PackageReference Include="Projektanker.Icons.Avalonia" Version="5.6.0" />
-        <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="5.6.0" />
+        <PackageReference Include="Projektanker.Icons.Avalonia" Version="8.2.0" />
+        <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="8.2.0" />
     </ItemGroup>
     <ItemGroup>
       <None Update="appstate.json">
diff --git a/PurpleExplorer/ViewLocator.cs b/PurpleExplorer/ViewLocator.cs
@@ -12,7 +12,7 @@ public class ViewLocator : IDataTemplate
 {
     public bool SupportsRecycling => false;
 
-    public IControl Build(object data)
+    public Control Build(object data)
     {
         var name = data.GetType().FullName.Replace("ViewModel", "View");
         var type = Type.GetType(name);
diff --git a/PurpleExplorer/ViewModels/MainWindowViewModel.cs b/PurpleExplorer/ViewModels/MainWindowViewModel.cs
@@ -8,7 +8,7 @@
 using PurpleExplorer.Views;
 using ReactiveUI;
 using System.Threading.Tasks;
-using MessageBox.Avalonia.Enums;
+using MsBox.Avalonia.Enums;
 using Microsoft.Azure.ServiceBus;
 using PurpleExplorer.Services;
 using Splat;
diff --git a/PurpleExplorer/ViewModels/MessageDetailsWindowViewModel.cs b/PurpleExplorer/ViewModels/MessageDetailsWindowViewModel.cs
@@ -1,6 +1,6 @@
 ﻿using System.Threading.Tasks;
 using Avalonia.Controls;
-using MessageBox.Avalonia.Enums;
+using MsBox.Avalonia.Enums;
 using PurpleExplorer.Helpers;
 using PurpleExplorer.Models;
 using PurpleExplorer.Services;
diff --git a/PurpleExplorer/Views/AddMessageWindow.xaml b/PurpleExplorer/Views/AddMessageWindow.xaml
@@ -47,7 +47,7 @@
                      TextWrapping="Wrap" Text="{Binding Path=Title, Mode=TwoWay}" Watermark="Save message with title:" />
         </StackPanel>
         
-        <DataGrid Grid.Row="2" Name="dgSavedMessages" Items="{Binding Path=SavedMessages, Mode=TwoWay}"
+        <DataGrid Grid.Row="2" Name="dgSavedMessages" ItemsSource="{Binding Path=SavedMessages, Mode=TwoWay}"
                   SelectionChanged="messageSelectionChanged"
                   IsReadOnly="True">
             <DataGrid.Columns>
diff --git a/PurpleExplorer/Views/ConnectionStringWindow.xaml b/PurpleExplorer/Views/ConnectionStringWindow.xaml
@@ -45,7 +45,7 @@
         </DockPanel>
 
         <ListBox Grid.Row="4" Name="lsbSavedConnectionString" Margin="5,0,5,0"
-                 Items="{Binding Path=SavedConnectionStrings, Mode=TwoWay}"
+                 ItemsSource="{Binding Path=SavedConnectionStrings, Mode=TwoWay}"
                  Width="600" Height="300" VerticalAlignment="Top"
                  SelectionChanged="lsbConnectionStringSelectionChanged" HorizontalAlignment="Left">
 
diff --git a/PurpleExplorer/Views/MainWindow.xaml b/PurpleExplorer/Views/MainWindow.xaml
@@ -84,7 +84,7 @@
         <DockPanel Grid.Column="0" Grid.Row="1" Dock="Left">
             <TabControl Width="300">
                 <TabItem Header="{Binding TopicTabHeader}">
-                    <TreeView SelectionChanged="TreeView_SelectionChanged" Items="{Binding ConnectedServiceBuses}" Name="tvTopics">
+                    <TreeView SelectionChanged="TreeView_SelectionChanged" ItemsSource="{Binding ConnectedServiceBuses}" Name="tvTopics">
                         <TreeView.DataTemplates>
                             <TreeDataTemplate DataType="models:ServiceBusResource" ItemsSource="{Binding Topics}">
                                 <StackPanel Orientation="Horizontal">
@@ -122,7 +122,7 @@
                     </TreeView>
                 </TabItem>
                 <TabItem Header="{Binding QueueTabHeader}">
-                    <TreeView SelectionChanged="TreeView_SelectionChanged" Items="{Binding ConnectedServiceBuses}" Name="tvQueues">
+                    <TreeView SelectionChanged="TreeView_SelectionChanged" ItemsSource="{Binding ConnectedServiceBuses}" Name="tvQueues">
                         <TreeView.DataTemplates>
                             <TreeDataTemplate DataType="models:ServiceBusResource" ItemsSource="{Binding Queues}">
                                 <StackPanel Orientation="Horizontal">
@@ -157,7 +157,7 @@
 
             <TabControl>
                 <TabItem Header="{Binding MessagesTabHeader}" VerticalContentAlignment="Center">
-                    <DataGrid Items="{Binding Messages}" Tapped="MessagesGrid_Tapped"
+                    <DataGrid ItemsSource="{Binding Messages}" Tapped="MessagesGrid_Tapped"
                               DoubleTapped="MessagesGrid_DoubleTapped"
                               IsReadOnly="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
                             <DataGrid.Columns>
@@ -172,7 +172,7 @@
                         </DataGrid>
                     </TabItem>
                     <TabItem Header="{Binding DlqTabHeader}" VerticalContentAlignment="Center">
-                        <DataGrid Items="{Binding DlqMessages}" Tapped="MessagesGrid_Tapped"
+                        <DataGrid ItemsSource="{Binding DlqMessages}" Tapped="MessagesGrid_Tapped"
                               DoubleTapped="MessagesGrid_DoubleTapped" IsReadOnly="True">
                             <DataGrid.Columns>
                                 <DataGridTextColumn Header="Sequence Number" Binding="{Binding SequenceNumber}" />
diff --git a/PurpleExplorer/Views/MainWindow.xaml.cs b/PurpleExplorer/Views/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Xaml;
 using PurpleExplorer.Helpers;
@@ -23,7 +24,7 @@ private void InitializeComponent()
         AvaloniaXamlLoader.Load(this);
     }
 
-    private async void MessagesGrid_DoubleTapped(object sender, RoutedEventArgs e)
+    private async void MessagesGrid_DoubleTapped(object sender, TappedEventArgs e)
     {
         var grid = sender as DataGrid;
         var mainWindowViewModel = DataContext as MainWindowViewModel;
@@ -44,7 +45,7 @@ private async void MessagesGrid_DoubleTapped(object sender, RoutedEventArgs e)
         await ModalWindowHelper.ShowModalWindow<MessageDetailsWindow, MessageDetailsWindowViewModel>(viewModal);
     }
 
-    private void MessagesGrid_Tapped(object sender, RoutedEventArgs e)
+    public void MessagesGrid_Tapped(object sender, TappedEventArgs e)
     {
         var grid = sender as DataGrid;
         var mainWindowViewModel = DataContext as MainWindowViewModel;
diff --git a/PurpleExplorer/Views/MessageDetailsWindow.xaml b/PurpleExplorer/Views/MessageDetailsWindow.xaml
@@ -2,6 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:i="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
         mc:Ignorable="d" d:DesignWidth="780" d:DesignHeight="630"
         x:Class="PurpleExplorer.Views.MessageDetailsWindow"
         xmlns:vm="clr-namespace:PurpleExplorer.ViewModels;assembly=PurpleExplorer"
@@ -46,23 +47,23 @@
                         Command="{Binding DeleteMessage}"
                         CommandParameter="{Binding $parent[Window]}">
                     <StackPanel Orientation="Horizontal">
-                        <DrawingPresenter Drawing="{DynamicResource Material.Delete}" />
+                        <i:Icon Value="fa-trash" />
                         <TextBlock VerticalAlignment="Center">Delete message</TextBlock>
                     </StackPanel>
                 </Button>
                 <Button Command="{Binding DeadletterMessage}"
                         IsVisible="{Binding !Message.IsDlq}"
                         Classes="topButton">
                     <StackPanel Orientation="Horizontal">
-                        <DrawingPresenter Drawing="{DynamicResource Material.EmailSend}" />
+                        <i:Icon Value="fa-envelope" />
                         <TextBlock VerticalAlignment="Center">Send to dead-letter</TextBlock>
                     </StackPanel>
                 </Button>
                 <Button Name="ResendButton" Command="{Binding ResubmitMessage}"
                         IsVisible="{Binding !!Message.IsDlq}"
                         Classes="topButton">
                     <StackPanel Orientation="Horizontal">
-                        <DrawingPresenter Drawing="{DynamicResource Material.EmailSend}" />
+                        <i:Icon Value="fa-envelope" />
                         <TextBlock VerticalAlignment="Center">Resubmit back to topic</TextBlock>
                     </StackPanel>
                 </Button>

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class ViewLocator : IDataTemplate`
`12`	`12`	`{`
`13`	`13`	`public bool SupportsRecycling => false;`
`14`	`14`
`15`		`- public IControl Build(object data)`
	`15`	`+ public Control Build(object data)`
`16`	`16`	`{`
`17`	`17`	`var name = data.GetType().FullName.Replace("ViewModel", "View");`
`18`	`18`	`var type = Type.GetType(name);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Avalonia;`
`2`	`2`	`using Avalonia.Controls;`
	`3`	`+using Avalonia.Input;`
`3`	`4`	`using Avalonia.Interactivity;`
`4`	`5`	`using Avalonia.Markup.Xaml;`
`5`	`6`	`using PurpleExplorer.Helpers;`
`@@ -23,7 +24,7 @@ private void InitializeComponent()`
`23`	`24`	`AvaloniaXamlLoader.Load(this);`
`24`	`25`	`}`
`25`	`26`
`26`		`- private async void MessagesGrid_DoubleTapped(object sender, RoutedEventArgs e)`
	`27`	`+ private async void MessagesGrid_DoubleTapped(object sender, TappedEventArgs e)`
`27`	`28`	`{`
`28`	`29`	`var grid = sender as DataGrid;`
`29`	`30`	`var mainWindowViewModel = DataContext as MainWindowViewModel;`
`@@ -44,7 +45,7 @@ private async void MessagesGrid_DoubleTapped(object sender, RoutedEventArgs e)`
`44`	`45`	`await ModalWindowHelper.ShowModalWindow<MessageDetailsWindow, MessageDetailsWindowViewModel>(viewModal);`
`45`	`46`	`}`
`46`	`47`
`47`		`- private void MessagesGrid_Tapped(object sender, RoutedEventArgs e)`
	`48`	`+ public void MessagesGrid_Tapped(object sender, TappedEventArgs e)`
`48`	`49`	`{`
`49`	`50`	`var grid = sender as DataGrid;`
`50`	`51`	`var mainWindowViewModel = DataContext as MainWindowViewModel;`