Switch to net8

lg2de · Nov 18, 2023 · d699f38 · d699f38
1 parent 7abff10
commit d699f38
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Setup SonarScanner
       run: choco install "sonarscanner-msbuild-net46" -y
     - name: Patch version info

diff --git a/SimpleAccounting.sln b/SimpleAccounting.sln
@@ -1,20 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34309.116
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DE9ECA6D-3497-4565-A718-EBBADDDCF2DF}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
+		global.json = global.json
 		.sonarlint\lg2de_simpleaccountingcsharp.ruleset = .sonarlint\lg2de_simpleaccountingcsharp.ruleset
 		LICENSE = LICENSE
 		nuget.config = nuget.config
 		PatchVersion.ps1 = PatchVersion.ps1
 		README.md = README.md
 		SimpleAccounting.sln.DotSettings = SimpleAccounting.sln.DotSettings
-		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAccounting", "src\SimpleAccounting\SimpleAccounting.csproj", "{976604F7-86B8-407E-A9B2-592E376D7006}"
@@ -64,12 +65,12 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {62844EF8-76D5-4F6B-85A3-9E80E71E4482}
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{976604F7-86B8-407E-A9B2-592E376D7006} = {88F13815-196C-4F7F-B54A-A345656DD866}
-		{507F5D29-96C7-48C2-966C-58342D08A4A7} = {BF2618D8-BC1B-4127-8DCF-85A493C04BF8}
 		{E77B3647-FBC9-4138-A0D5-C9165EF45417} = {BF2618D8-BC1B-4127-8DCF-85A493C04BF8}
+		{507F5D29-96C7-48C2-966C-58342D08A4A7} = {BF2618D8-BC1B-4127-8DCF-85A493C04BF8}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {62844EF8-76D5-4F6B-85A3-9E80E71E4482}
 	EndGlobalSection
 EndGlobal
diff --git a/global.json b/global.json
@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.400", "rollForward": "minor"
+    "version": "8.0.100",
+    "rollForward": "minor"
   }
 }
diff --git a/src/SimpleAccounting/Presentation/MenuViewModel.cs b/src/SimpleAccounting/Presentation/MenuViewModel.cs
@@ -223,9 +223,9 @@ private void OnEditBooking(object? commandParameter)
         this.projectData.ShowEditBookingDialog(journalItem, this.projectData.ShowInactiveAccounts);
     }
 
-    private void OnDuplicateBooking(object commandParameter)
+    private void OnDuplicateBooking(object? commandParameter)
     {
-        if (!(commandParameter is IJournalItem journalItem))
+        if (commandParameter is not IJournalItem journalItem)
         {
             return;
         }

diff --git a/src/SimpleAccounting/SimpleAccounting.csproj b/src/SimpleAccounting/SimpleAccounting.csproj
@@ -5,7 +5,7 @@
     <!-- ProjectGuid is required for SonarQube -->
     <ProjectGuid>{976604F7-86B8-407E-A9B2-592E376D7006}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RootNamespace>lg2de.SimpleAccounting</RootNamespace>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>

diff --git a/tests/SimpleAccounting.IntegrationTests/SimpleAccounting.IntegrationTests.csproj b/tests/SimpleAccounting.IntegrationTests/SimpleAccounting.IntegrationTests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup Label="Globals">
     <!-- ProjectGuid is required for SonarQube -->
     <ProjectGuid>{507F5D29-96C7-48C2-966C-58342D08A4A7}</ProjectGuid>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RootNamespace>lg2de.SimpleAccounting.IntegrationTests</RootNamespace>
   </PropertyGroup>
 

diff --git a/tests/SimpleAccounting.UnitTests/SimpleAccounting.UnitTests.csproj b/tests/SimpleAccounting.UnitTests/SimpleAccounting.UnitTests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup Label="Globals">
     <!-- ProjectGuid is required for SonarQube -->
     <ProjectGuid>{E77B3647-FBC9-4138-A0D5-C9165EF45417}</ProjectGuid>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <RootNamespace>lg2de.SimpleAccounting.UnitTests</RootNamespace>
   </PropertyGroup>
 
@@ -30,10 +30,10 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <!-- TODO S1451 (add or update header) is disabled because of external code (cultured fact) --> 
+    <!-- TODO S1451 (add or update header) is disabled because of external code (cultured fact) -->
     <NoWarn>$(NoWarn);S1451</NoWarn>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\SimpleAccounting\SimpleAccounting.csproj" />
   </ItemGroup>