From 2428f2084b7b8aa1c6b0d759ebc85fcbd0aa0128 Mon Sep 17 00:00:00 2001 From: "waffle.lord" Date: Mon, 5 Feb 2024 10:09:23 -0500 Subject: [PATCH] require framework prechecks also updated the update script to not use bitstransfer --- .../Installer Tasks/PreChecks/NetCore6PreCheck.cs | 2 +- .../Installer Tasks/PreChecks/NetFramework472PreCheck.cs | 2 +- SPTInstaller/Resources/update.ps1 | 8 ++------ SPTInstaller/SPTInstaller.csproj | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/SPTInstaller/Installer Tasks/PreChecks/NetCore6PreCheck.cs b/SPTInstaller/Installer Tasks/PreChecks/NetCore6PreCheck.cs index 07d8719..856d457 100644 --- a/SPTInstaller/Installer Tasks/PreChecks/NetCore6PreCheck.cs +++ b/SPTInstaller/Installer Tasks/PreChecks/NetCore6PreCheck.cs @@ -9,7 +9,7 @@ namespace SPTInstaller.Installer_Tasks.PreChecks; public class NetCore6PreCheck : PreCheckBase { - public NetCore6PreCheck() : base(".Net Core 6 Desktop Runtime", false) + public NetCore6PreCheck() : base(".Net Core 6 Desktop Runtime", true) { } diff --git a/SPTInstaller/Installer Tasks/PreChecks/NetFramework472PreCheck.cs b/SPTInstaller/Installer Tasks/PreChecks/NetFramework472PreCheck.cs index e0c9b8f..8ca371f 100644 --- a/SPTInstaller/Installer Tasks/PreChecks/NetFramework472PreCheck.cs +++ b/SPTInstaller/Installer Tasks/PreChecks/NetFramework472PreCheck.cs @@ -8,7 +8,7 @@ namespace SPTInstaller.Installer_Tasks.PreChecks; public class NetFramework472PreCheck : PreCheckBase { - public NetFramework472PreCheck() : base(".Net Framework 4.7.2", false) + public NetFramework472PreCheck() : base(".Net Framework 4.7.2", true) { } diff --git a/SPTInstaller/Resources/update.ps1 b/SPTInstaller/Resources/update.ps1 index 5cb9e24..be36892 100644 --- a/SPTInstaller/Resources/update.ps1 +++ b/SPTInstaller/Resources/update.ps1 @@ -3,7 +3,7 @@ [string]$destination ) -clear +Clear-Host Write-Host "Stopping installer ..." @@ -16,11 +16,7 @@ if ($installer -ne $null) { Write-Host "Copying new installer ..." -Import-Module BitsTransfer - -Start-BitsTransfer -Source $source -Destination $destination -DisplayName "Updating" -Description "Copying new installer" - -Remove-Module -Name BitsTransfer +Copy-Item -Path $source -Destination $destination -Force # remove the new installer from the cache folder after it is copied Remove-Item -Path $source diff --git a/SPTInstaller/SPTInstaller.csproj b/SPTInstaller/SPTInstaller.csproj index d344dc9..685cca1 100644 --- a/SPTInstaller/SPTInstaller.csproj +++ b/SPTInstaller/SPTInstaller.csproj @@ -9,8 +9,8 @@ icon.ico Assets\icon.ico Debug;Release;TEST - 2.28 - 2.28 + 2.29 + 2.29 SPT-AKI