diff --git a/CHANGELOG.md b/CHANGELOG.md index 98acf683..b71a9d3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### Changelog -#### Version - 2.3.0.0 - 9/21/2020 +#### Version - 2.3.0.1 - 10/1/2020 * Rewrote the file extraction routines. New code uses less memory, less disk space, and performs less thrashing on HDDs * Reworked IPS4 integration to reduce download failures * Profiles can now contain an (optional) file `compiler_settings.json` that includes options for other games to be used during install. @@ -9,6 +9,9 @@ This is now the only way to include extra games in the install process, implicit * Includes a "Favor performance over RAM" optional mode (defaults to off) that will use excessive amounts of RAM in exchange for almost 1GB/sec install speed on the correct hardware. Don't enable this unless you have a fast SSD and at least 2.5GB of RAM for every install thread. +* Fixed Extraction so that zip files no longer cause WJ to CTD +* Better path logging during install and compilation +* Fix the "this was created with a newer version of Wabbajack" issue * If a downloaded file doesn't match the expected hash, try alternative download locations, if allowed diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index d24876fb..3e163c85 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.3.0.0 - 2.3.0.0 + 2.3.0.1 + 2.3.0.1 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.Common/Consts.cs b/Wabbajack.Common/Consts.cs index a94ebad3..1c9e4cc4 100644 --- a/Wabbajack.Common/Consts.cs +++ b/Wabbajack.Common/Consts.cs @@ -11,8 +11,7 @@ namespace Wabbajack.Common { public static class Consts { - public static Version? CurrentWabbajackVersion { get; set; } - + public static Version? CurrentMinimumWabbajackVersion = new Version("2.2.2.0"); public static bool TestMode { get; set; } = false; public static RelativePath GameFolderFilesDir = (RelativePath)"Game Folder Files"; diff --git a/Wabbajack.Common/Extensions/RxExt.cs b/Wabbajack.Common/Extensions/RxExt.cs index 76e0e758..1eb06521 100644 --- a/Wabbajack.Common/Extensions/RxExt.cs +++ b/Wabbajack.Common/Extensions/RxExt.cs @@ -65,10 +65,6 @@ namespace Wabbajack /// When the switch is on, the source will be subscribed to, and its updates passed through. /// When the switch is off, the subscription to the source observable will be stopped, and no signal will be published. /// - /// Source observable to subscribe to if on - /// On/Off signal of whether to subscribe to source observable - /// Value to fire when switching off - /// Observable that publishes data from source, if the switch is on. public static IObservable FlowSwitch(this IObservable source, IObservable filterSwitch, T valueWhenOff) { return filterSwitch diff --git a/Wabbajack.Common/Utils.cs b/Wabbajack.Common/Utils.cs index 833bcfaa..3da4e717 100644 --- a/Wabbajack.Common/Utils.cs +++ b/Wabbajack.Common/Utils.cs @@ -742,10 +742,6 @@ namespace Wabbajack.Common /// /// Roundtrips the value through the JSON routines /// - /// - /// - /// - /// public static T ViaJSON(this T tv) { var json = tv.ToJson(); @@ -844,7 +840,7 @@ namespace Wabbajack.Common { return benchmarkFile.FromJson(); } - catch (Exception ex) + catch (Exception) { // ignored } diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index 42c3eedb..851aff2d 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -4,8 +4,8 @@ WinExe netcoreapp3.1 true - 2.3.0.0 - 2.3.0.0 + 2.3.0.1 + 2.3.0.1 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Lib/ACompiler.cs b/Wabbajack.Lib/ACompiler.cs index d1166171..c6f54ce7 100644 --- a/Wabbajack.Lib/ACompiler.cs +++ b/Wabbajack.Lib/ACompiler.cs @@ -57,7 +57,7 @@ namespace Wabbajack.Lib : base(steps) { //set in MainWindowVM - WabbajackVersion = Consts.CurrentWabbajackVersion; + WabbajackVersion = Consts.CurrentMinimumWabbajackVersion; } public static void Info(string msg) diff --git a/Wabbajack.Lib/Downloaders/DownloadDispatcher.cs b/Wabbajack.Lib/Downloaders/DownloadDispatcher.cs index 8f83d94e..ce110f8a 100644 --- a/Wabbajack.Lib/Downloaders/DownloadDispatcher.cs +++ b/Wabbajack.Lib/Downloaders/DownloadDispatcher.cs @@ -193,7 +193,7 @@ namespace Wabbajack.Lib.Downloaders }; return await Download(newArchive, destination); } - catch (Exception ex) + catch (Exception) { return false; } diff --git a/Wabbajack.Lib/Downloaders/NexusDownloader.cs b/Wabbajack.Lib/Downloaders/NexusDownloader.cs index 91ea0c7f..1967584f 100644 --- a/Wabbajack.Lib/Downloaders/NexusDownloader.cs +++ b/Wabbajack.Lib/Downloaders/NexusDownloader.cs @@ -284,7 +284,7 @@ namespace Wabbajack.Lib.Downloaders return (newArchive, tempFile); } - public async Task ValidateUpgrade(Hash srcHash, AbstractDownloadState newArchiveState) + public override async Task ValidateUpgrade(Hash srcHash, AbstractDownloadState newArchiveState) { var state = (State)newArchiveState; return Game == state.Game && ModID == state.ModID; diff --git a/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs b/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs index b75c999e..34fb190f 100644 --- a/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs +++ b/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs @@ -6,7 +6,6 @@ using System.IO.MemoryMappedFiles; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using AngleSharp; using Wabbajack.Common; using Wabbajack.Common.Exceptions; using Wabbajack.Common.Serialization.Json; diff --git a/Wabbajack.Lib/MO2Compiler.cs b/Wabbajack.Lib/MO2Compiler.cs index 1ad2d855..af890137 100644 --- a/Wabbajack.Lib/MO2Compiler.cs +++ b/Wabbajack.Lib/MO2Compiler.cs @@ -1,12 +1,9 @@ -using Compression.BSA; -using System; +using System; using System.Collections.Concurrent; using System.Collections.Generic; -using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using AngleSharp.Common; using Wabbajack.Common; using Wabbajack.Lib.CompilationSteps; using Wabbajack.Lib.Downloaders; @@ -61,7 +58,7 @@ namespace Wabbajack.Lib MO2Ini = MO2Folder.Combine("ModOrganizer.ini").LoadIniFile(); var mo2game = (string)MO2Ini.General.gameName; CompilingGame = GameRegistry.Games.First(g => g.Value.MO2Name == mo2game).Value; - GamePath = new AbsolutePath((string)MO2Ini.General.gamePath.Replace("\\\\", "\\")); + GamePath = CompilingGame.GameLocation(); ModListOutputFile = outputFile; Settings = new CompilerSettings(); } @@ -103,6 +100,13 @@ namespace Wabbajack.Lib Info("Using Profiles: " + string.Join(", ", SelectedProfiles.OrderBy(p => p))); + Utils.Log($"Compiling Game: {CompilingGame}"); + Utils.Log($"Games from setting files:"); + foreach (var game in Settings.IncludedGames) + { + Utils.Log($"- {game}"); + } + Utils.Log($"VFS File Location: {VFSCacheName}"); Utils.Log($"MO2 Folder: {MO2Folder}"); Utils.Log($"Downloads Folder: {MO2DownloadsFolder}"); @@ -343,7 +347,7 @@ namespace Wabbajack.Lib ModList = new ModList { GameType = CompilingGame.Game, - WabbajackVersion = Consts.CurrentWabbajackVersion, + WabbajackVersion = Consts.CurrentMinimumWabbajackVersion, Archives = SelectedArchives.ToList(), ModManager = ModManager.MO2, Directives = InstallDirectives, diff --git a/Wabbajack.Lib/MO2Installer.cs b/Wabbajack.Lib/MO2Installer.cs index cebcf504..231aa533 100644 --- a/Wabbajack.Lib/MO2Installer.cs +++ b/Wabbajack.Lib/MO2Installer.cs @@ -84,6 +84,12 @@ namespace Wabbajack.Lib Utils.Log("Exiting because we couldn't find the game folder."); return false; } + + Utils.Log($"Install Folder: {OutputFolder}"); + Utils.Log($"Downloads Folder: {DownloadFolder}"); + Utils.Log($"Game Folder: {GameFolder.Value}"); + Utils.Log($"Wabbajack Folder: {AbsolutePath.EntryPoint}"); + var watcher = new DiskSpaceWatcher(cancel, new[]{OutputFolder, DownloadFolder, GameFolder.Value, AbsolutePath.EntryPoint}, (long)2 << 31, drive => diff --git a/Wabbajack.Lib/ModListRegistry/ModListMetadata.cs b/Wabbajack.Lib/ModListRegistry/ModListMetadata.cs index 07619a82..3b54d352 100644 --- a/Wabbajack.Lib/ModListRegistry/ModListMetadata.cs +++ b/Wabbajack.Lib/ModListRegistry/ModListMetadata.cs @@ -91,7 +91,7 @@ namespace Wabbajack.Lib.ModListRegistry var client = new Http.Client(); return (await client.GetStringAsync(Consts.UnlistedModlistMetadataURL)).FromJsonString>(); } - catch (Exception ex) + catch (Exception) { Utils.LogStatus("Error loading unlisted modlists"); return new List(); diff --git a/Wabbajack.Lib/Wabbajack.Lib.csproj b/Wabbajack.Lib/Wabbajack.Lib.csproj index 1aff30ff..f631d488 100644 --- a/Wabbajack.Lib/Wabbajack.Lib.csproj +++ b/Wabbajack.Lib/Wabbajack.Lib.csproj @@ -17,16 +17,13 @@ 3.1.0 - 6.2.5 + 6.2.6 all runtime; build; native; contentfiles; analyzers; buildtransitive 2.2.2.1 - - 3.1.6 - 1.11.24 @@ -69,9 +66,6 @@ 1.0.0 - - 5.1.4 - diff --git a/Wabbajack.Server.Test/VirusCheckTests.cs b/Wabbajack.Server.Test/VirusCheckTests.cs index 8683b119..6fa6f089 100644 --- a/Wabbajack.Server.Test/VirusCheckTests.cs +++ b/Wabbajack.Server.Test/VirusCheckTests.cs @@ -1,11 +1,9 @@ -using System.Net; -using System.Threading.Tasks; +using System.Threading.Tasks; using Wabbajack.BuildServer.Test; using Wabbajack.Common; using Wabbajack.Lib; using Xunit; using Xunit.Abstractions; -using Wabbajack.Common; namespace Wabbajack.Server.Test { diff --git a/Wabbajack.Server/Controllers/ModUpgrade.cs b/Wabbajack.Server/Controllers/ModUpgrade.cs index af52097c..84bc6a13 100644 --- a/Wabbajack.Server/Controllers/ModUpgrade.cs +++ b/Wabbajack.Server/Controllers/ModUpgrade.cs @@ -80,7 +80,7 @@ namespace Wabbajack.BuildServer.Controllers return NotFound("File is Valid"); } } - catch (Exception ex) + catch (Exception) { //_logger.LogInformation( // $"Refusing to upgrade ({request.OldArchive.State.PrimaryKeyString}), due to upgrade failure"); diff --git a/Wabbajack.Server/Controllers/NexusCache.cs b/Wabbajack.Server/Controllers/NexusCache.cs index aa3db466..8829812b 100644 --- a/Wabbajack.Server/Controllers/NexusCache.cs +++ b/Wabbajack.Server/Controllers/NexusCache.cs @@ -3,15 +3,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using AngleSharp.Io; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; -using Newtonsoft.Json; using Wabbajack.Common; using Wabbajack.Common.Exceptions; -using Wabbajack.Lib; using Wabbajack.Lib.NexusApi; using Wabbajack.Server.DataLayer; using Wabbajack.Server.Services; diff --git a/Wabbajack.Server/DataLayer/MirroredFiles.cs b/Wabbajack.Server/DataLayer/MirroredFiles.cs index a2ba7ac1..8d4b7265 100644 --- a/Wabbajack.Server/DataLayer/MirroredFiles.cs +++ b/Wabbajack.Server/DataLayer/MirroredFiles.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using AngleSharp.Common; using Dapper; using Wabbajack.Common; using Wabbajack.Lib.Downloaders; diff --git a/Wabbajack.Server/Services/AbstractService.cs b/Wabbajack.Server/Services/AbstractService.cs index f54b9d6a..297bc3c9 100644 --- a/Wabbajack.Server/Services/AbstractService.cs +++ b/Wabbajack.Server/Services/AbstractService.cs @@ -17,7 +17,6 @@ namespace Wabbajack.Server.Services private TimeSpan _delay; protected ILogger _logger; protected QuickSync _quickSync; - private bool _isSetup; public AbstractService(ILogger logger, AppSettings settings, QuickSync quickSync, TimeSpan delay) { @@ -26,7 +25,6 @@ namespace Wabbajack.Server.Services _logger = logger; _quickSync = quickSync; - _isSetup = false; } public virtual async Task Setup() @@ -42,7 +40,6 @@ namespace Wabbajack.Server.Services Task.Run(async () => { await Setup(); - _isSetup = true; while (true) diff --git a/Wabbajack.Server/Services/DiscordWebHook.cs b/Wabbajack.Server/Services/DiscordWebHook.cs index 8571b544..bb240aae 100644 --- a/Wabbajack.Server/Services/DiscordWebHook.cs +++ b/Wabbajack.Server/Services/DiscordWebHook.cs @@ -19,8 +19,6 @@ namespace Wabbajack.Server.Services } public class DiscordWebHook : AbstractService { - private AppSettings _settings; - private ILogger _logger; private Random _random = new Random(); public DiscordWebHook(ILogger logger, AppSettings settings, QuickSync quickSync) : base(logger, settings, quickSync, TimeSpan.FromHours(1)) diff --git a/Wabbajack.Server/Services/ListValidator.cs b/Wabbajack.Server/Services/ListValidator.cs index cf9fcca5..3e98aff6 100644 --- a/Wabbajack.Server/Services/ListValidator.cs +++ b/Wabbajack.Server/Services/ListValidator.cs @@ -345,7 +345,7 @@ namespace Wabbajack.Server.Services { await _sql.AddNexusModInfo(ns.Game, ns.ModID, queryTime, mod); } - catch (Exception _) + catch (Exception) { // Could be a PK constraint failure } @@ -368,13 +368,13 @@ namespace Wabbajack.Server.Services { await _sql.AddNexusModFiles(ns.Game, ns.ModID, queryTime, files); } - catch (Exception _) + catch (Exception) { // Could be a PK constraint failure } } } - catch (Exception ex) + catch (Exception) { return ArchiveStatus.InValid; } diff --git a/Wabbajack.Server/Services/ModListDownloader.cs b/Wabbajack.Server/Services/ModListDownloader.cs index f18dc957..a3815bba 100644 --- a/Wabbajack.Server/Services/ModListDownloader.cs +++ b/Wabbajack.Server/Services/ModListDownloader.cs @@ -118,7 +118,7 @@ namespace Wabbajack.Server.Services { modlist = entry.FromJson(); } - catch (JsonReaderException ex) + catch (JsonReaderException) { _logger.LogWarning($"Bad Modlist {list.Links.MachineURL}"); await _discord.Send(Channel.Ham, diff --git a/Wabbajack.Server/Services/NexusKeyMaintainance.cs b/Wabbajack.Server/Services/NexusKeyMaintainance.cs index 969248b9..4f37ef30 100644 --- a/Wabbajack.Server/Services/NexusKeyMaintainance.cs +++ b/Wabbajack.Server/Services/NexusKeyMaintainance.cs @@ -52,7 +52,7 @@ namespace Wabbajack.Server.Services var (daily, hourly) = await client.GetRemainingApiCalls(); await _sql.SetNexusAPIKey(key.Key, daily, hourly); } - catch (Exception ex) + catch (Exception) { _logger.Log(LogLevel.Warning, "Update error, purging API key"); await _sql.DeleteNexusAPIKey(key.Key); @@ -82,7 +82,7 @@ namespace Wabbajack.Server.Services var hourlyRemaining = int.Parse(response.Headers.GetValues("x-rl-hourly-remaining").First()); await _sql.SetNexusAPIKey(ApiKey, dailyRemaining, hourlyRemaining); } - catch (Exception ex) + catch (Exception) { } } diff --git a/Wabbajack.Server/Services/NexusPoll.cs b/Wabbajack.Server/Services/NexusPoll.cs index d7d90950..5674f933 100644 --- a/Wabbajack.Server/Services/NexusPoll.cs +++ b/Wabbajack.Server/Services/NexusPoll.cs @@ -35,7 +35,6 @@ namespace Wabbajack.Server.Services _logger.Log(LogLevel.Information, "Starting"); var results = await NexusUpdatesFeeds.GetUpdates(); - NexusApiClient client = null; long updated = 0; foreach (var result in results) { diff --git a/Wabbajack.Server/Services/PatchBuilder.cs b/Wabbajack.Server/Services/PatchBuilder.cs index 47878007..20513046 100644 --- a/Wabbajack.Server/Services/PatchBuilder.cs +++ b/Wabbajack.Server/Services/PatchBuilder.cs @@ -170,11 +170,11 @@ namespace Wabbajack.Server.Services var lst = p.Split("_", StringSplitOptions.RemoveEmptyEntries).Select(Hash.FromHex).ToArray(); return (lst[0], lst[1]); } - catch (ArgumentException ex) + catch (ArgumentException) { return default; } - catch (FormatException ex) + catch (FormatException) { return default; } diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index bf7f1b5d..27d11d2e 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe netcoreapp3.1 - 2.3.0.0 - 2.3.0.0 + 2.3.0.1 + 2.3.0.1 Copyright © 2019-2020 Wabbajack Server win-x64 diff --git a/Wabbajack.VirtualFileSystem.Test/FileExtractorTests.cs b/Wabbajack.VirtualFileSystem.Test/FileExtractorTests.cs index 68027eb9..e3711b0b 100644 --- a/Wabbajack.VirtualFileSystem.Test/FileExtractorTests.cs +++ b/Wabbajack.VirtualFileSystem.Test/FileExtractorTests.cs @@ -25,7 +25,7 @@ namespace Wabbajack.VirtualFileSystem.Test { _helper.WriteLine(f.ShortDescription); } - catch (Exception _) + catch (Exception) { // ignored } diff --git a/Wabbajack.VirtualFileSystem.Test/VirtualFileSystemTests.cs b/Wabbajack.VirtualFileSystem.Test/VirtualFileSystemTests.cs index a69cc2bb..2444ab06 100644 --- a/Wabbajack.VirtualFileSystem.Test/VirtualFileSystemTests.cs +++ b/Wabbajack.VirtualFileSystem.Test/VirtualFileSystemTests.cs @@ -31,7 +31,7 @@ namespace Wabbajack.VirtualFileSystem.Test { _helper.WriteLine(f.ShortDescription); } - catch (Exception ex) + catch (Exception) { // ignored } diff --git a/Wabbajack.VirtualFileSystem/Context.cs b/Wabbajack.VirtualFileSystem/Context.cs index 3e93232b..dd6015b3 100644 --- a/Wabbajack.VirtualFileSystem/Context.cs +++ b/Wabbajack.VirtualFileSystem/Context.cs @@ -202,6 +202,7 @@ namespace Wabbajack.VirtualFileSystem /// Extract the set of files and call the callback for each, handing it a stream factory and the virtual file, /// top level archives (native archives) will be processed in parallel. Duplicate files will not be /// + /// < /// /// /// diff --git a/Wabbajack.VirtualFileSystem/SevenZipExtractor/ArchiveFile.cs b/Wabbajack.VirtualFileSystem/SevenZipExtractor/ArchiveFile.cs index 438f163a..61033e8b 100644 --- a/Wabbajack.VirtualFileSystem/SevenZipExtractor/ArchiveFile.cs +++ b/Wabbajack.VirtualFileSystem/SevenZipExtractor/ArchiveFile.cs @@ -49,7 +49,7 @@ namespace Wabbajack.VirtualFileSystem.SevenZipExtractor { setter = (ISetProperties)_archive; } - catch (InvalidCastException _) + catch (InvalidCastException) { return; } diff --git a/Wabbajack.VirtualFileSystem/SevenZipExtractor/SevenZipInterface.cs b/Wabbajack.VirtualFileSystem/SevenZipExtractor/SevenZipInterface.cs index 9f458415..dfd5dcd4 100644 --- a/Wabbajack.VirtualFileSystem/SevenZipExtractor/SevenZipInterface.cs +++ b/Wabbajack.VirtualFileSystem/SevenZipExtractor/SevenZipInterface.cs @@ -454,31 +454,4 @@ namespace Wabbajack.VirtualFileSystem.SevenZipExtractor return (uint) this.BaseStream.Read(data, 0, (int) size); } } - - internal class OutStreamWrapper : StreamWrapper, ISequentialOutStream, IOutStream - { - public OutStreamWrapper(Stream baseStream) : base(baseStream) - { - } - - public int SetSize(long newSize) - { - this.BaseStream.SetLength(newSize); - return 0; - } - - public int Write(byte[] data, uint size, IntPtr processedSize) - { - throw new NotImplementedException(); - /* - this.BaseStream.Write(data, 0, (int) size); - - if (processedSize != IntPtr.Zero) - { - Marshal.WriteInt32(processedSize, (int) size); - } -*/ - return 0; - } - } } diff --git a/Wabbajack.VirtualFileSystem/VirtualFile.cs b/Wabbajack.VirtualFileSystem/VirtualFile.cs index 10cbf753..ef852831 100644 --- a/Wabbajack.VirtualFileSystem/VirtualFile.cs +++ b/Wabbajack.VirtualFileSystem/VirtualFile.cs @@ -23,8 +23,6 @@ namespace Wabbajack.VirtualFileSystem _vfsCache = RocksDb.Open(options, (string)Consts.LocalAppDataPath.Combine("GlobalVFSCache2.rocksDb")); } - private AbsolutePath _stagedPath; - private IEnumerable _thisAndAllChildren; public IPath Name { get; internal set; } diff --git a/Wabbajack/View Models/Installers/InstallerVM.cs b/Wabbajack/View Models/Installers/InstallerVM.cs index fc8bb827..2b50cd06 100644 --- a/Wabbajack/View Models/Installers/InstallerVM.cs +++ b/Wabbajack/View Models/Installers/InstallerVM.cs @@ -212,7 +212,7 @@ namespace Wabbajack { if (modList == null) return ErrorResponse.Fail("Modlist path resulted in a null object."); if (modList.Error != null) return ErrorResponse.Fail("Modlist is corrupt", modList.Error); - if (modList.WabbajackVersion != null && modList.WabbajackVersion > Consts.CurrentWabbajackVersion) + if (modList.WabbajackVersion != null && modList.WabbajackVersion > Consts.CurrentMinimumWabbajackVersion) return ErrorResponse.Fail("The Modlist you are trying to install was made using a newer Version of Wabbajack. Please update Wabbajack before installing!"); return ErrorResponse.Success; }); diff --git a/Wabbajack/View Models/MainWindowVM.cs b/Wabbajack/View Models/MainWindowVM.cs index 7228dc89..71f399c7 100644 --- a/Wabbajack/View Models/MainWindowVM.cs +++ b/Wabbajack/View Models/MainWindowVM.cs @@ -120,7 +120,7 @@ namespace Wabbajack { var assembly = Assembly.GetExecutingAssembly(); var fvi = FileVersionInfo.GetVersionInfo(assembly.Location); - Consts.CurrentWabbajackVersion = Version.Parse(fvi.FileVersion); + Consts.CurrentMinimumWabbajackVersion = Version.Parse(fvi.FileVersion); VersionDisplay = $"v{fvi.FileVersion}"; Utils.Log($"Wabbajack Version: {fvi.FileVersion}"); diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index 83131eea..8bc1cc10 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.3.0.0 - 2.3.0.0 + 2.3.0.1 + 2.3.0.1 Copyright © 2019-2020 An automated ModList installer true