From cf1c62b7c77be3f663f4787a73cc6d84ab4e56bf Mon Sep 17 00:00:00 2001 From: halgari Date: Thu, 20 Aug 2020 20:45:15 -0600 Subject: [PATCH] Hotfix for breaking existing lists --- CHANGELOG.md | 3 +++ Wabbajack.CLI/Wabbajack.CLI.csproj | 4 ++-- Wabbajack.Launcher/Wabbajack.Launcher.csproj | 4 ++-- Wabbajack.Lib/MO2Compiler.cs | 2 +- Wabbajack.Server/Wabbajack.Server.csproj | 4 ++-- Wabbajack/View Models/Installers/InstallerVM.cs | 2 +- Wabbajack/View Models/ModListVM.cs | 1 + Wabbajack/Wabbajack.csproj | 4 ++-- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b29fcca..cd9d5117 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ### Changelog +#### Version - 2.2.1.3 - 8/20/2020 +* HOTFIX - We broke installation of existing lists...let's stop doing that + #### Version - 2.2.1.2 - 8/20/2020 * Added `WABBAJACK_ALWAYS_DISABLE` flag (see Readme for more info) * Modlist can't be installed if the current Wabbajack Version is smaller than the Version used during Compilation of the Modlist diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index 2fd22fb0..aba919e5 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.2.1.2 - 2.2.1.2 + 2.2.1.3 + 2.2.1.3 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index 005ca340..e1c80b2a 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -4,8 +4,8 @@ WinExe netcoreapp3.1 true - 2.2.1.2 - 2.2.1.2 + 2.2.1.3 + 2.2.1.3 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Lib/MO2Compiler.cs b/Wabbajack.Lib/MO2Compiler.cs index 708a2f2e..6a3651bc 100644 --- a/Wabbajack.Lib/MO2Compiler.cs +++ b/Wabbajack.Lib/MO2Compiler.cs @@ -337,7 +337,7 @@ namespace Wabbajack.Lib ModList = new ModList { GameType = CompilingGame.Game, - WabbajackVersion = WabbajackVersion, + WabbajackVersion = Consts.CurrentWabbajackVersion, Archives = SelectedArchives.ToList(), ModManager = ModManager.MO2, Directives = InstallDirectives, diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index cbfea2f9..2e9f8225 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe netcoreapp3.1 - 2.2.1.2 - 2.2.1.2 + 2.2.1.3 + 2.2.1.3 Copyright © 2019-2020 Wabbajack Server win-x64 diff --git a/Wabbajack/View Models/Installers/InstallerVM.cs b/Wabbajack/View Models/Installers/InstallerVM.cs index fcf2c997..b1cf02a8 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.Version != null && modList.Version > Consts.CurrentWabbajackVersion) + if (modList.WabbajackVersion != null && modList.Version > Consts.CurrentWabbajackVersion) 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/ModListVM.cs b/Wabbajack/View Models/ModListVM.cs index 67c6f345..ed20c653 100644 --- a/Wabbajack/View Models/ModListVM.cs +++ b/Wabbajack/View Models/ModListVM.cs @@ -22,6 +22,7 @@ namespace Wabbajack public Uri Website => SourceModList?.Website; public ModManager ModManager => SourceModList?.ModManager ?? ModManager.MO2; public Version Version => SourceModList?.Version; + public Version WabbajackVersion => SourceModList?.WabbajackVersion; public bool IsNSFW => SourceModList?.IsNSFW ?? false; // Image isn't exposed as a direct property, but as an observable. diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index aaa2df95..1d549dec 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.2.1.2 - 2.2.1.2 + 2.2.1.3 + 2.2.1.3 Copyright © 2019-2020 An automated ModList installer true