.idea/.idea.SPTInstaller/.idea/avalonia.xml

@@ -24,7 +24,6 @@
         <entry key="SPTInstaller/Views/InstallerUpdateView.axaml" value="SPTInstaller/SPTInstaller.csproj" />
         <entry key="SPTInstaller/Views/MainWindow.axaml" value="SPTInstaller/SPTInstaller.csproj" />
         <entry key="SPTInstaller/Views/MessageView.axaml" value="SPTInstaller/SPTInstaller.csproj" />
-        <entry key="SPTInstaller/Views/OverviewView.axaml" value="SPTInstaller/SPTInstaller.csproj" />
         <entry key="SPTInstaller/Views/PreChecksView.axaml" value="SPTInstaller/SPTInstaller.csproj" />
       </map>
     </option>

SPTInstaller/App.axaml.cs

@@ -15,7 +15,7 @@ namespace SPTInstaller;
 
 public partial class App : Application
 {
-    public static string LogPath = Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "spt-installer", "spt-installer.log");
+    public static string LogPath = Path.Join(Environment.CurrentDirectory, "spt-installer.log");
     
     public static void ReLaunch(bool debug, string installPath = "")
     {
@@ -67,6 +67,8 @@ public partial class App : Application
                 providedPath = installPath != null && installPath.Contains('=') ? installPath?.Split('=')[1] ?? "" : "";
             }
             
+            
+            
             if (debug)
             {
                 Log.Logger = new LoggerConfiguration()

SPTInstaller/Installer Tasks/ReleaseCheckTask.cs

@@ -77,6 +77,11 @@ public class ReleaseCheckTask : InstallerTaskBase
             bool sptClientIsOutdated = intSPTVersion != patchMirrorInfo.TargetClientVersion && patchNeedCheck;
             bool liveClientIsOutdated = intGameVersion != patchMirrorInfo.SourceClientVersion && patchNeedCheck;
 
+            if (liveClientIsOutdated)
+            {
+                return Result.FromError("Your live EFT is out of date. Please update it using the BSG Launcher then run the SPT Installer again");
+            }
+
             if (sptClientIsOutdated)
             {
                 return Result.FromError(
@@ -86,11 +91,6 @@ public class ReleaseCheckTask : InstallerTaskBase
                     "\n* Live EFT just updated. You have not installed it on your computer using the BSG launcher");
             }
             
-            if (liveClientIsOutdated)
-            {
-                return Result.FromError("Your live EFT is out of date. Please update it using the BSG Launcher then run the SPT Installer again");
-            }
-            
             _data.PatchNeeded = patchNeedCheck;
             
             string status =

SPTInstaller/SPTInstaller.csproj

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

SPTInstaller/ViewModels/InstallerUpdateViewModel.cs

@@ -27,14 +27,14 @@ public class InstallerUpdateViewModel : ViewModelBase
             
             if (!UpdateInfo.UpdateAvailable)
             {
-                NavigateTo(new OverviewViewModel(HostScreen, _installPath, _debugging));
+                NavigateTo(new InstallPathSelectionViewModel(HostScreen, _installPath, _debugging));
             }
         });
     }
     
     public void NotNowCommand()
     {
-        NavigateTo(new OverviewViewModel(HostScreen, _installPath, _debugging));
+        NavigateTo(new InstallPathSelectionViewModel(HostScreen, _installPath, _debugging));
     }
     
     public async Task UpdateInstallCommand()

SPTInstaller/ViewModels/OverviewViewModel.cs

@@ -1,25 +0,0 @@
-using System.Threading.Tasks;
-using ReactiveUI;
-
-namespace SPTInstaller.ViewModels;
-
-public class OverviewViewModel : ViewModelBase
-{
-    private string _providedPath;
-    private bool _debugging;
-    public OverviewViewModel(IScreen Host, string providedPath, bool debugging) : base(Host)
-    {
-        _providedPath = providedPath;
-        _debugging = debugging;
-        
-        if (!string.IsNullOrEmpty(_providedPath))
-        {
-            Task.Run(NextCommand);
-        }
-    }
-    
-    public void NextCommand()
-    {
-        NavigateTo(new InstallPathSelectionViewModel(HostScreen, _providedPath, _debugging));
-    }
-}

SPTInstaller/Views/OverviewView.axaml

@@ -1,55 +0,0 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="SPTInstaller.Views.OverviewView">
-    <Grid RowDefinitions="10,Auto,Auto,Auto,Auto,*,10" ColumnDefinitions="10,*,Auto,10">
-        
-        <!-- Overview text -->
-        <Label Grid.Row="1" Grid.Column="1" Content="This installer will:" FontSize="20" Margin="0 5"
-               Foreground="{StaticResource SPT_Yellow}"
-               />
-        
-        <!-- Overview info -->
-        <StackPanel Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2">
-            <Label>◉ Check dependencies are installed, such as .NET</Label>
-            <Label>◉ Automatically locate and copy your EFT client files to the path you supply on the next page</Label>
-            <Label>◉ Downgrade your client files to the version SPT uses, if needed</Label>
-            <Label>◉ Download and extract the SPT release files</Label>
-        </StackPanel>
-        
-        <!-- Notes text -->
-        <Label Grid.Row="3" Grid.Column="1" Content="Additional Notes:" FontSize="20" Margin="0 5"
-               Foreground="{StaticResource SPT_Yellow}"
-               />
-        
-        <!-- Notes info -->
-        <StackPanel Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2">
-            <Label>◉ You do not need to install SPT in the same drive as EFT</Label>
-            <Label Margin="0" Padding="0">
-                <StackPanel Orientation="Horizontal">
-                    <Label VerticalAlignment="Center">◉ This tool does</Label>
-                    <TextBlock TextDecorations="Underline" FontWeight="SemiBold" Foreground="Crimson" VerticalAlignment="Center">NOT</TextBlock>
-                    <Label VerticalAlignment="Center">update an existing SPT install</Label>
-                </StackPanel>
-            </Label>
-        </StackPanel>
-        
-        <!-- Next button -->
-        <Button Grid.Row="5" Grid.Column="2"
-                MinWidth="100"
-                MinHeight="30"
-                FontSize="16"
-                CornerRadius="20"
-                FontWeight="SemiBold"
-                VerticalAlignment="Bottom"
-                HorizontalContentAlignment="Center"
-                VerticalContentAlignment="Center"
-                Classes="yellow"
-                Content="Next"
-                Command="{Binding NextCommand}"
-                IsEnabled="{Binding ValidPath}"
-        />
-    </Grid>
-</UserControl>

SPTInstaller/Views/OverviewView.axaml.cs

@@ -1,12 +0,0 @@
-using Avalonia.ReactiveUI;
-using SPTInstaller.ViewModels;
-
-namespace SPTInstaller.Views;
-
-public partial class OverviewView : ReactiveUserControl<OverviewViewModel>
-{
-    public OverviewView()
-    {
-        InitializeComponent();
-    }
-}