Upgrade to .NET 8 (#4)

* Update to .NET 8 * Update README * Add JDK setup step in build actions
wcabus · Jan 7, 2024 · b260db6 · b260db6
1 parent 44ca492
commit b260db6
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,8 +9,13 @@ jobs:
     steps:
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.x'
-
+        dotnet-version: '8.x'
+
+    - uses: actions/setup-java@v4
+      with:
+        java-version: '21.x'
+        distribution: 'microsoft'
+
     - uses: actions/checkout@v3
 
     - run: |

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -44,7 +44,12 @@ jobs:
 
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.x'
+        dotnet-version: '8.x'
+
+    - uses: actions/setup-java@v4
+      with:
+        java-version: '21.x'
+        distribution: 'microsoft'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

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 7. 
+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. 
 
 
 We currently support two platforms:
@@ -9,7 +9,7 @@ We currently support two platforms:
 
 ## Getting started
 
-* Make sure you have the .NET 7 SDK installed: https://dotnet.microsoft.com/en-us/download .
+* Make sure you have the .NET 8 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/src/DoomSharp.Core/DoomSharp.Core.csproj b/src/DoomSharp.Core/DoomSharp.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.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>net7.0-android</TargetFramework>
+    <TargetFramework>net8.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,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.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);net6.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
 		<RootNamespace>DoomSharp.Maui</RootNamespace>
 		<UseMaui>true</UseMaui>
@@ -33,13 +33,13 @@
 	</PropertyGroup>
 
 	<!-- Android -->
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-android')) != true">
+	<ItemGroup Condition="$(TargetFramework.StartsWith('net8.0-android')) != true">
 		<Compile Remove="**\**\*.Android.cs" />
 		<None Include="**\**\*.Android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
 	</ItemGroup>
 
 	<!-- iOS and Mac Catalyst -->
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-ios')) != true AND $(TargetFramework.StartsWith('net7.0-maccatalyst')) != true">
+	<ItemGroup Condition="$(TargetFramework.StartsWith('net8.0-ios')) != true AND $(TargetFramework.StartsWith('net8.0-maccatalyst')) != true">
 		<Compile Remove="**\**\*.MaciOS.cs" />
 		<None Include="**\**\*.MaciOS.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
 	</ItemGroup>
@@ -69,6 +69,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+      <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.3" />
 	  <PackageReference Include="SkiaSharp" Version="2.88.6" />
 	  <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
 	</ItemGroup>
@@ -77,7 +78,7 @@
 	  <ProjectReference Include="..\DoomSharp.Core\DoomSharp.Core.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-android'))">
+	<ItemGroup Condition="$(TargetFramework.StartsWith('net8.0-android'))">
 		<ProjectReference Include="..\DoomSharp.Droid.Bindings\DoomSharp.Droid.Bindings.csproj" />
 	</ItemGroup>
 

diff --git a/src/DoomSharp.Windows/DoomSharp.Windows.csproj b/src/DoomSharp.Windows/DoomSharp.Windows.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <PlatformTarget>x64</PlatformTarget>