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

Bump all versions, remove inlined binaries in prep for Core distribution framework (whatever it is)

Browse Source
This commit is contained in:
Timothy Baldridge 2020-01-29 05:20:37 -07:00
parent b00425d7f1
commit 1fa4d92a3b
16 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Compression.BSA.Test/Compression.BSA.Test.csproj
View File

@ -7,10 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0"/>
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0"/>
<PackageReference Include="MSTest.TestFramework" Version="2.0.0"/>
<PackageReference Include="coverlet.collector" Version="1.0.1"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
</ItemGroup>

2
Wabbajack.BuildServer/Wabbajack.BuildServer.csproj
View File

@ -12,7 +12,7 @@
<ItemGroup>
<PackageReference Include="BunnyCDN.Net.Storage" Version="1.0.2" />
<PackageReference Include="Dapper" Version="2.0.30" />
<PackageReference Include="FluentFTP" Version="29.0.3" />
<PackageReference Include="FluentFTP" Version="29.0.4" />
<PackageReference Include="graphiql" Version="1.2.0" />
<PackageReference Include="GraphQL" Version="3.0.0-preview-1352" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />

BIN
Wabbajack.Common/7z.dll.gz
View File

Binary file not shown.

BIN
Wabbajack.Common/7z.exe.gz
View File

Binary file not shown.

0
Wabbajack.Common/7z.dll → Wabbajack.Common/Extractors/7z.dll
View File

0
Wabbajack.Common/7z.exe → Wabbajack.Common/Extractors/7z.exe
View File

0
Wabbajack.Common/innounp.exe → Wabbajack.Common/Extractors/innounp.exe
View File

20
Wabbajack.Common/FileExtractor.cs
View File

