ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump .NET SDK to 8.x

This commit is contained in:
James Groom 2024-02-12 20:38:03 +00:00 committed by GitHub
parent b1a684fd7f
commit 131bc65e8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dist/historical.nix
View File

@ -8,6 +8,7 @@
# makedeps # makedeps
, dotnet-sdk_5 , dotnet-sdk_5
, dotnet-sdk_6 , dotnet-sdk_6
, dotnet-sdk_8
}: let }: let
/** /**
* updating? make sure to hit the rest of this file, the hand-written deps `/Dist/deps-historical.nix`, * 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 -i $out/Dist/.InvokeCLIOnMainSln.sh
''; '';
hashPostPatching = "sha256-g6U0B+wY5uosP5WyNFKylBRX9kq+zM6H+f05egYqcAQ="; hashPostPatching = "sha256-g6U0B+wY5uosP5WyNFKylBRX9kq+zM6H+f05egYqcAQ=";
dotnet-sdk = dotnet-sdk_6;
}; };
info-2_9 = { info-2_9 = {
version = "2.9"; version = "2.9";
@ -86,6 +88,7 @@
commitCount=20208 commitCount=20208
'' + pre-2_9_1-no-git-patch + from-2_6_2-through-2_9-no-git-patch; '' + pre-2_9_1-no-git-patch + from-2_6_2-through-2_9-no-git-patch;
hashPostPatching = "sha256-gDLStqpRGxTlXip+FKWj/O7sQElBNjQK8HpjZbXsrC0="; hashPostPatching = "sha256-gDLStqpRGxTlXip+FKWj/O7sQElBNjQK8HpjZbXsrC0=";
dotnet-sdk = dotnet-sdk_6;
}; };
info-2_8 = { info-2_8 = {
version = "2.8"; version = "2.8";
@ -94,6 +97,7 @@
commitCount=19337 commitCount=19337
'' + pre-2_9_1-no-git-patch + from-2_6_2-through-2_9-no-git-patch; '' + pre-2_9_1-no-git-patch + from-2_6_2-through-2_9-no-git-patch;
hashPostPatching = "sha256-TfxAA8QkyImau0MxCdbTWFKneXZwpXYPIB+iN9z+Unk="; hashPostPatching = "sha256-TfxAA8QkyImau0MxCdbTWFKneXZwpXYPIB+iN9z+Unk=";
dotnet-sdk = dotnet-sdk_6;
}; };
info-2_7 = { info-2_7 = {
version = "2.7"; version = "2.7";
@ -200,7 +204,7 @@ in {
inherit neededExtraManagedDepsApprox; inherit neededExtraManagedDepsApprox;
__contentAddressed = false; #TODO try w/ CA __contentAddressed = false; #TODO try w/ CA
copyingAssetsInEmuHawkProj = isVersionAtLeast "2.6.3" version; copyingAssetsInEmuHawkProj = isVersionAtLeast "2.6.3" version;
dotnet-sdk = dotnet-sdk_6; dotnet-sdk = dotnet-sdk_8;
exePathRespectsEnvVar = isVersionAtLeast "2.9.2" version; exePathRespectsEnvVar = isVersionAtLeast "2.9.2" version;
hasAssemblyResolveHandler = isVersionAtLeast "2.3.3" version; hasAssemblyResolveHandler = isVersionAtLeast "2.3.3" version;
hasAssetsInOutput = !isVersionAtLeast "2.6.1" version; hasAssetsInOutput = !isVersionAtLeast "2.6.1" version;

3
default.nix
View File

@ -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 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 # makedeps
, dotnet-sdk_8 ? pkgs.dotnet-sdk_8
, dotnet-sdk_6 ? pkgs.dotnet-sdk_6 , dotnet-sdk_6 ? pkgs.dotnet-sdk_6
, dotnet-sdk_5 ? let result = builtins.tryEval pkgs.dotnet-sdk_5; in if result.success , dotnet-sdk_5 ? let result = builtins.tryEval pkgs.dotnet-sdk_5; in if result.success
then result.value then result.value
@ -75,7 +76,7 @@ in {
inherit lib inherit lib
isVersionAtLeast replaceDotWithUnderscore isVersionAtLeast replaceDotWithUnderscore
fetchFromGitHub fetchFromGitLab mkNugetDeps fetchFromGitHub fetchFromGitLab mkNugetDeps
dotnet-sdk_5 dotnet-sdk_6; dotnet-sdk_5 dotnet-sdk_6 dotnet-sdk_8;
}) depsForHistoricalRelease populateHawkSourceInfo releaseArtifactInfos releaseFrags releaseTagSourceInfos; }) depsForHistoricalRelease populateHawkSourceInfo releaseArtifactInfos releaseFrags releaseTagSourceInfos;
launchScriptsFor = bizhawkAssemblies: isManualLocalBuild: import Dist/launch-scripts.nix { launchScriptsFor = bizhawkAssemblies: isManualLocalBuild: import Dist/launch-scripts.nix {
inherit lib inherit lib

3
global.json
View File

@ -1,6 +1,7 @@
{ {
"sdk": { "sdk": {
"version": "6.0.100", "version": "8.0.0",
"allowPrerelease": true,
"rollForward": "latestMajor" "rollForward": "latestMajor"
} }
} }

2
src/BizHawk.Tests.Testroms.GB.GambatteSuite/BizHawk.Tests.Testroms.GB.GambatteSuite.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<Import Project="../MainSlnCommon.props" /> <Import Project="../MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>

2
src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<Import Project="../MainSlnCommon.props" /> <Import Project="../MainSlnCommon.props" />
<PropertyGroup> <PropertyGroup>

2
src/BizHawk.Tests/BizHawk.Tests.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(APPVEYOR)' != '' "> <PropertyGroup Condition=" '$(APPVEYOR)' != '' ">
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>