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

2.5.1.3

Browse Source
This commit is contained in:
Timothy Baldridge 2021-07-15 07:35:26 -06:00
parent ca5309a38f
commit 70c730155d
8 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
### Changelog
#### Version - 2.5.1.3 - 7/15/2021
* Fix textconv issue caused by a bug in ProcessHelper
* Add version info to gallery view (thanks JanuarySnow)
#### Version - 2.5.1.2 - 7/11/2021
* Fix issue with LL file upgrading
* Update GameFinder library to latest version

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

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

3
Wabbajack.Common/ProcessHelper.cs
View File

@ -80,9 +80,10 @@ namespace Wabbajack.Common
};
p.ErrorDataReceived += ErrorEventHandler;
p.Start();
p.BeginErrorReadLine();
p.BeginOutputReadLine();
p.Start();
ChildProcessTracker.AddProcess(p);
try

1
Wabbajack.Common/Util/TempFolder.cs
View File

@ -54,7 +54,6 @@ namespace Wabbajack.Common
public async ValueTask DisposeAsync()
{
Utils.Log($"Deleting {Dir}");
if (DeleteAfter && Dir.Exists)
{
await Utils.DeleteDirectory(Dir);

7
Wabbajack.ImageHashing/ImageState.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
@ -88,11 +89,11 @@ namespace Wabbajack.ImageHashing
ThrowOnNonZeroExitCode = true,
LogError = true
};
var lines = new List<string>();
var lines = new ConcurrentStack<string>();
using var _ = ph.Output.Where(p => p.Type == ProcessHelper.StreamType.Output)
.Select(p => p.Line)
.Where(p => p.Contains(" = "))
.Subscribe(l => lines.Add(l));
.Subscribe(l => lines.Push(l));
try
{
await ph.Start();
@ -115,6 +116,6 @@ namespace Wabbajack.ImageHashing
Format = Enum.Parse<DXGI_FORMAT>(data["format"]),
PerceptualHash = await GetPHash(path)
};
}
}
}
}

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.5.1.2</AssemblyVersion>
<FileVersion>2.5.1.2</FileVersion>
<AssemblyVersion>2.5.1.3</AssemblyVersion>
<FileVersion>2.5.1.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Application Launcher</Description>
<PublishReadyToRun>true</PublishReadyToRun>

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

@ -3,8 +3,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework>
<AssemblyVersion>2.5.1.2</AssemblyVersion>
<FileVersion>2.5.1.2</FileVersion>
<AssemblyVersion>2.5.1.3</AssemblyVersion>
<FileVersion>2.5.1.3</FileVersion>
<Copyright>Copyright © 2019-2020</Copyright>
<Description>Wabbajack Server</Description>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>

4
Wabbajack/Wabbajack.csproj
View File

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