From f9787a8342ce0622ed93b6402b0e95666cff65d0 Mon Sep 17 00:00:00 2001
From: Ben Parsons <9ParsonsB@users.noreply.github.com>
Date: Wed, 7 May 2025 17:16:47 +1000
Subject: [PATCH] Enable Targeting .Net 8  (#297)

Fixes #295
---
 .github/workflows/build.yml              | 20 +++++++++++-----
 Examples/Examples.csproj                 |  2 +-
 Raylib-cs.Native/Native.cs               |  4 ++++
 Raylib-cs.Native/Raylib-cs.Native.csproj | 29 ++++++++----------------
 Raylib-cs.Tests/Raylib-cs.Tests.csproj   | 10 ++++----
 Raylib-cs/Raylib-cs.csproj               |  2 +-
 6 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 Raylib-cs.Native/Native.cs

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afe2c0c..1ea3e36 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,9 @@
 name: Build
 on:
   push:
-    branches: master
+    branches: ["master"]
   pull_request:
-    branches: "*"
+    branches: ["*"]
     paths-ignore:
       - "README.md"
       - ".github/ISSUE_TEMPLATE/**"
@@ -35,7 +35,9 @@ jobs:
       - name: setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: |
+            6.0.x
+            8.0.x
 
       - name: setup dependencies
         run: |
@@ -81,7 +83,9 @@ jobs:
       - name: setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: |
+            6.0.x
+            8.0.x
 
       - name: build projects
         run: dotnet build -c Release /p:BuildArch=${{ matrix.arch }}
@@ -114,7 +118,9 @@ jobs:
       - name: setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: |
+            6.0.x
+            8.0.x
 
       - name: build projects
         run: dotnet build -c Release /p:BuildArch=${{ matrix.arch }}
@@ -167,7 +173,9 @@ jobs:
       - name: setup dotnet
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: |
+            6.0.x
+            8.0.x
 
       - name: create NuGet Package
         run: dotnet pack Raylib-cs -c Release --output nuget
diff --git a/Examples/Examples.csproj b/Examples/Examples.csproj
index cd05201..5e62c5c 100644
--- a/Examples/Examples.csproj
+++ b/Examples/Examples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StartupObject>Examples.Program</StartupObject>
     <RunWorkingDirectory>$(MSBuildThisFileDirectory)</RunWorkingDirectory>
diff --git a/Raylib-cs.Native/Native.cs b/Raylib-cs.Native/Native.cs
new file mode 100644
index 0000000..fc8bba6
--- /dev/null
+++ b/Raylib-cs.Native/Native.cs
@@ -0,0 +1,4 @@
+namespace Raylib_cs.Native
+{
+    internal class Native { }
+}
diff --git a/Raylib-cs.Native/Raylib-cs.Native.csproj b/Raylib-cs.Native/Raylib-cs.Native.csproj
index 63fef7e..2bc574e 100644
--- a/Raylib-cs.Native/Raylib-cs.Native.csproj
+++ b/Raylib-cs.Native/Raylib-cs.Native.csproj
@@ -1,8 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk" InitialTargets="ConfigureNative">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <DebugType>none</DebugType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GenerateDependencyFile>False</GenerateDependencyFile>
   </PropertyGroup>
 
   <Import Project="../Raylib-cs/Build.props" />
@@ -44,11 +46,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content
-      Include="$(OutputPath)native/raylib/$(NativePre)raylib.$(NativeExt)"
-      Link="%(Filename)%(Extension)"
-      CopyToOutputDirectory="PreserveNewest"
-      Condition="Exists('$(OutputPath)native/raylib/$(NativePre)raylib.$(NativeExt)')" />
+    <Content Include="$(OutputPath)native/raylib/$(NativePre)raylib.$(NativeExt)" Link="%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" Condition="Exists('$(OutputPath)native/raylib/$(NativePre)raylib.$(NativeExt)')" />
 
     <CMakeArgs Include="-B $(OutputPath)native" />
     <CMakeArgs Include="-S $(BaseIntermediateOutputPath)raylib-$(TargetRaylibTag)" />
@@ -58,25 +56,16 @@
     <CMakeArgs Include="-D CMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded" />
     <CMakeArgs Include="-D CMAKE_MINIMUM_REQUIRED_VERSION=3.15" />
     <CMakeArgs Include="-D CMAKE_POLICY_DEFAULT_CMP0091=NEW" />
+    <!-- <CMakeArgs Include="-D GLFW_BUILD_WAYLAND=ON" /> -->
     <!-- <CMakeArgs Include="-D GRAPHICS=GRAPHICS_API_OPENGL_43" /> -->
   </ItemGroup>
 
   <Target Name="ConfigureNative" Condition="$(SkipLocalBuild) != true">
-    <DownloadFile
-      SourceUrl="https://github.com/raysan5/raylib/archive/refs/tags/$(TargetRaylibTag).zip"
-      DestinationFolder="$(BaseIntermediateOutputPath)"
-      DestinationFileName="raylib.zip"
-      Condition="!Exists('$(BaseIntermediateOutputPath)raylib.zip')" />
+    <DownloadFile SourceUrl="https://github.com/raysan5/raylib/archive/refs/tags/$(TargetRaylibTag).zip" DestinationFolder="$(BaseIntermediateOutputPath)" DestinationFileName="raylib.zip" Condition="!Exists('$(BaseIntermediateOutputPath)raylib.zip')" />
 
-    <Unzip
-      SourceFiles="$(BaseIntermediateOutputPath)raylib.zip"
-      DestinationFolder="$(BaseIntermediateOutputPath)"
-      OverwriteReadOnlyFiles="true"
-      Condition="!Exists('$(BaseIntermediateOutputPath)raylib-$(TargetRaylibTag)')" />
-
-    <Exec Command="cmake @(CMakeArgs, ' ') $(CMakeExtraArgs)"
-      Condition="!Exists('$(BaseIntermediateOutputPath)native/CMakeCache.txt')" />
+    <Unzip SourceFiles="$(BaseIntermediateOutputPath)raylib.zip" DestinationFolder="$(BaseIntermediateOutputPath)" OverwriteReadOnlyFiles="true" Condition="!Exists('$(BaseIntermediateOutputPath)raylib-$(TargetRaylibTag)')" />
 
+    <Exec Command="cmake @(CMakeArgs, ' ') $(CMakeExtraArgs)" />
     <Exec Command="cmake --build $(OutputPath)native --config $(Configuration)" />
   </Target>
 </Project>
diff --git a/Raylib-cs.Tests/Raylib-cs.Tests.csproj b/Raylib-cs.Tests/Raylib-cs.Tests.csproj
index fa9d3a9..f06cc03 100644
--- a/Raylib-cs.Tests/Raylib-cs.Tests.csproj
+++ b/Raylib-cs.Tests/Raylib-cs.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>12</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="coverlet.collector" Version="1.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="xunit" Version="2.6.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Raylib-cs/Raylib-cs.csproj b/Raylib-cs/Raylib-cs.csproj
index 918d103..6f014f2 100644
--- a/Raylib-cs/Raylib-cs.csproj
+++ b/Raylib-cs/Raylib-cs.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <EnableDefaultItems>false</EnableDefaultItems>
     <AssemblyName>Raylib-cs</AssemblyName>
     <RootNamespace>Raylib_cs</RootNamespace>