From f379eb52c557609236d4ed886408d8cb257b3c6d Mon Sep 17 00:00:00 2001
From: Luca Auer <lolle2000.la@gmail.com>
Date: Tue, 14 Nov 2023 19:33:44 +0100
Subject: [PATCH] Upgrade to .NET 8 (#531)

* Upgrade to .NET 8

* Update dependencies

* Update GH Actions workflow

* Enable ReadyToRun
---
 .github/workflows/master.yml                                | 2 +-
 src/ImageSort.WPF/ImageSort.WPF.csproj                      | 5 +++--
 src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj   | 6 +++---
 src/ImageSort.WindowsSetup/Product.wxs                      | 2 +-
 .../ImageSort.WindowsUpdater.csproj                         | 2 +-
 src/ImageSort/ImageSort.csproj                              | 2 +-
 tests/ImageSort.UnitTests/ImageSort.UnitTests.csproj        | 2 +-
 tests/ImageSort.WPF.UiTests/ImageSort.WPF.UiTests.csproj    | 4 ++--
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index c0d7536e..9ae74d27 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     - name: GitVersion
       uses: gittools/actions/gitversion/setup@v0.10.2
       with:
diff --git a/src/ImageSort.WPF/ImageSort.WPF.csproj b/src/ImageSort.WPF/ImageSort.WPF.csproj
index c2389535..c184267f 100644
--- a/src/ImageSort.WPF/ImageSort.WPF.csproj
+++ b/src/ImageSort.WPF/ImageSort.WPF.csproj
@@ -2,11 +2,12 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyName>Image Sort</AssemblyName>
     <Configurations>Debug;Release;MSIX</Configurations>
     <Platforms>AnyCPU;x86;x64</Platforms>
+      <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'MSIX' ">
@@ -17,7 +18,7 @@
     <PackageReference Include="AdonisUI" Version="1.17.1" />
     <PackageReference Include="AdonisUI.ClassicTheme" Version="1.17.1" />
     <PackageReference Include="LazyCache" Version="2.4.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="ReactiveUI" Version="19.5.1" />
     <PackageReference Include="ReactiveUI.Events.WPF" Version="15.1.1" />
     <PackageReference Include="ReactiveUI.WPF" Version="19.5.1" />
diff --git a/src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj b/src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj
index 4664157c..a151185d 100644
--- a/src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj
+++ b/src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj
@@ -19,8 +19,8 @@
     <Compile Include="Product.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.2" />
-    <PackageReference Include="WixToolset.Heat" Version="4.0.2" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.3" />
+    <PackageReference Include="WixToolset.Heat" Version="4.0.3" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="exclude-imagesort.exe.xslt" />
@@ -36,7 +36,7 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
       <IsDotnetSDKProject>True</IsDotnetSDKProject>
-      <TargetFrameworkIdentifier>net7.0-windows</TargetFrameworkIdentifier>
+      <TargetFrameworkIdentifier>net8.0-windows</TargetFrameworkIdentifier>
       <Runtime>win-$(Platform)</Runtime>
     </ProjectReference>
   </ItemGroup>
diff --git a/src/ImageSort.WindowsSetup/Product.wxs b/src/ImageSort.WindowsSetup/Product.wxs
index 7e8a0e9a..5039603b 100644
--- a/src/ImageSort.WindowsSetup/Product.wxs
+++ b/src/ImageSort.WindowsSetup/Product.wxs
@@ -53,7 +53,7 @@
                 <File Id="LicenseRtf" Name="License.rtf" Source="License.rtf" KeyPath="yes" />
             </Component>
             <Component Id="ImageSortExeComponent" Guid="036C3C1A-FA77-46CD-97F9-26653E110D8F">
-                <File Id="ImageSortExe" Name="Image Sort.exe" Source="..\ImageSort.WPF\bin\$(var.PlatformSpecialFolder)$(var.Configuration)\net7.0-windows\win-$(var.Platform)\publish\Image Sort.exe" KeyPath="yes">
+                <File Id="ImageSortExe" Name="Image Sort.exe" Source="..\ImageSort.WPF\bin\$(var.PlatformSpecialFolder)$(var.Configuration)\net8.0-windows\win-$(var.Platform)\publish\Image Sort.exe" KeyPath="yes">
                     <Shortcut Id="StartMenuShortcut" Directory="StartMenuFolder" Name="Image Sort" WorkingDirectory="INSTALLFOLDER" Advertise="yes" Icon="ImageSort.exe" IconIndex="0" />
                     <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="Image Sort" WorkingDirectory="INSTALLFOLDER" Advertise="yes" Icon="ImageSort.exe" IconIndex="0" />
                 </File>
diff --git a/src/ImageSort.WindowsUpdater/ImageSort.WindowsUpdater.csproj b/src/ImageSort.WindowsUpdater/ImageSort.WindowsUpdater.csproj
index ffa0e76f..022b05f3 100644
--- a/src/ImageSort.WindowsUpdater/ImageSort.WindowsUpdater.csproj
+++ b/src/ImageSort.WindowsUpdater/ImageSort.WindowsUpdater.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Configurations>Debug;Release;MSIX</Configurations>
   </PropertyGroup>
 
diff --git a/src/ImageSort/ImageSort.csproj b/src/ImageSort/ImageSort.csproj
index e63015c0..1e41854a 100644
--- a/src/ImageSort/ImageSort.csproj
+++ b/src/ImageSort/ImageSort.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Configurations>Debug;Release;MSIX</Configurations>
   </PropertyGroup>
 
diff --git a/tests/ImageSort.UnitTests/ImageSort.UnitTests.csproj b/tests/ImageSort.UnitTests/ImageSort.UnitTests.csproj
index 2329589c..c2d9a795 100644
--- a/tests/ImageSort.UnitTests/ImageSort.UnitTests.csproj
+++ b/tests/ImageSort.UnitTests/ImageSort.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
diff --git a/tests/ImageSort.WPF.UiTests/ImageSort.WPF.UiTests.csproj b/tests/ImageSort.WPF.UiTests/ImageSort.WPF.UiTests.csproj
index 2651c0e8..67ddda73 100644
--- a/tests/ImageSort.WPF.UiTests/ImageSort.WPF.UiTests.csproj
+++ b/tests/ImageSort.WPF.UiTests/ImageSort.WPF.UiTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -26,7 +26,7 @@
 
   <Target AfterTargets="AfterBuild" Name="IncludeEverythingFromWPFProject">
     <ItemGroup>
-      <_CopyItems Include="$(ProjectDir)\..\..\src\ImageSort.WPF\bin\$(Configuration)\net7.0-windows\*.*" />
+      <_CopyItems Include="$(ProjectDir)\..\..\src\ImageSort.WPF\bin\$(Configuration)\net8.0-windows\*.*" />
     </ItemGroup>
     <Copy SourceFiles="@(_CopyItems)" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
   </Target>