DamianSuess · DamianSuess · Nov 24, 2023 · Nov 24, 2023 · Nov 24, 2023 · May 15, 2025
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup>
+    <!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Avalonia" Version="11.2.8" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.2.8" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.8" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.8" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.2.8" />
+    <PackageVersion Include="Prism.Avalonia" Version="9.0.537.11130" />
+    <PackageVersion Include="Prism.DryIoc.Avalonia" Version="9.0.537.11130" />
+    <PackageVersion Include="Prism.Core" Version="9.0.537" />
+  </ItemGroup>
+</Project>
diff --git a/Outlookish.sln b/Outlookish.sln
@@ -21,10 +21,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		CodeMaid.config = CodeMaid.config
+		Directory.Packages.props = Directory.Packages.props
 		readme.md = readme.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp.Services", "SampleApp.Services\SampleApp.Services.csproj", "{1AFDDD2F-2AF5-4BF3-AE04-89A23B2991D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleApp.Services", "SampleApp.Services\SampleApp.Services.csproj", "{1AFDDD2F-2AF5-4BF3-AE04-89A23B2991D3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/SampleApp.Services/SampleApp.Services.csproj b/SampleApp.Services/SampleApp.Services.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/readme.md b/readme.md
@@ -220,15 +220,19 @@ where T : AppBuilderBase<T>, new()
 }
 ```
 
-The same way the avalonia framework gives us the possibility to use specific UI mechanism based on the detected platform.
+The same way the Avalonia framework allows us to use specific UI mechanisms based on the detected platform.
 
-## Future Considerations
+## Upcoming Releases
+
+* Upgrade to Avalonia v11.1 with Prism v9.0-pre
+
+### Future Considerations
 
 * Demonstrate page navigation with parameters - _use a `MockEmails` class to pass in EmailId and `OnNavigatedTo()` get email from `MailService`_
   * Include successful navigation
   * Include failed navigation (i.e. invalid EmailId)
   * Use Prism's 'Navigation Journaling
-* Populate footer using Prism Events
+* Populate the footer using Prism Events
 * Add icon glyphs via Styles
 * Sidebar Panel - Simple sidebar with stages
 * Flyout menu -  Alternative sidebar using Grids
diff --git a/source/SampleApp.Common/SampleApp.Common.csproj b/source/SampleApp.Common/SampleApp.Common.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <BaseOutputPath>..\..\output</BaseOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.21" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.21" />
-    <PackageReference Include="Prism.Avalonia" Version="8.1.97.1021" />
-    <PackageReference Include="Prism.DryIoc.Avalonia" Version="8.1.97.1021" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.ReactiveUI" />
+    <PackageReference Include="Prism.Avalonia" />
+    <PackageReference Include="Prism.DryIoc.Avalonia" />
   </ItemGroup>
 
 </Project>
diff --git a/source/SampleApp.Common/TabControlAdapter.cs b/source/SampleApp.Common/TabControlAdapter.cs
@@ -2,7 +2,7 @@
 using System.Collections.Specialized;
 using System.Linq;
 using Avalonia.Controls;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace SampleApp.Common;
 
@@ -57,23 +57,26 @@ protected override void Adapt(IRegion region, TabControl regionTarget)
       {
         foreach (UserControl item in e.NewItems)
         {
-          var items = regionTarget.Items.Cast<TabItem>().ToList();
-          items.Add(new TabItem { Header = item.Tag, Content = item });
-          regionTarget.Items = items;           // Avalonia v0.10.x
-          //// regionTarget.Items.Set(items);   // Avalonia v11
+          //var items = regionTarget.Items.Cast<TabItem>().ToList();
+          // items.Add(new TabItem { Header = item.Tag, Content = item });
+          //  regionTarget.Items = items;           // Avalonia v0.10.x
+          regionTarget.Items.Add(new TabItem { Header = item.Tag, Content = item });
+
+          //regionTarget.ItemsSource = items;     // Avalonia v11.0
         }
       }
       else if (e.Action == NotifyCollectionChangedAction.Remove)
       {
         foreach (UserControl item in e.OldItems)
         {
           var tabToDelete = regionTarget.Items.OfType<TabItem>().FirstOrDefault(n => n.Content == item);
-          // regionTarget.Items.Remove(tabToDelete);  // WPF
 
-          var items = regionTarget.Items.Cast<TabItem>().ToList();
-          items.Remove(tabToDelete);
-          regionTarget.Items = items;
-          //// regionTarget.Items.Set(items);   // Avalonia v11
+          regionTarget.Items.Remove(tabToDelete);
+          // regionTarget.Items.Remove(tabToDelete);  // WPF
+          //var items = regionTarget.Items.Cast<TabItem>().ToList();
+          // items.Remove(tabToDelete);
+          // regionTarget.Items = items;    // Avalonia v0.10
+          //regionTarget.ItemsSource = items;    // Avalonia v11
         }
       }
     };

diff --git a/source/SampleApp.Common/ViewModelBase.cs b/source/SampleApp.Common/ViewModelBase.cs
@@ -1,5 +1,5 @@
 using Prism.Mvvm;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 
 namespace SampleApp.Common
 {

diff --git a/source/SampleApp.Main/App.axaml b/source/SampleApp.Main/App.axaml
@@ -1,11 +1,11 @@
-<prism:PrismApplication xmlns="https://github.com/avaloniaui"
-                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                        xmlns:local="using:SampleApp"
-                        xmlns:prism="http://prismlibrary.com/"
-                        x:Class="SampleApp.App">
+<Application xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:SampleApp"
+             x:Class="SampleApp.App"
+             RequestedThemeVariant="Default">
 
-  <prism:PrismApplication.Styles>
-    <FluentTheme Mode="Light" />
-    <!--<FluentTheme Mode="Dark" />-->
-  </prism:PrismApplication.Styles>
-</prism:PrismApplication>
+  <Application.Styles>
+      <!--<FluentTheme Mode="Dark" />-->
+    <FluentTheme />
+  </Application.Styles>
+</Application>
diff --git a/source/SampleApp.Main/App.axaml.cs b/source/SampleApp.Main/App.axaml.cs
@@ -1,9 +1,9 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using Prism.Ioc;
 using Prism.Modularity;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using Prism.DryIoc;
 using SampleApp.Common;
 using SampleApp.Main.Core.RegionAdapters;
@@ -45,7 +45,7 @@ protected override void ConfigureRegionAdapterMappings(RegionAdapterMappings reg
     regionAdapterMappings.RegisterMapping(typeof(TabControl), Container.Resolve<TabControlAdapter>());
   }
 
-  protected override IAvaloniaObject CreateShell()
+  protected override AvaloniaObject CreateShell()
   {
     return this.Container.Resolve<MainWindow>();
   }
@@ -75,4 +75,4 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
     containerRegistry.RegisterForNavigation<DashboardView, DashboardViewModel>();
     containerRegistry.RegisterForNavigation<SettingsView, SettingsViewModel>();
   }
-}
+}
diff --git a/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs b/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs
@@ -1,5 +1,5 @@
-using Avalonia.Controls;
-using Prism.Regions;
+using Avalonia.Controls;
+using Prism.Navigation.Regions;
 
 namespace SampleApp.Main.Core.RegionAdapters
 {
@@ -16,14 +16,15 @@ protected override void Adapt(IRegion region, Grid regionTarget)
       {
         if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)
         {
-          foreach (IControl item in e.NewItems)
+          foreach (Control item in e.NewItems)
           {
             regionTarget.Children.Add(item);
           }
         }
+
         if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove)
         {
-          foreach (IControl item in e.OldItems)
+          foreach (Control item in e.OldItems)
           {
             regionTarget.Children.Remove(item);
           }
@@ -33,4 +34,4 @@ protected override void Adapt(IRegion region, Grid regionTarget)
 
     protected override IRegion CreateRegion() => new SingleActiveRegion() { };
   }
-}
+}
diff --git a/source/SampleApp.Main/Core/RegionAdapters/StackPanelRegionAdapter.cs b/source/SampleApp.Main/Core/RegionAdapters/StackPanelRegionAdapter.cs
@@ -1,5 +1,5 @@
-using Avalonia.Controls;
-using Prism.Regions;
+using Avalonia.Controls;
+using Prism.Navigation.Regions;
 
 namespace SampleApp.Main.Core.RegionAdapters
 {
@@ -16,7 +16,7 @@ protected override void Adapt(IRegion region, StackPanel regionTarget)
       {
         if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add)
         {
-          foreach (IControl item in e.NewItems)
+          foreach (Control item in e.NewItems)
           {
             if (e.NewItems != null)
               regionTarget.Children.Add(item);
@@ -25,7 +25,7 @@ protected override void Adapt(IRegion region, StackPanel regionTarget)
 
         if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove)
         {
-          foreach (IControl item in e.OldItems)
+          foreach (Control item in e.OldItems)
           {
             if (e.OldItems != null)
               regionTarget.Children.Remove(item);
@@ -36,4 +36,4 @@ protected override void Adapt(IRegion region, StackPanel regionTarget)
 
     protected override IRegion CreateRegion() => new SingleActiveRegion() { };
   }
-}
+}
diff --git a/source/SampleApp.Main/Modules/SampleFooter/SampleFooterModule.cs b/source/SampleApp.Main/Modules/SampleFooter/SampleFooterModule.cs
@@ -1,6 +1,6 @@
 using Prism.Ioc;
 using Prism.Modularity;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SampleApp.Common;
 using SampleApp.Modules.SampleFooter.ViewModels;
 using SampleApp.Modules.SampleFooter.Views;

diff --git a/source/SampleApp.Main/Program.cs b/source/SampleApp.Main/Program.cs
@@ -13,10 +13,6 @@ public static AppBuilder BuildAvaloniaApp() => AppBuilder
         EnableMultiTouch = false,
         UseDBusMenu = true
       })
-      .With(new Win32PlatformOptions {
-        EnableMultitouch = true,
-        AllowEglInitialization = true
-      })
       .UseSkia()
       .UseReactiveUI()
       .LogToTrace();

diff --git a/source/SampleApp.Main/SampleApp.csproj b/source/SampleApp.Main/SampleApp.csproj
@@ -1,20 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.21" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.21" />
-    <PackageReference Include="Prism.Avalonia" Version="8.1.97.1021" />
-    <PackageReference Include="Prism.Core" Version="8.1.97" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Diagnostics" />
+    <PackageReference Include="Avalonia.ReactiveUI" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Prism.Avalonia" />
+    <PackageReference Include="Prism.Core" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SampleApp.Common\SampleApp.Common.csproj" />

diff --git a/source/SampleApp.Main/ViewModels/DashboardViewModel.cs b/source/SampleApp.Main/ViewModels/DashboardViewModel.cs
@@ -1,6 +1,6 @@
 using Prism.Commands;
-using Prism.Regions;
-using Prism.Services.Dialogs;
+using Prism.Dialogs;
+using Prism.Navigation.Regions;
 using SampleApp.Common;
 using SampleApp.Services;
 using SampleApp.Views;

diff --git a/source/SampleApp.Main/ViewModels/MainWindowViewModel.cs b/source/SampleApp.Main/ViewModels/MainWindowViewModel.cs
@@ -2,7 +2,8 @@
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Prism.Commands;
-using Prism.Services.Dialogs;
+//using Prism.Services.Dialogs;
+using Prism.Dialogs;
 using SampleApp.Common;
 using SampleApp.Views;
 using MenuItem = SampleApp.Main.Models.MenuItem;

diff --git a/source/SampleApp.Main/ViewModels/MessageBoxViewModel.cs b/source/SampleApp.Main/ViewModels/MessageBoxViewModel.cs
@@ -1,7 +1,7 @@
 using System;
 using Prism.Commands;
 using Prism.Mvvm;
-using Prism.Services.Dialogs;
+using Prism.Dialogs;
 
 namespace SampleApp.ViewModels;
 
@@ -20,7 +20,7 @@ public MessageBoxViewModel()
     MaxWidth = 600;
   }
 
-  public event Action<IDialogResult>? RequestClose;
+  public DialogCloseListener RequestClose { get; }
 
   public DelegateCommand<string> CmdResult => new((string buttonResult) =>
   {
@@ -69,6 +69,6 @@ public void OnDialogOpened(IDialogParameters parameters)
 
   public virtual void RaiseRequestClose(IDialogResult dialogResult)
   {
-    RequestClose?.Invoke(dialogResult);
+    RequestClose.Invoke(dialogResult);
   }
 }
diff --git a/source/SampleApp.Main/ViewModels/SettingsViewModel.cs b/source/SampleApp.Main/ViewModels/SettingsViewModel.cs
@@ -1,4 +1,4 @@
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SampleApp.Common;
 
 namespace SampleApp.ViewModels;

diff --git a/source/SampleApp.Modules.Calendar/CalendarModule.cs b/source/SampleApp.Modules.Calendar/CalendarModule.cs
@@ -1,6 +1,6 @@
-using Prism.Ioc;
+using Prism.Ioc;
 using Prism.Modularity;
-using Prism.Regions;
+using Prism.Navigation.Regions;
 using SampleApp.Common;
 using SampleApp.Modules.Calendar.Views;
 
@@ -18,4 +18,4 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
     {
     }
   }
-}
+}
diff --git a/source/SampleApp.Modules.Calendar/SampleApp.Modules.Calendar.csproj b/source/SampleApp.Modules.Calendar/SampleApp.Modules.Calendar.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>library</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BaseOutputPath>..\..\output</BaseOutputPath>
   </PropertyGroup>
@@ -15,11 +15,11 @@
     <None Remove="Models\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.21" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.21" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.21" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.21" />
-    <PackageReference Include="Prism.Avalonia" Version="8.1.97.1021" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Diagnostics" />
+    <PackageReference Include="Avalonia.ReactiveUI" />
+    <PackageReference Include="Prism.Avalonia" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SampleApp.Common\SampleApp.Common.csproj" />