diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59936cca..871aa8f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
### Changelog
+#### Version - 2.0.4.2 - 5/10/2020
+* Hotfix: allow the WJ CDN to be used for gallery modlists
+* Fix a bug with the CDN downloader and modlist compilation
+
#### Version - 2.0.4.1 - 5/10/2020
* Hotfix: don't throw a compilation exceptions when metas can't be inferred
diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj
index ae6ca940..487bda6b 100644
--- a/Wabbajack.CLI/Wabbajack.CLI.csproj
+++ b/Wabbajack.CLI/Wabbajack.CLI.csproj
@@ -6,8 +6,8 @@
wabbajack-cli
Wabbajack
x64
- 2.0.4.1
- 2.0.4.1
+ 2.0.4.2
+ 2.0.4.2
Copyright © 2019-2020
An automated ModList installer
true
diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj
index 58162f3c..c468a354 100644
--- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj
+++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj
@@ -4,8 +4,8 @@
WinExe
netcoreapp3.1
true
- 2.0.4.1
- 2.0.4.1
+ 2.0.4.2
+ 2.0.4.2
Copyright © 2019-2020
Wabbajack Application Launcher
true
diff --git a/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs b/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs
index d0a8720b..b41a595f 100644
--- a/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs
+++ b/Wabbajack.Lib/Downloaders/WabbajackCDNDownloader.cs
@@ -12,7 +12,7 @@ using Wabbajack.Lib.Validation;
namespace Wabbajack.Lib.Downloaders
{
- public class WabbajackCDNDownloader : IDownloader
+ public class WabbajackCDNDownloader : IDownloader, IUrlDownloader
{
public async Task GetDownloaderState(dynamic archiveINI, bool quickMode = false)
{
@@ -24,7 +24,12 @@ namespace Wabbajack.Lib.Downloaders
{
}
-
+ public AbstractDownloadState? GetDownloaderState(string url)
+ {
+ return StateFromUrl(new Uri(url));
+ }
+
+
public static AbstractDownloadState? StateFromUrl(Uri url)
{
if (url.Host == "wabbajacktest.b-cdn.net" || url.Host == "wabbajack.b-cdn.net")
diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj
index cb89131f..4ec7ed2a 100644
--- a/Wabbajack.Server/Wabbajack.Server.csproj
+++ b/Wabbajack.Server/Wabbajack.Server.csproj
@@ -3,8 +3,8 @@
Exe
netcoreapp3.1
- 2.0.4.1
- 2.0.4.1
+ 2.0.4.2
+ 2.0.4.2
Copyright © 2019-2020
Wabbajack Server
win-x64
diff --git a/Wabbajack.Test/TestUtils.cs b/Wabbajack.Test/TestUtils.cs
index b7175090..6ce97b00 100644
--- a/Wabbajack.Test/TestUtils.cs
+++ b/Wabbajack.Test/TestUtils.cs
@@ -216,8 +216,17 @@ namespace Wabbajack.Test
return InstallFolder.Combine((string)Consts.MO2ModFolderName, mod, file);
}
- public void VerifyAllFiles()
+ public void VerifyAllFiles(bool gameFileShouldNotExistInGameFolder = true)
{
+ if (gameFileShouldNotExistInGameFolder)
+ {
+ foreach (var file in Game.MetaData().RequiredFiles!)
+ {
+ Assert.False(InstallFolder.Combine(Consts.GameFolderFilesDir, (RelativePath)file).Exists);
+ }
+ }
+
+
var skipFiles = new []{"portable.txt"}.Select(e => (RelativePath)e).ToHashSet();
foreach (var destFile in InstallFolder.EnumerateFiles())
{
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index 89af1e7b..a87a9507 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -6,8 +6,8 @@
true
x64
win10-x64
- 2.0.4.1
- 2.0.4.1
+ 2.0.4.2
+ 2.0.4.2
Copyright © 2019-2020
An automated ModList installer
true