From 0f6975e4e5be405e7c6282bc82bd7fbb428b2e4e Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Mon, 12 Apr 2021 19:17:03 -0600 Subject: [PATCH 1/3] 2.4.3.3 --- CHANGELOG.md | 5 +++++ Wabbajack.CLI/Wabbajack.CLI.csproj | 4 ++-- Wabbajack.Common/Wabbajack.Common.csproj | 2 +- Wabbajack.Launcher/Wabbajack.Launcher.csproj | 4 ++-- Wabbajack.Lib/Wabbajack.Lib.csproj | 10 ++++----- .../Controllers/AuthorControls.cs | 22 +++++-------------- .../Controllers/Templates/AuthorControls.html | 9 ++++++++ Wabbajack.Server/Wabbajack.Server.csproj | 11 ++++++---- Wabbajack.Test/Wabbajack.Test.csproj | 4 ++-- Wabbajack/Wabbajack.csproj | 18 +++++++-------- 10 files changed, 48 insertions(+), 41 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 368c5c6a..5df6c40a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ### Changelog +#### Version - 2.4.3.3 - 4/12/2021 +* Default to a "Wabbajack" user agent when making HTTP calls +* Some niceties for Mod authors uploading to our CDN +* upgrade several external dependencies + #### Version - 2.4.3.2 - 4/1/2021 * Fix for crashing when WJ is installed in the root drive * Vortex is now the only option for WJ modlists, down with MO2, purge the xenos, praise to the Emperor diff --git a/Wabbajack.CLI/Wabbajack.CLI.csproj b/Wabbajack.CLI/Wabbajack.CLI.csproj index eaa39b1e..75ffd9a4 100644 --- a/Wabbajack.CLI/Wabbajack.CLI.csproj +++ b/Wabbajack.CLI/Wabbajack.CLI.csproj @@ -6,8 +6,8 @@ wabbajack-cli Wabbajack x64 - 2.4.3.2 - 2.4.3.2 + 2.4.3.3 + 2.4.3.3 Copyright © 2019-2020 An automated ModList installer true diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj index 0f195097..953d1c7c 100644 --- a/Wabbajack.Common/Wabbajack.Common.csproj +++ b/Wabbajack.Common/Wabbajack.Common.csproj @@ -62,7 +62,7 @@ - + diff --git a/Wabbajack.Launcher/Wabbajack.Launcher.csproj b/Wabbajack.Launcher/Wabbajack.Launcher.csproj index 25b97d38..d176fcbe 100644 --- a/Wabbajack.Launcher/Wabbajack.Launcher.csproj +++ b/Wabbajack.Launcher/Wabbajack.Launcher.csproj @@ -4,8 +4,8 @@ Exe net5.0-windows true - 2.4.3.2 - 2.4.3.2 + 2.4.3.3 + 2.4.3.3 Copyright © 2019-2020 Wabbajack Application Launcher true diff --git a/Wabbajack.Lib/Wabbajack.Lib.csproj b/Wabbajack.Lib/Wabbajack.Lib.csproj index fb79352d..88afd99c 100644 --- a/Wabbajack.Lib/Wabbajack.Lib.csproj +++ b/Wabbajack.Lib/Wabbajack.Lib.csproj @@ -8,16 +8,16 @@ - 88.2.90 + 89.0.170 - 88.2.90 + 89.0.170 4.0.0 - 6.5.0 + 6.5.1 all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -37,10 +37,10 @@ 2.1.1 - 13.2.10 + 13.2.18 - 13.2.10 + 13.2.18 0.28.1 diff --git a/Wabbajack.Server/Controllers/AuthorControls.cs b/Wabbajack.Server/Controllers/AuthorControls.cs index 059b20d9..2c550109 100644 --- a/Wabbajack.Server/Controllers/AuthorControls.cs +++ b/Wabbajack.Server/Controllers/AuthorControls.cs @@ -36,22 +36,12 @@ namespace Wabbajack.BuildServer.Controllers return Redirect($"{Consts.WabbajackBuildServerUri}author_controls/home"); } - private static Func _homePageTemplate; - - private static Func HomePageTemplate + private static async Task HomePageTemplate(object o) { - get - { - if (_homePageTemplate == null) - { - var resource = Assembly.GetExecutingAssembly() - .GetManifestResourceStream("Wabbajack.Server.Controllers.Templates.AuthorControls.html")! - .ReadAll(); - _homePageTemplate = NettleEngine.GetCompiler().Compile(Encoding.UTF8.GetString(resource)); - } - - return _homePageTemplate; - } + var data = await AbsolutePath.EntryPoint.Combine(@"Controllers\Templates\AuthorControls.html") + .ReadAllTextAsync(); + var func = NettleEngine.GetCompiler().Compile(data); + return func(o); } [Route("home")] @@ -84,7 +74,7 @@ namespace Wabbajack.BuildServer.Controllers return new ContentResult { ContentType = "text/html", StatusCode = (int)HttpStatusCode.OK, - Content = result}; + Content = await result}; } } } diff --git a/Wabbajack.Server/Controllers/Templates/AuthorControls.html b/Wabbajack.Server/Controllers/Templates/AuthorControls.html index 777c119d..2b3ac7a3 100644 --- a/Wabbajack.Server/Controllers/Templates/AuthorControls.html +++ b/Wabbajack.Server/Controllers/Templates/AuthorControls.html @@ -10,6 +10,7 @@