@ -18,22 +18,6 @@ namespace Wabbajack.Common
{
public class FileExtractor
{
static FileExtractor()
{
ExtractResource("Wabbajack.Common.7z.dll.gz", "7z.dll");
ExtractResource("Wabbajack.Common.7z.exe.gz", "7z.exe");
ExtractResource("Wabbajack.Common.innounp.exe.gz", "innounp.exe");
}
private static void ExtractResource(string from, string to)
{
using (var ous = File.Open(to, System.IO.FileMode.Create))
using (var ins = new GZipInputStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(from)))
{
ins.CopyTo(ous);
}
}
public static async Task ExtractAll(WorkQueue queue, string source, string dest)
{
@ -60,7 +44,7 @@ namespace Wabbajack.Common
var info = new ProcessStartInfo
{
FileName = "innounp.exe",
FileName = @"Extractors\innounp.exe",
Arguments = $"-x -y -b -d\"{dest}\" \"{source}\"",
RedirectStandardError = true,
RedirectStandardInput = true,
@ -160,7 +144,7 @@ namespace Wabbajack.Common
var info = new ProcessStartInfo
{
FileName = "7z.exe",
FileName = @"Extractors\7z.exe",
Arguments = $"x -bsp1 -y -o\"{dest}\" \"{source}\"",
RedirectStandardError = true,
RedirectStandardInput = true,

22
Wabbajack.Common/Wabbajack.Common.csproj
View File

@ -8,11 +8,21 @@
<None Remove="7z.dll.gz" />
<None Remove="7z.exe.gz" />
<None Remove="innounp.exe.gz" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="7z.dll.gz" />
<EmbeddedResource Include="7z.exe.gz" />
<EmbeddedResource Include="innounp.exe.gz" />
<None Update="7Zip\7z.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="7Zip\7z.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Extractors\innounp.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Extractors\7z.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Extractors\7z.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Folder Include="KnownFolders\" />
@ -24,7 +34,7 @@
<PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="ReactiveUI" Version="11.1.12" />
<PackageReference Include="ReactiveUI" Version="11.1.23" />
<PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="System.Data.HashFunction.xxHash" Version="2.0.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.7.0" />

BIN
Wabbajack.Common/innounp.exe.gz
View File

Binary file not shown.

26
Wabbajack.Lib/LibCefHelpers/Init.cs
View File

@ -16,32 +16,6 @@ namespace Wabbajack.Lib.LibCefHelpers
{
public static class Helpers
{
/// <summary>
/// We bundle the cef libs inside the .exe, we need to extract them before loading any wpf code that requires them
/// </summary>
private static void ExtractLibs()
{
if (File.Exists("cefsharp.7z") && File.Exists("libcef.dll")) return;
using (var fs = File.Open("cefsharp.7z", System.IO.FileMode.Create))
using (var rs = Assembly.GetExecutingAssembly().GetManifestResourceStream("Wabbajack.Lib.LibCefHelpers.cefsharp.7z"))
{
rs.CopyTo(fs);
Utils.Log("Extracting libCef files");
}
using (var wq = new WorkQueue(1))
{
FileExtractor.ExtractAll(wq, "cefsharp.7z", ".").Wait();
}
}
static Helpers()
{
ExtractLibs();
//if (!Cef.IsInitialized)
// Cef.Initialize(new CefSettings { MultiThreadedMessageLoop = true });
}
public static HttpClient GetClient(IEnumerable<Cookie> cookies, string referer)
{
var container = ToCookieContainer(cookies);

BIN
Wabbajack.Lib/LibCefHelpers/cefsharp.7z
View File

Binary file not shown.

9
Wabbajack.Lib/Wabbajack.Lib.csproj
View File

@ -6,10 +6,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common">
<Version>75.1.143</Version>
<Version>79.1.350</Version>
</PackageReference>
<PackageReference Include="CefSharp.OffScreen">
<Version>75.1.143</Version>
<Version>79.1.350</Version>
</PackageReference>
<PackageReference Include="Ceras">
<Version>4.1.7</Version>
@ -45,10 +45,10 @@
<Version>2.10.1</Version>
</PackageReference>
<PackageReference Include="ReactiveUI">
<Version>11.1.12</Version>
<Version>11.1.23</Version>
</PackageReference>
<PackageReference Include="ReactiveUI.Fody">
<Version>11.1.12</Version>
<Version>11.1.23</Version>
</PackageReference>
<PackageReference Include="SharpCompress">
<Version>0.24.0</Version>
@ -76,7 +76,6 @@
</ItemGroup>
<ItemGroup>
<None Remove="LibCefHelpers\cefsharp.7z" />
<EmbeddedResource Include="LibCefHelpers\cefsharp.7z" />
<None Remove="css-min.css" />
<EmbeddedResource Include="css-min.css" />
</ItemGroup>

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

@ -19,9 +19,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common" Version="75.1.143" />
<PackageReference Include="CefSharp.OffScreen" Version="75.1.143" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="CefSharp.Common" Version="79.1.350" />
<PackageReference Include="CefSharp.OffScreen" Version="79.1.350" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
</ItemGroup>

2
Wabbajack.VirtualFileSystem.Test/Wabbajack.VirtualFileSystem.Test.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
</ItemGroup>

10
Wabbajack/Wabbajack.csproj
View File

@ -46,7 +46,7 @@
<ItemGroup>
<PackageReference Include="AlphaFS" Version="2.2.6" />
<PackageReference Include="CefSharp.Wpf" Version="75.1.143" />
<PackageReference Include="CefSharp.Wpf" Version="79.1.350" />
<PackageReference Include="DynamicData" Version="6.14.3" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="3.7.0" />
<PackageReference Include="Fody" Version="6.0.8">
@ -58,10 +58,10 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0660" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.1.0" />
<PackageReference Include="ReactiveUI" Version="11.1.12" />
<PackageReference Include="ReactiveUI.Fody" Version="11.1.12" />
<PackageReference Include="ReactiveUI.WPF" Version="11.1.12" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.2.0" />
<PackageReference Include="ReactiveUI" Version="11.1.23" />
<PackageReference Include="ReactiveUI.Fody" Version="11.1.23" />
<PackageReference Include="ReactiveUI.WPF" Version="11.1.23" />
<PackageReference Include="Syroot.Windows.IO.KnownFolders" Version="1.2.1" />
<PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
<PackageReference Include="WPFThemes.DarkBlend" Version="1.0.8" />