From 131bc65e8f5127b05e93e7513198efe184ab1a6a Mon Sep 17 00:00:00 2001
From: James Groom <OSSYoshiRulz+GitHub@gmail.com>
Date: Mon, 12 Feb 2024 20:38:03 +0000
Subject: [PATCH] Bump .NET SDK to 8.x

---
 Dist/historical.nix                                         | 6 +++++-
 default.nix                                                 | 3 ++-
 global.json                                                 | 3 ++-
 .../BizHawk.Tests.Testroms.GB.GambatteSuite.csproj          | 2 +-
 .../BizHawk.Tests.Testroms.GB.csproj                        | 2 +-
 src/BizHawk.Tests/BizHawk.Tests.csproj                      | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dist/historical.nix b/Dist/historical.nix
index 3572f20f0a..a1cc3138e0 100644
--- a/Dist/historical.nix
+++ b/Dist/historical.nix
@@ -8,6 +8,7 @@
 # makedeps
 , dotnet-sdk_5
 , dotnet-sdk_6
+, dotnet-sdk_8
 }: let
 	/**
 	 * updating? make sure to hit the rest of this file, the hand-written deps `/Dist/deps-historical.nix`,
@@ -78,6 +79,7 @@
 					-i $out/Dist/.InvokeCLIOnMainSln.sh
 			'';
 			hashPostPatching = "sha256-g6U0B+wY5uosP5WyNFKylBRX9kq+zM6H+f05egYqcAQ=";
+			dotnet-sdk = dotnet-sdk_6;
 		};
 		info-2_9 = {
 			version = "2.9";
@@ -86,6 +88,7 @@
 				commitCount=20208
 			'' + pre-2_9_1-no-git-patch + from-2_6_2-through-2_9-no-git-patch;
 			hashPostPatching = "sha256-gDLStqpRGxTlXip+FKWj/O7sQElBNjQK8HpjZbXsrC0=";
+			dotnet-sdk = dotnet-sdk_6;
 		};
 		info-2_8 = {
 			version = "2.8";
@@ -94,6 +97,7 @@
 				commitCount=19337
 			'' + pre-2_9_1-no-git-patch + from-2_6_2-through-2_9-no-git-patch;
 			hashPostPatching = "sha256-TfxAA8QkyImau0MxCdbTWFKneXZwpXYPIB+iN9z+Unk=";
+			dotnet-sdk = dotnet-sdk_6;
 		};
 		info-2_7 = {
 			version = "2.7";
@@ -200,7 +204,7 @@ in {
 		inherit neededExtraManagedDepsApprox;
 		__contentAddressed = false; #TODO try w/ CA
 		copyingAssetsInEmuHawkProj = isVersionAtLeast "2.6.3" version;
-		dotnet-sdk = dotnet-sdk_6;
+		dotnet-sdk = dotnet-sdk_8;
 		exePathRespectsEnvVar = isVersionAtLeast "2.9.2" version;
 		hasAssemblyResolveHandler = isVersionAtLeast "2.3.3" version;
 		hasAssetsInOutput = !isVersionAtLeast "2.6.1" version;
diff --git a/default.nix b/default.nix
index 97dcf12391..e454ddd4fc 100644
--- a/default.nix
+++ b/default.nix
@@ -23,6 +23,7 @@ in {
 	src = builtins.path { path = ./.; name = "BizHawk-${version}"; }; # source derivation; did have filter here for speed, but it wasn't faster and it wasn't correct and it couldn't be made correct and I'm mad
 }
 # makedeps
+, dotnet-sdk_8 ? pkgs.dotnet-sdk_8
 , dotnet-sdk_6 ? pkgs.dotnet-sdk_6
 , dotnet-sdk_5 ? let result = builtins.tryEval pkgs.dotnet-sdk_5; in if result.success
 	then result.value
@@ -75,7 +76,7 @@ in {
 		inherit lib
 			isVersionAtLeast replaceDotWithUnderscore
 			fetchFromGitHub fetchFromGitLab mkNugetDeps
-			dotnet-sdk_5 dotnet-sdk_6;
+			dotnet-sdk_5 dotnet-sdk_6 dotnet-sdk_8;
 	}) depsForHistoricalRelease populateHawkSourceInfo releaseArtifactInfos releaseFrags releaseTagSourceInfos;
 	launchScriptsFor = bizhawkAssemblies: isManualLocalBuild: import Dist/launch-scripts.nix {
 		inherit lib
diff --git a/global.json b/global.json
index 328955c708..8746d74b56 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,7 @@
 {
 	"sdk": {
-		"version": "6.0.100",
+		"version": "8.0.0",
+		"allowPrerelease": true,
 		"rollForward": "latestMajor"
 	}
 }
diff --git a/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj b/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj
index d24c3c11f5..4ea421430c 100644
--- a/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj
+++ b/src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
diff --git a/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj b/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
index ba6ac30f96..a45c344013 100644
--- a/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
+++ b/src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj
index a8af362db1..200a26f7ba 100644
--- a/src/BizHawk.Tests/BizHawk.Tests.csproj
+++ b/src/BizHawk.Tests/BizHawk.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(APPVEYOR)' != '' ">
 		<TargetFramework>netcoreapp3.1</TargetFramework>