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

Merge pull request 'require framework prechecks' (#50) from waffle.lord/SPT-AKI-Installer:require-dependencies into master

Browse Source 
Reviewed-on: CWX/SPT-AKI-Installer#50
This commit is contained in:
IsWaffle 2024-02-05 15:10:16 +00:00
commit e58f2bae55
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPTInstaller/Installer Tasks/PreChecks/NetCore6PreCheck.cs
View File

@ -9,7 +9,7 @@ namespace SPTInstaller.Installer_Tasks.PreChecks;
public class NetCore6PreCheck : PreCheckBase public class NetCore6PreCheck : PreCheckBase
{ {
public NetCore6PreCheck() : base(".Net Core 6 Desktop Runtime", false) public NetCore6PreCheck() : base(".Net Core 6 Desktop Runtime", true)
{ {
} }

2
SPTInstaller/Installer Tasks/PreChecks/NetFramework472PreCheck.cs
View File

@ -8,7 +8,7 @@ namespace SPTInstaller.Installer_Tasks.PreChecks;
public class NetFramework472PreCheck : PreCheckBase public class NetFramework472PreCheck : PreCheckBase
{ {
public NetFramework472PreCheck() : base(".Net Framework 4.7.2", false) public NetFramework472PreCheck() : base(".Net Framework 4.7.2", true)
{ {
} }

8
SPTInstaller/Resources/update.ps1
View File

@ -3,7 +3,7 @@
[string]$destination [string]$destination
) )
clear Clear-Host
Write-Host "Stopping installer ..." Write-Host "Stopping installer ..."
@ -16,11 +16,7 @@ if ($installer -ne $null) {
Write-Host "Copying new installer ..." Write-Host "Copying new installer ..."
Import-Module BitsTransfer Copy-Item -Path $source -Destination $destination -Force
Start-BitsTransfer -Source $source -Destination $destination -DisplayName "Updating" -Description "Copying new installer"
Remove-Module -Name BitsTransfer
# remove the new installer from the cache folder after it is copied # remove the new installer from the cache folder after it is copied
Remove-Item -Path $source Remove-Item -Path $source

4
SPTInstaller/SPTInstaller.csproj
View File

@ -9,8 +9,8 @@
<PackageIcon>icon.ico</PackageIcon> <PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\icon.ico</ApplicationIcon> <ApplicationIcon>Assets\icon.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations> <Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.28</AssemblyVersion> <AssemblyVersion>2.29</AssemblyVersion>
<FileVersion>2.28</FileVersion> <FileVersion>2.29</FileVersion>
<Company>SPT-AKI</Company> <Company>SPT-AKI</Company>
</PropertyGroup> </PropertyGroup>