Compare commits

..

No commits in common. "0f1d4653a20706555ceb34672fe549a224ee3bb4" and "36ee8182f925fc2d37b1ef7c498d94268ec17e32" have entirely different histories.

4 changed files with 7 additions and 19 deletions

View File

@ -38,7 +38,7 @@ public class InitializationTask : InstallerTaskBase
if (File.Exists(Path.Join(_data.TargetInstallPath, "EscapeFromTarkov.exe")))
{
return Result.FromError(
"Install location is a folder that has existing game files. Please make the folder doesn't contain an existing spt install");
"Installer is located in a folder that has existing game files. Please make sure the installer is in an empty folder as per the guide");
}
return Result.FromSuccess($"Current Game Version: {_data.OriginalGameVersion}");

View File

@ -9,21 +9,9 @@ namespace SPTInstaller.Models;
public class InstallerUpdateInfo : ReactiveObject
{
private Version? _newVersion;
public Version? NewVersion { get; private set; }
public Version? NewVersion
{
get => _newVersion;
set => this.RaiseAndSetIfChanged(ref _newVersion, value);
}
private string _changeLog;
public string ChangeLog
{
get => _changeLog;
set => this.RaiseAndSetIfChanged(ref _changeLog, value);
}
public string ChangeLog { get; private set; }= "";
private string _updateInfoText = "";

View File

@ -10,8 +10,8 @@
<PackageIcon>icon.ico</PackageIcon>
<ApplicationIcon>Assets\spt_installer.ico</ApplicationIcon>
<Configurations>Debug;Release;TEST</Configurations>
<AssemblyVersion>2.81</AssemblyVersion>
<FileVersion>2.81</FileVersion>
<AssemblyVersion>2.80</AssemblyVersion>
<FileVersion>2.80</FileVersion>
<Company>SPT</Company>
</PropertyGroup>

View File

@ -162,7 +162,7 @@ public class PreChecksViewModel : ViewModelBase
NavigateTo(new MessageViewModel(HostScreen,
Result.FromError(
"You have chosen to install in the same folder as EFT. Please choose a another folder. Refer to the install guide on where best to place the installer before running it."),
"You have placed the installer in the same folder as EFT. Please move the installer to a seperate folder. Refer to the install guide on where best to place the installer before running it."),
noLog: true));
return;
}
@ -199,7 +199,7 @@ public class PreChecksViewModel : ViewModelBase
Log.Error("Problem path detected, install denied");
NavigateTo(new MessageViewModel(HostScreen,
Result.FromError(
$"We suspect you may be installing into a problematic folder: {failedCheck.Target}.\nWe won't be letting you install here. How did you do this?")));
$"We suspect you may be installing into a problematic folder: {failedCheck.Target}.\nWe won't be letting you install here. Please move the installer to another folder.\nSuggestion: a folder under your drive root, such as 'C:\\spt\\'\nDenied Path: {InstallPath}")));
break;
}
default: