Bump to .NET 9

wcabus · wcabus · commit 5000a14497c4 · 2024-11-15T16:24:38.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,16 +7,16 @@ jobs:
   build:
     runs-on: windows-latest
     steps:
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.x'
+        dotnet-version: '9.x'
 
     - uses: actions/setup-java@v4
       with:
         java-version: '21.x'
         distribution: 'microsoft'
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     
     - run: |
         dotnet build src/DoomSharp.sln
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -58,9 +58,9 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - uses: actions/setup-dotnet@v3
+    - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.x'
+        dotnet-version: '9.x'
 
     - uses: actions/setup-java@v4
       with:
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # DooM#
 
-This is a vanilla port of the [DooM source code](https://github.com/id-Software/DOOM/tree/master/linuxdoom-1.10) to C#, currently targeting .NET 8. 
+This is a vanilla port of the [DooM source code](https://github.com/id-Software/DOOM/tree/master/linuxdoom-1.10) to C#, currently targeting .NET 9. 
 
 
 We currently support two platforms:
@@ -9,7 +9,7 @@ We currently support two platforms:
 
 ## Getting started
 
-* Make sure you have the .NET 8 SDK installed: https://dotnet.microsoft.com/en-us/download .
+* Make sure you have the .NET 9 SDK installed: https://dotnet.microsoft.com/en-us/download .
 
 * Install [Visual Studio 2022](https://visualstudio.microsoft.com/downloads), there's a free community edition available, or use [VS Code](https://code.visualstudio.com/) if you want a lightweight editor. You can also check out [Rider](https://www.jetbrains.com/rider) from JetBrains if you're more familiar with IntelliJ.
 
diff --git a/benchmarks/DoomSharp.Benchmarks.Runner/DoomSharp.Benchmarks.Runner.csproj b/benchmarks/DoomSharp.Benchmarks.Runner/DoomSharp.Benchmarks.Runner.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/benchmarks/DoomSharp.Benchmarks.Runner/Workloads/ArrayClearVsNewInstance.cs b/benchmarks/DoomSharp.Benchmarks.Runner/Workloads/ArrayClearVsNewInstance.cs
@@ -3,12 +3,10 @@
 
 namespace DoomSharp.Benchmarks.Runner.Workloads;
 
-[SimpleJob(RuntimeMoniker.Net60)]
-[SimpleJob(RuntimeMoniker.NativeAot60)]
-[SimpleJob(RuntimeMoniker.Net70)]
-[SimpleJob(RuntimeMoniker.NativeAot70)]
 [SimpleJob(RuntimeMoniker.Net80)]
 [SimpleJob(RuntimeMoniker.NativeAot80)]
+[SimpleJob(RuntimeMoniker.Net90)]
+[SimpleJob(RuntimeMoniker.NativeAot90)]
 [MemoryDiagnoser]
 public class ArrayClearVsNewInstance
 {
diff --git a/benchmarks/DoomSharp.Benchmarks.Runner/Workloads/ArraysVsLists.cs b/benchmarks/DoomSharp.Benchmarks.Runner/Workloads/ArraysVsLists.cs
@@ -3,9 +3,8 @@
 
 namespace DoomSharp.Benchmarks.Runner.Workloads;
 
-[SimpleJob(RuntimeMoniker.Net60)]
-[SimpleJob(RuntimeMoniker.Net70)]
 [SimpleJob(RuntimeMoniker.Net80)]
+[SimpleJob(RuntimeMoniker.Net90)]
 [MemoryDiagnoser]
 public class ArraysVsLists
 {
diff --git a/benchmarks/DoomSharp.Benchmarks.Runner/Workloads/StructsVsClasses.cs b/benchmarks/DoomSharp.Benchmarks.Runner/Workloads/StructsVsClasses.cs
@@ -3,12 +3,10 @@
 
 namespace DoomSharp.Benchmarks.Runner.Workloads;
 
-[SimpleJob(RuntimeMoniker.Net60)]
-[SimpleJob(RuntimeMoniker.NativeAot60)]
-[SimpleJob(RuntimeMoniker.Net70)]
-[SimpleJob(RuntimeMoniker.NativeAot70)]
 [SimpleJob(RuntimeMoniker.Net80)]
 [SimpleJob(RuntimeMoniker.NativeAot80)]
+[SimpleJob(RuntimeMoniker.Net90)]
+[SimpleJob(RuntimeMoniker.NativeAot90)]
 [MemoryDiagnoser]
 public class StructsVsClasses
 {
diff --git a/benchmarks/DoomSharp.Benchmarks.Runner/Workloads/UnsafeVsSafe.cs b/benchmarks/DoomSharp.Benchmarks.Runner/Workloads/UnsafeVsSafe.cs
@@ -3,12 +3,10 @@
 
 namespace DoomSharp.Benchmarks.Runner.Workloads;
 
-[SimpleJob(RuntimeMoniker.Net60)]
-[SimpleJob(RuntimeMoniker.NativeAot60)]
-[SimpleJob(RuntimeMoniker.Net70)]
-[SimpleJob(RuntimeMoniker.NativeAot70)]
 [SimpleJob(RuntimeMoniker.Net80)]
 [SimpleJob(RuntimeMoniker.NativeAot80)]
+[SimpleJob(RuntimeMoniker.Net90)]
+[SimpleJob(RuntimeMoniker.NativeAot90)]
 [MemoryDiagnoser]
 public class UnsafeVsSafe
 {
diff --git a/src/DoomSharp.AnsiConsole/DoomSharp.AnsiConsole.csproj b/src/DoomSharp.AnsiConsole/DoomSharp.AnsiConsole.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/DoomSharp.Core/DoomSharp.Core.csproj b/src/DoomSharp.Core/DoomSharp.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/src/DoomSharp.Droid.Bindings/DoomSharp.Droid.Bindings.csproj b/src/DoomSharp.Droid.Bindings/DoomSharp.Droid.Bindings.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-android</TargetFramework>
+    <TargetFramework>net9.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/src/DoomSharp.Maui/DoomSharp.Maui.csproj b/src/DoomSharp.Maui/DoomSharp.Maui.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
diff --git a/src/DoomSharp.Windows/DoomSharp.Windows.csproj b/src/DoomSharp.Windows/DoomSharp.Windows.csproj
@@ -1,25 +1,25 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWPF>true</UseWPF>
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net9.0-windows</TargetFramework>
+		<Nullable>enable</Nullable>
+		<UseWPF>true</UseWPF>
+		<PlatformTarget>x64</PlatformTarget>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <Folder Include="ViewModels\" />
-  </ItemGroup>
+	<ItemGroup>
+		<Folder Include="ViewModels\" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\DoomSharp.Core\DoomSharp.Core.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\DoomSharp.Core\DoomSharp.Core.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Update="fmod.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Update="fmod.dll">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -3,9 +3,8 @@`
`3`	`3`
`4`	`4`	`namespace DoomSharp.Benchmarks.Runner.Workloads;`
`5`	`5`
`6`		`-[SimpleJob(RuntimeMoniker.Net60)]`
`7`		`-[SimpleJob(RuntimeMoniker.Net70)]`
`8`	`6`	`[SimpleJob(RuntimeMoniker.Net80)]`
	`7`	`+[SimpleJob(RuntimeMoniker.Net90)]`
`9`	`8`	`[MemoryDiagnoser]`
`10`	`9`	`public class ArraysVsLists`
`11`	`10`	`{`