Refactor services and update SDK version

- Updated `IDialogService` registration in `App.xaml.cs` to use a factory method with a `Window` parameter.
- Upgraded `Microsoft.WindowsAppSDK` version in `BooksApp.csproj` from `1.6.250108002` to `1.7.250310001`.
- Modified `WinUIDialogService` constructor to accept a `Window` parameter for better dialog handling.
- Refactored `MainWindowViewModel` to simplify constructor and remove unnecessary private fields.
- Streamlined `NavigationMessage` class by adopting primary constructor syntax.
- Corrected dialog message in `BookDetailViewModel` and improved error logging format.

Author: christiannagel

4_Apps/Patterns/BooksApp/BooksApp/App.xaml.cs

@@ -42,7 +42,11 @@ private void RegisterServices()
                 .AddScoped<BookDetailViewModel>()
                 .AddScoped<MainWindowViewModel>()
                 .AddSingleton<IItemsService<Book>, BooksService>()
-                .AddSingleton<IDialogService, WinUIDialogService>()
+                .AddSingleton<IDialogService>(provider =>
+                {
+                    var window = _window ?? throw new InvalidOperationException("_window not set");
+                    return new WinUIDialogService(window);
+                })
                 .AddSingleton<INavigationService, WinUINavigationService>()
                 .AddSingleton<WinUIInitializeNavigationService>()
                 .AddLogging(builder =>

4_Apps/Patterns/BooksApp/BooksApp/BooksApp.csproj

@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>

4_Apps/Patterns/BooksApp/BooksApp/Services/WinUIDialogService.cs

@@ -1,14 +1,15 @@
 namespace BooksApp.Services;
 
-public class WinUIDialogService : IDialogService
+public class WinUIDialogService(Window window) : IDialogService
 {
     public async Task ShowMessageAsync(string message)
     {
         ContentDialog dlg = new()
         {
             Title = "Message",
             Content = message,
-            PrimaryButtonText = "OK",   
+            PrimaryButtonText = "OK",
+            XamlRoot = window.Content.XamlRoot,
         };
         await dlg.ShowAsync();
     }

4_Apps/Patterns/BooksApp/BooksApp/ViewModels/MainWindowViewModel.cs

@@ -1,26 +1,18 @@
 namespace BooksApp.ViewModels;
 
-public class MainWindowViewModel : ViewModelBase
+public class MainWindowViewModel(INavigationService navigationService, WinUIInitializeNavigationService initializeNavigationService) : ViewModelBase
 {
     private readonly Dictionary<string, Type> _pages = new()
     {
         [PageNames.BooksPage] = typeof(BooksPage),
         [PageNames.BookDetailPage] = typeof(BookDetailPage)
     };
 
-    private readonly INavigationService _navigationService;
-    private readonly WinUIInitializeNavigationService _initializeNavigationService;
-    public MainWindowViewModel(INavigationService navigationService, WinUIInitializeNavigationService initializeNavigationService)
-    {
-        _navigationService = navigationService;
-        _initializeNavigationService = initializeNavigationService;
-    }
-
-    public void SetNavigationFrame(Frame frame) => _initializeNavigationService.Initialize(frame, _pages);
+    public void SetNavigationFrame(Frame frame) => initializeNavigationService.Initialize(frame, _pages);
 
     public void UseNavigation(bool navigation)
     {
-        _navigationService.UseNavigation = navigation;
+        navigationService.UseNavigation = navigation;
     }
 
     public void OnNavigationSelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
@@ -30,7 +22,7 @@ public void OnNavigationSelectionChanged(NavigationView sender, NavigationViewSe
             switch (navigationItem.Tag)
             {
                 case "books":
-                    _navigationService.NavigateToAsync(PageNames.BooksPage);
+                    navigationService.NavigateToAsync(PageNames.BooksPage);
                     break;
                 default:
                     break;

4_Apps/Patterns/BooksLib/Events/NavigationMessage.cs

@@ -6,8 +6,7 @@ public class NavigationInfo
 {
     public bool UseNavigation { get; set; }
 }
-public class NavigationMessage : ValueChangedMessage<NavigationInfo>
+public class NavigationMessage(NavigationInfo navigationInfo) : 
+    ValueChangedMessage<NavigationInfo>(navigationInfo)
 {
-    public NavigationMessage(NavigationInfo navigationInfo)
-        : base(navigationInfo) { }
 }

4_Apps/Patterns/BooksLib/ViewModels/BookDetailViewModel.cs

@@ -47,13 +47,13 @@ public override async Task OnSaveAsync()
         {
             if (EditItem is null) throw new InvalidOperationException();
 
-            await _dialogService.ShowMessageAsync("TEst save");
+            await _dialogService.ShowMessageAsync("Test save");
 
             await _itemsService.AddOrUpdateAsync(EditItem);
         }
         catch (Exception ex)
         {
-            _logger.LogError("error {0} in {1}", ex.Message, nameof(OnSaveAsync));
+            _logger.LogError("error {message} in {method}", ex.Message, nameof(OnSaveAsync));
             await _dialogService.ShowMessageAsync("Error saving the data");
         }
     }