Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix for breaking existing lists

Browse Source
This commit is contained in:
halgari 2020-08-20 20:45:15 -06:00
parent 96f3c89b55
commit cf1c62b7c7
8 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,5 +1,8 @@
### Changelog ### 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 #### Version - 2.2.1.2 - 8/20/2020
* Added `WABBAJACK_ALWAYS_DISABLE` flag (see Readme for more info) * 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 * Modlist can't be installed if the current Wabbajack Version is smaller than the Version used during Compilation of the Modlist

4
Wabbajack.CLI/Wabbajack.CLI.csproj
View File

@ -6,8 +6,8 @@
<AssemblyName>wabbajack-cli</AssemblyName> <AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company> <Company>Wabbajack</Company>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyVersion>2.2.1.2</AssemblyVersion> <AssemblyVersion>2.2.1.3</AssemblyVersion>
<FileVersion>2.2.1.2</FileVersion> <FileVersion>2.2.1.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

4
Wabbajack.Launcher/Wabbajack.Launcher.csproj
View File

@ -4,8 +4,8 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<AssemblyVersion>2.2.1.2</AssemblyVersion> <AssemblyVersion>2.2.1.3</AssemblyVersion>
<FileVersion>2.2.1.2</FileVersion> <FileVersion>2.2.1.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description> <Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>

2
Wabbajack.Lib/MO2Compiler.cs
View File

@ -337,7 +337,7 @@ namespace Wabbajack.Lib
ModList = new ModList ModList = new ModList
{ {
GameType = CompilingGame.Game, GameType = CompilingGame.Game,
WabbajackVersion = WabbajackVersion, WabbajackVersion = Consts.CurrentWabbajackVersion,
Archives = SelectedArchives.ToList(), Archives = SelectedArchives.ToList(),
ModManager = ModManager.MO2, ModManager = ModManager.MO2,
Directives = InstallDirectives, Directives = InstallDirectives,

4
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyVersion>2.2.1.2</AssemblyVersion> <AssemblyVersion>2.2.1.3</AssemblyVersion>
<FileVersion>2.2.1.2</FileVersion> <FileVersion>2.2.1.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description> <Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>

2
Wabbajack/View Models/Installers/InstallerVM.cs
View File

@ -212,7 +212,7 @@ namespace Wabbajack
{ {
if (modList == null) return ErrorResponse.Fail("Modlist path resulted in a null object."); 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.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.Fail("The Modlist you are trying to install was made using a newer Version of Wabbajack. Please update Wabbajack before installing!");
return ErrorResponse.Success; return ErrorResponse.Success;
}); });

1
Wabbajack/View Models/ModListVM.cs
View File

@ -22,6 +22,7 @@ namespace Wabbajack
public Uri Website => SourceModList?.Website; public Uri Website => SourceModList?.Website;
public ModManager ModManager => SourceModList?.ModManager ?? ModManager.MO2; public ModManager ModManager => SourceModList?.ModManager ?? ModManager.MO2;
public Version Version => SourceModList?.Version; public Version Version => SourceModList?.Version;
public Version WabbajackVersion => SourceModList?.WabbajackVersion;
public bool IsNSFW => SourceModList?.IsNSFW ?? false; public bool IsNSFW => SourceModList?.IsNSFW ?? false;
// Image isn't exposed as a direct property, but as an observable. // Image isn't exposed as a direct property, but as an observable.

4
Wabbajack/Wabbajack.csproj
View File

@ -6,8 +6,8 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.2.1.2</AssemblyVersion> <AssemblyVersion>2.2.1.3</AssemblyVersion>
<FileVersion>2.2.1.2</FileVersion> <FileVersion>2.2.1.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright> <Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description> <Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun> <PublishReadyToRun>true</PublishReadyToRun>