DrakiaXYZ/SPT-AKI-Installer
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update precheck to be net 8

Browse Source
This commit is contained in:
IsWaffle 2024-03-07 15:28:09 -05:00
parent 60db2b328f
commit 6b5d03a929
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SPTInstaller/Installer Tasks/PreChecks/NetCore6PreCheck.cs → SPTInstaller/Installer Tasks/PreChecks/Net8PreCheck.cs
View File

@ -7,18 +7,18 @@ using SPTInstaller.Helpers;
namespace SPTInstaller.Installer_Tasks.PreChecks; namespace SPTInstaller.Installer_Tasks.PreChecks;
public class NetCore6PreCheck : PreCheckBase public class Net8PreCheck : PreCheckBase
{ {
public NetCore6PreCheck() : base(".Net Core 6 Desktop Runtime", true) public Net8PreCheck() : base(".Net 8 Desktop Runtime", true)
{ {
} }
public override async Task<PreCheckResult> CheckOperation() public override async Task<PreCheckResult> CheckOperation()
{ {
var minRequiredVersion = new Version("6.0.0"); var minRequiredVersion = new Version("8.0.0");
string[] output; string[] output;
var failedButtonText = "Download .Net Core 6 Desktop Runtime"; var failedButtonText = "Download .Net 8 Desktop Runtime";
var failedButtonAction = () => var failedButtonAction = () =>
{ {
@ -27,7 +27,7 @@ public class NetCore6PreCheck : PreCheckBase
FileName = "cmd.exe", FileName = "cmd.exe",
UseShellExecute = true, UseShellExecute = true,
WindowStyle = ProcessWindowStyle.Hidden, WindowStyle = ProcessWindowStyle.Hidden,
ArgumentList = { "/C", "start", "https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-6.0.4-windows-x64-installer" } ArgumentList = { "/C", "start", "https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.2-windows-x64-installer" }
}); });
}; };
@ -37,7 +37,7 @@ public class NetCore6PreCheck : PreCheckBase
if (!result.Succeeded) if (!result.Succeeded)
{ {
return PreCheckResult.FromError(result.Message + "\n\nYou most likely don't have .net 6 installed", failedButtonText, failedButtonAction); return PreCheckResult.FromError(result.Message + "\n\nYou most likely don't have .net 8 installed", failedButtonText, failedButtonAction);
} }
output = result.StdOut.Split("\r\n"); output = result.StdOut.Split("\r\n");
@ -63,12 +63,12 @@ public class NetCore6PreCheck : PreCheckBase
if (foundVersion >= minRequiredVersion) if (foundVersion >= minRequiredVersion)
{ {
return PreCheckResult.FromSuccess($".Net Core {minRequiredVersion} Desktop Runtime or higher is installed.\n\nInstalled Version: {foundVersion}"); return PreCheckResult.FromSuccess($".Net {minRequiredVersion} Desktop Runtime or higher is installed.\n\nInstalled Version: {foundVersion}");
} }
highestFoundVersion = foundVersion > highestFoundVersion ? foundVersion : highestFoundVersion; highestFoundVersion = foundVersion > highestFoundVersion ? foundVersion : highestFoundVersion;
} }
return PreCheckResult.FromError($".Net Core Desktop Runtime version {minRequiredVersion} or higher is required.\n\nHighest Version Found: {(highestFoundVersion > new Version("0.0.0") ? highestFoundVersion : "Not Found")}\n\nThis is required to play SPT, but you can install it later if and shouldn't affect the SPT install process.", failedButtonText, failedButtonAction); return PreCheckResult.FromError($".Net Desktop Runtime version {minRequiredVersion} or higher is required.\n\nHighest Version Found: {(highestFoundVersion > new Version("0.0.0") ? highestFoundVersion : "Not Found")}\n\nThis is required to play SPT", failedButtonText, failedButtonAction);
} }
} }

2
SPTInstaller/Program.cs
View File

@ -44,7 +44,7 @@ internal class Program
#if !TEST #if !TEST
ServiceHelper.Register<PreCheckBase, NetFramework472PreCheck>(); ServiceHelper.Register<PreCheckBase, NetFramework472PreCheck>();
ServiceHelper.Register<PreCheckBase, NetCore6PreCheck>(); ServiceHelper.Register<PreCheckBase, Net8PreCheck>();
ServiceHelper.Register<PreCheckBase, FreeSpacePreCheck>(); ServiceHelper.Register<PreCheckBase, FreeSpacePreCheck>();
ServiceHelper.Register<PreCheckBase, EftLauncherPreCheck>(); ServiceHelper.Register<PreCheckBase, EftLauncherPreCheck>();