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

Merge pull request #1417 from wabbajack-tools/2.4.3.3

Browse Source 
2.4.3.3
This commit is contained in:
Timothy Baldridge 2021-04-12 21:31:00 -07:00 committed by GitHub
commit 89874fd28b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 57 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -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

6
Wabbajack.App.Test/Wabbajack.App.Test.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net5.0-windows</TargetFramework>
<Platforms>x64</Platforms>
<IsPackable>false</IsPackable>
</PropertyGroup>
@ -14,6 +14,10 @@
<PackageReference Include="Xunit.StaFact" Version="1.0.37" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Wabbajack\Wabbajack.csproj" />
</ItemGroup>

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

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

2
Wabbajack.Common/Wabbajack.Common.csproj
View File

@ -62,7 +62,7 @@
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="5.0.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Include="YamlDotNet" Version="11.0.1" />
<PackageReference Include="YamlDotNet" Version="11.1.1" />
</ItemGroup>
<ItemGroup>
<Compile Update="Serialization\PrimitiveHandlers.cs">

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

@ -4,8 +4,8 @@
<OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<AssemblyVersion>2.4.3.2</AssemblyVersion>
<FileVersion>2.4.3.2</FileVersion>
<AssemblyVersion>2.4.3.3</AssemblyVersion>
<FileVersion>2.4.3.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun>

10
Wabbajack.Lib/Wabbajack.Lib.csproj
View File

@ -8,16 +8,16 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common">
<Version>88.2.90</Version>
<Version>89.0.170</Version>
</PackageReference>
<PackageReference Include="CefSharp.OffScreen">
<Version>88.2.90</Version>
<Version>89.0.170</Version>
</PackageReference>
<PackageReference Include="F23.StringSimilarity">
<Version>4.0.0</Version>
</PackageReference>
<PackageReference Include="Fody">
<Version>6.5.0</Version>
<Version>6.5.1</Version>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -37,10 +37,10 @@
<Version>2.1.1</Version>
</PackageReference>
<PackageReference Include="ReactiveUI">
<Version>13.2.10</Version>
<Version>13.2.18</Version>
</PackageReference>
<PackageReference Include="ReactiveUI.Fody">
<Version>13.2.10</Version>
<Version>13.2.18</Version>
</PackageReference>
<PackageReference Include="SharpCompress">
<Version>0.28.1</Version>

22
Wabbajack.Server/Controllers/AuthorControls.cs
View File

@ -36,22 +36,12 @@ namespace Wabbajack.BuildServer.Controllers
return Redirect($"{Consts.WabbajackBuildServerUri}author_controls/home");
}
private static Func<object, string> _homePageTemplate;
private static Func<object, string> HomePageTemplate
private static async Task<string> 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};
}
}
}

9
Wabbajack.Server/Controllers/Templates/AuthorControls.html
View File

@ -10,6 +10,7 @@
<h3>Wabbajack Files - {{$.TotalUsage}}</h3>
<table>
<tr>
<td><b>Commands</b></td>
<td><b>Name</b></td>
<td><b>Size</b></td>
<td><b>Finished Uploading</b></td>
@ -17,10 +18,12 @@
</tr>
{{each $.WabbajackFiles }}
<tr>
<td><button>Delete</button></td>
<td>{{$.Name}}</td>
<td>{{$.Size}}</td>
<td>{{$.UploadedDate}}</td>
<td>{{$.MangledName}}</td>
</tr>
{{/each}}
</table>
@ -28,13 +31,16 @@
<h3>Other Files</h3>
<table>
<tr>
<td><b>Commands</b></td>
<td><b>Name</b></td>
<td><b>Size</b></td>
<td><b>Finished Uploading</b></td>
<td><b>Unique Name</b></td>
</tr>
{{each $.OtherFiles }}
<tr>
<td><button>Delete</button></td>
<td>{{$.Name}}</td>
<td>{{$.Size}}</td>
<td>{{$.UploadedDate}}</td>
@ -42,5 +48,8 @@
</tr>
{{/each}}
</table>
<script lang="javascript">
</script>
</body>
</html>

16
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -3,8 +3,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework>
<AssemblyVersion>2.4.3.2</AssemblyVersion>
<FileVersion>2.4.3.2</FileVersion>
<AssemblyVersion>2.4.3.3</AssemblyVersion>
<FileVersion>2.4.3.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
@ -16,9 +16,9 @@
<ItemGroup>
<PackageReference Include="Dapper" Version="2.0.78" />
<PackageReference Include="Discord.Net.WebSocket" Version="2.3.1" />
<PackageReference Include="FluentFTP" Version="33.1.4" />
<PackageReference Include="FluentFTP" Version="33.1.5" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.5" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Nettle" Version="1.3.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
@ -39,6 +39,12 @@
<None Update="public\metrics.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Controllers\Templates\AuthorControls.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Controllers\Templates\AuthorControls.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
@ -46,8 +52,6 @@
<EmbeddedResource Include="sheo_quotes.txt" />
<None Remove="Controllers\Templates\TotalListTemplate.html" />
<EmbeddedResource Include="Controllers\Templates\TotalListTemplate.html" />
<None Remove="Controllers\Templates\AuthorControls.html" />
<EmbeddedResource Include="Controllers\Templates\AuthorControls.html" />
</ItemGroup>
<ItemGroup>

4
Wabbajack.Test/Wabbajack.Test.csproj
View File

@ -28,8 +28,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common.NETCore" Version="88.2.90" />
<PackageReference Include="CefSharp.OffScreen.NETCore" Version="88.2.90" />
<PackageReference Include="CefSharp.Common.NETCore" Version="89.0.170" />
<PackageReference Include="CefSharp.OffScreen.NETCore" Version="89.0.170" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

9
Wabbajack.sln
View File

@ -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

18
Wabbajack/Wabbajack.csproj
View File

@ -6,8 +6,8 @@
<UseWPF>true</UseWPF>
<Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<AssemblyVersion>2.4.3.2</AssemblyVersion>
<FileVersion>2.4.3.2</FileVersion>
<AssemblyVersion>2.4.3.3</AssemblyVersion>
<FileVersion>2.4.3.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright>
<Description>An automated ModList installer</Description>
<PublishReadyToRun>true</PublishReadyToRun>
@ -55,12 +55,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="cef.redist.x64" Version="89.0.14" />
<PackageReference Include="CefSharp.Common" Version="88.2.90" />
<PackageReference Include="CefSharp.Wpf" Version="88.2.90" />
<PackageReference Include="cef.redist.x64" Version="89.0.17" />
<PackageReference Include="CefSharp.Common" Version="89.0.170" />
<PackageReference Include="CefSharp.Wpf" Version="89.0.170" />
<PackageReference Include="DynamicData" Version="7.1.1" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.2" />
<PackageReference Include="Fody" Version="6.5.0">
<PackageReference Include="Fody" Version="6.5.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -74,9 +74,9 @@
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="PInvoke.Gdi32" Version="0.7.104" />
<PackageReference Include="PInvoke.User32" Version="0.7.104" />
<PackageReference Include="ReactiveUI" Version="13.2.10" />
<PackageReference Include="ReactiveUI.Fody" Version="13.2.10" />
<PackageReference Include="ReactiveUI.WPF" Version="13.2.10" />
<PackageReference Include="ReactiveUI" Version="13.2.18" />
<PackageReference Include="ReactiveUI.Fody" Version="13.2.18" />
<PackageReference Include="ReactiveUI.WPF" Version="13.2.18" />
<PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
<PackageReference Include="WPFThemes.DarkBlend" Version="1.0.8" />
</ItemGroup>