.net 8 patterns winui

christiannagel · christiannagel · commit e0035d0af014 · 2025-02-09T10:08:42.000+01:00
diff --git a/4_Apps/Patterns/BooksApp/BooksApp/BooksApp.csproj b/4_Apps/Patterns/BooksApp/BooksApp/BooksApp.csproj
@@ -1,15 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>BooksApp</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x86;x64;arm64</Platforms>
-    <RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
-    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnableMsixTooling>true</EnableMsixTooling>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
@@ -30,9 +30,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.5" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/4_Apps/Patterns/BooksApp/BooksApp/MainWindow.xaml.cs b/4_Apps/Patterns/BooksApp/BooksApp/MainWindow.xaml.cs
@@ -4,8 +4,8 @@ public sealed partial class MainWindow : Window
 {
     public MainWindow()
     {
-        this.InitializeComponent();
-        this.SizeChanged += OnSizeChanged;
+        InitializeComponent();
+        SizeChanged += OnSizeChanged;
         ViewModel = Ioc.Default.GetRequiredService<MainWindowViewModel>();
         ViewModel.SetNavigationFrame(MainFrame);
     }
diff --git a/4_Apps/Patterns/BooksApp/BooksApp/Views/BookDetailUserControl.xaml.cs b/4_Apps/Patterns/BooksApp/BooksApp/Views/BookDetailUserControl.xaml.cs
@@ -4,7 +4,7 @@ public sealed partial class BookDetailUserControl : UserControl
 {
     public BookDetailUserControl()
     {
-        this.InitializeComponent();
+        InitializeComponent();
     }
 
     public BookDetailViewModel ViewModel
diff --git a/4_Apps/Patterns/BooksApp/BooksApp/Views/BookItemUserControl.xaml.cs b/4_Apps/Patterns/BooksApp/BooksApp/Views/BookItemUserControl.xaml.cs
@@ -1,8 +1,4 @@
-﻿using BooksLib.ViewModels;
-
-using Microsoft.UI.Input;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
+﻿using Microsoft.UI.Input;
 using Microsoft.UI.Xaml.Input;
 
 // To learn more about WinUI, the WinUI project structure,
@@ -14,7 +10,7 @@ public sealed partial class BookItemUserControl : UserControl
 {
     public BookItemUserControl()
     {
-        this.InitializeComponent();
+        InitializeComponent();
     }
 
     public BookItemViewModel BookItemViewModel
diff --git a/4_Apps/Patterns/BooksLib/BooksLib.csproj b/4_Apps/Patterns/BooksLib/BooksLib.csproj
@@ -1,14 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/4_Apps/Patterns/BooksLib/Models/Book.cs b/4_Apps/Patterns/BooksLib/Models/Book.cs
@@ -2,23 +2,18 @@
 
 namespace BooksLib.Models;
 
-public class Book : ObservableObject
+public class Book(string? title = null, string? publisher = null, int id = 0) : 
+    ObservableObject
 {
-    public Book(string? title = null, string? publisher = null, int id = 0)
-    {
-        BookId = id;
-        _title = title ?? string.Empty;
-        _publisher = publisher ?? string.Empty;
-    }
-    public int BookId { get; set; }
-    private string _title;
+    public int BookId { get; set; } = id;
+    private string _title = title ?? string.Empty;
 
     public string Title
     {
         get => _title;
         set => SetProperty(ref _title, value);
     }
-    private string _publisher;
+    private string _publisher = publisher ?? string.Empty;
     public string Publisher
     {
         get => _publisher;
diff --git a/4_Apps/Patterns/GenericViewModels/GenericViewModels.csproj b/4_Apps/Patterns/GenericViewModels/GenericViewModels.csproj
@@ -1,13 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/4_Apps/Patterns/GenericViewModels/ViewModels/ItemViewModel.cs b/4_Apps/Patterns/GenericViewModels/ViewModels/ItemViewModel.cs
@@ -1,9 +1,8 @@
 ﻿namespace GenericViewModels.ViewModels;
 
-public abstract class ItemViewModel<T> : ViewModelBase, IItemViewModel<T>
+public abstract class ItemViewModel<T>(T? item) : ViewModelBase, IItemViewModel<T>
 {
-    public ItemViewModel(T? item) => _item = item;
-    private T? _item;
+    private T? _item = item;
     public virtual T? Item
     {
         get => _item;

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ public sealed partial class MainWindow : Window`
`4`	`4`	`{`
`5`	`5`	`public MainWindow()`
`6`	`6`	`{`
`7`		`- this.InitializeComponent();`
`8`		`- this.SizeChanged += OnSizeChanged;`
	`7`	`+ InitializeComponent();`
	`8`	`+ SizeChanged += OnSizeChanged;`
`9`	`9`	`ViewModel = Ioc.Default.GetRequiredService<MainWindowViewModel>();`
`10`	`10`	`ViewModel.SetNavigationFrame(MainFrame);`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public sealed partial class BookDetailUserControl : UserControl`
`4`	`4`	`{`
`5`	`5`	`public BookDetailUserControl()`
`6`	`6`	`{`
`7`		`- this.InitializeComponent();`
	`7`	`+ InitializeComponent();`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`public BookDetailViewModel ViewModel`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using BooksLib.ViewModels;`
`2`		`-`
`3`		`-using Microsoft.UI.Input;`
`4`		`-using Microsoft.UI.Xaml;`
`5`		`-using Microsoft.UI.Xaml.Controls;`
	`1`	`+using Microsoft.UI.Input;`
`6`	`2`	`using Microsoft.UI.Xaml.Input;`
`7`	`3`
`8`	`4`	`// To learn more about WinUI, the WinUI project structure,`
`@@ -14,7 +10,7 @@ public sealed partial class BookItemUserControl : UserControl`
`14`	`10`	`{`
`15`	`11`	`public BookItemUserControl()`
`16`	`12`	`{`
`17`		`- this.InitializeComponent();`
	`13`	`+ InitializeComponent();`
`18`	`14`	`}`
`19`	`15`
`20`	`16`	`public BookItemViewModel BookItemViewModel`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`namespace GenericViewModels.ViewModels;`
`2`	`2`
`3`		`-public abstract class ItemViewModel<T> : ViewModelBase, IItemViewModel<T>`
	`3`	`+public abstract class ItemViewModel<T>(T? item) : ViewModelBase, IItemViewModel<T>`
`4`	`4`	`{`
`5`		`- public ItemViewModel(T? item) => _item = item;`
`6`		`- private T? _item;`
	`5`	`+ private T? _item = item;`
`7`	`6`	`public virtual T? Item`
`8`	`7`	`{`
`9`	`8`	`get => _item;`