Wabbajack Files - {{$.TotalUsage}}

+ @@ -17,10 +18,12 @@ {{each $.WabbajackFiles }} + + {{/each}}
Commands Name Size Finished Uploading
{{$.Name}} {{$.Size}} {{$.UploadedDate}} {{$.MangledName}}
@@ -28,13 +31,16 @@

Other Files

+ + {{each $.OtherFiles }} + @@ -42,5 +48,8 @@ {{/each}}
Commands Name Size Finished Uploading Unique Name
{{$.Name}} {{$.Size}} {{$.UploadedDate}}
+ \ No newline at end of file diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index 6eec3924..8b87f69c 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -3,8 +3,8 @@ Exe net5.0-windows - 2.4.3.2 - 2.4.3.2 + 2.4.3.3 + 2.4.3.3 Copyright © 2019-2020 Wabbajack Server win-x64 @@ -16,9 +16,9 @@ - + - + @@ -39,6 +39,9 @@ PreserveNewest + + PreserveNewest + diff --git a/Wabbajack.Test/Wabbajack.Test.csproj b/Wabbajack.Test/Wabbajack.Test.csproj index 5d233d2a..1cacc260 100644 --- a/Wabbajack.Test/Wabbajack.Test.csproj +++ b/Wabbajack.Test/Wabbajack.Test.csproj @@ -28,8 +28,8 @@ - - + + diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj index 0f4ea1a1..462150fc 100644 --- a/Wabbajack/Wabbajack.csproj +++ b/Wabbajack/Wabbajack.csproj @@ -6,8 +6,8 @@ true x64 win10-x64 - 2.4.3.2 - 2.4.3.2 + 2.4.3.3 + 2.4.3.3 Copyright © 2019-2020 An automated ModList installer true @@ -55,12 +55,12 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -74,9 +74,9 @@ - - - + + + From 5e6285bad08fe27b282db30762da58ca28d89d01 Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Mon, 12 Apr 2021 20:20:23 -0600 Subject: [PATCH 2/3] Fix build that broke for some reason --- Wabbajack.App.Test/Wabbajack.App.Test.csproj | 6 +++++- Wabbajack.sln | 9 +-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Wabbajack.App.Test/Wabbajack.App.Test.csproj b/Wabbajack.App.Test/Wabbajack.App.Test.csproj index acd5670e..8fa48858 100644 --- a/Wabbajack.App.Test/Wabbajack.App.Test.csproj +++ b/Wabbajack.App.Test/Wabbajack.App.Test.csproj @@ -2,7 +2,7 @@ net5.0-windows - + x64 false @@ -14,6 +14,10 @@ + + x64 + + diff --git a/Wabbajack.sln b/Wabbajack.sln index bcd18b18..0354c117 100644 --- a/Wabbajack.sln +++ b/Wabbajack.sln @@ -141,14 +141,6 @@ Global {BA8A3E49-60D2-4BA2-B285-CB09FFDB6D32}.Release|Any CPU.ActiveCfg = Release|x64 {BA8A3E49-60D2-4BA2-B285-CB09FFDB6D32}.Release|x64.ActiveCfg = Release|x64 {BA8A3E49-60D2-4BA2-B285-CB09FFDB6D32}.Release|x64.Build.0 = Release|x64 - {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Debug|x64.ActiveCfg = Debug|Any CPU - {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Debug|x64.Build.0 = Debug|Any CPU - {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Release|Any CPU.Build.0 = Release|Any CPU - {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Release|x64.ActiveCfg = Release|Any CPU - {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Release|x64.Build.0 = Release|Any CPU {3E11B700-8405-433D-BF47-6C356087A7C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E11B700-8405-433D-BF47-6C356087A7C2}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E11B700-8405-433D-BF47-6C356087A7C2}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -165,6 +157,7 @@ Global {9DEC8DC8-B6E0-469B-9571-C4BAC0776D07}.Release|Any CPU.Build.0 = Release|Any CPU {9DEC8DC8-B6E0-469B-9571-C4BAC0776D07}.Release|x64.ActiveCfg = Release|Any CPU {9DEC8DC8-B6E0-469B-9571-C4BAC0776D07}.Release|x64.Build.0 = Release|Any CPU + {44E30B97-D4A8-40A6-81D5-5CAB1F3D45CB}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 0e4598ac973b9e25271a82a7febcb97a5f584969 Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Mon, 12 Apr 2021 21:21:06 -0600 Subject: [PATCH 3/3] Fix broken test --- Wabbajack.Server/Wabbajack.Server.csproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Wabbajack.Server/Wabbajack.Server.csproj b/Wabbajack.Server/Wabbajack.Server.csproj index 8b87f69c..47d9832e 100644 --- a/Wabbajack.Server/Wabbajack.Server.csproj +++ b/Wabbajack.Server/Wabbajack.Server.csproj @@ -42,6 +42,9 @@ PreserveNewest + + PreserveNewest + @@ -49,8 +52,6 @@ - -