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

Deps version bump

Browse Source
This commit is contained in:
Timothy Baldridge 2020-11-14 07:26:04 -07:00
parent e1725bb808
commit 802448c934
18 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Compression.BSA/Compression.BSA.csproj
View File

@ -22,7 +22,7 @@
<PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" /> <PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.6" /> <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.6" />
<PackageReference Include="SharpZipLib" Version="1.3.0" /> <PackageReference Include="SharpZipLib" Version="1.3.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.8.20407.11" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Properties\" /> <Folder Include="Properties\" />

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

@ -20,8 +20,8 @@
<PackageReference Include="CommandLineParser" Version="2.9.0-preview1" /> <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
<PackageReference Include="F23.StringSimilarity" Version="3.1.0" /> <PackageReference Include="F23.StringSimilarity" Version="3.1.0" />
<PackageReference Include="Markdig" Version="0.22.0" /> <PackageReference Include="Markdig" Version="0.22.0" />
<PackageReference Include="System.Reactive" Version="4.4.1" /> <PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Reactive.Linq" Version="4.4.1" /> <PackageReference Include="System.Reactive.Linq" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -6,7 +6,7 @@
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Reactive" Version="4.4.1" /> <PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0-preview.18571.3" /> <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0-preview.18571.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Wabbajack.Common/Extensions/RxExt.cs
View File

@ -103,7 +103,7 @@ namespace Wabbajack
{ {
// We have another value that came in to fire. // We have another value that came in to fire.
// Reregister for callback // Reregister for callback
dueTimeDisposable.Disposable = scheduler.Schedule(interval, internalCallback); dueTimeDisposable.Disposable = scheduler!.Schedule(interval, internalCallback);
o.OnNext(value!); o.OnNext(value!);
value = default; value = default;
hasValue = false; hasValue = false;

10
Wabbajack.Common/Wabbajack.Common.csproj
View File

@ -49,9 +49,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" /> <PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.26" /> <PackageReference Include="HtmlAgilityPack" Version="1.11.28" />
<PackageReference Include="ini-parser-netstandard" Version="2.5.2" /> <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0-preview.8.20407.11" /> <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Octodiff" Version="1.2.1" /> <PackageReference Include="Octodiff" Version="1.2.1" />
<PackageReference Include="RocksDbNative" Version="6.2.2" /> <PackageReference Include="RocksDbNative" Version="6.2.2" />
@ -59,9 +59,9 @@
<PackageReference Include="SharpZipLib" Version="1.3.0" /> <PackageReference Include="SharpZipLib" Version="1.3.0" />
<PackageReference Include="System.Data.HashFunction.xxHash" Version="2.0.0" /> <PackageReference Include="System.Data.HashFunction.xxHash" Version="2.0.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Reactive" Version="4.4.1" /> <PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="5.0.0-preview.8.20407.11" /> <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="5.0.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.8.20407.11" /> <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Include="YamlDotNet" Version="8.1.2" /> <PackageReference Include="YamlDotNet" Version="8.1.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Wabbajack.Lib/ClientAPI.cs
View File

@ -264,7 +264,7 @@ using Wabbajack.Lib.Downloaders;
await client.GetStringAsync($"{Consts.WabbajackBuildServerUri}mirror/{archiveHash.ToHex()}"); await client.GetStringAsync($"{Consts.WabbajackBuildServerUri}mirror/{archiveHash.ToHex()}");
return new Uri(result); return new Uri(result);
} }
catch (HttpException ex) catch (HttpException)
{ {
return null; return null;
} }

1
Wabbajack.Lib/CompilationSteps/IncludePatches.cs
View File

@ -16,7 +16,6 @@ namespace Wabbajack.Lib.CompilationSteps
private readonly Dictionary<RelativePath, IGrouping<RelativePath, VirtualFile>> _indexed; private readonly Dictionary<RelativePath, IGrouping<RelativePath, VirtualFile>> _indexed;
private VirtualFile? _bsa; private VirtualFile? _bsa;
private Dictionary<RelativePath, IEnumerable<VirtualFile>> _indexedByName; private Dictionary<RelativePath, IEnumerable<VirtualFile>> _indexedByName;
private ACompiler _compiler;
private bool _isGenericGame; private bool _isGenericGame;
public IncludePatches(ACompiler compiler, VirtualFile? constructingFromBSA = null) : base(compiler) public IncludePatches(ACompiler compiler, VirtualFile? constructingFromBSA = null) : base(compiler)

2
Wabbajack.Lib/Downloaders/NexusDownloader.cs
View File

@ -205,7 +205,7 @@ namespace Wabbajack.Lib.Downloaders
Utils.Log(ex.ExtendedDescription); Utils.Log(ex.ExtendedDescription);
throw; throw;
} }
catch (Exception ex) catch (Exception)
{ {
return false; return false;
} }

2
Wabbajack.Lib/MO2Compiler.cs
View File

@ -15,8 +15,6 @@ namespace Wabbajack.Lib
{ {
public class MO2Compiler : ACompiler public class MO2Compiler : ACompiler
{ {
private AbsolutePath _mo2DownloadsFolder;
public MO2Compiler(AbsolutePath sourcePath, AbsolutePath downloadsPath, string mo2Profile, AbsolutePath outputFile) public MO2Compiler(AbsolutePath sourcePath, AbsolutePath downloadsPath, string mo2Profile, AbsolutePath outputFile)
: base(21, mo2Profile, sourcePath, downloadsPath, outputFile) : base(21, mo2Profile, sourcePath, downloadsPath, outputFile)
{ {

8
Wabbajack.Lib/Wabbajack.Lib.csproj
View File

@ -25,7 +25,7 @@
<Version>2.2.2.1</Version> <Version>2.2.2.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="HtmlAgilityPack"> <PackageReference Include="HtmlAgilityPack">
<Version>1.11.26</Version> <Version>1.11.28</Version>
</PackageReference> </PackageReference>
<PackageReference Include="MegaApiClient"> <PackageReference Include="MegaApiClient">
<Version>1.8.2</Version> <Version>1.8.2</Version>
@ -46,16 +46,16 @@
<Version>0.26.0</Version> <Version>0.26.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Collections.Immutable"> <PackageReference Include="System.Collections.Immutable">
<Version>5.0.0-preview.8.20407.11</Version> <Version>5.0.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Drawing.Common"> <PackageReference Include="System.Drawing.Common">
<Version>5.0.0-preview.8.20407.11</Version> <Version>5.0.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Net.Http"> <PackageReference Include="System.Net.Http">
<Version>4.3.4</Version> <Version>4.3.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.ServiceModel.Syndication"> <PackageReference Include="System.ServiceModel.Syndication">
<Version>5.0.0-preview.8.20407.11</Version> <Version>5.0.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="WebSocketSharp-netstandard"> <PackageReference Include="WebSocketSharp-netstandard">
<Version>1.0.1</Version> <Version>1.0.1</Version>

1
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -14,7 +14,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CsvHelper" Version="15.0.8" />
<PackageReference Include="Dapper" Version="2.0.35" /> <PackageReference Include="Dapper" Version="2.0.35" />
<PackageReference Include="FluentFTP" Version="33.0.2" /> <PackageReference Include="FluentFTP" Version="33.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />

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

@ -30,7 +30,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.Common" Version="85.3.130" /> <PackageReference Include="CefSharp.Common" Version="85.3.130" />
<PackageReference Include="CefSharp.OffScreen" Version="85.3.130" /> <PackageReference Include="CefSharp.OffScreen" Version="85.3.130" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200812-03" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="coverlet.collector" Version="1.3.0" /> <PackageReference Include="coverlet.collector" Version="1.3.0" />

2
Wabbajack.VirtualFileSystem.Test/FileExtractorTests.cs
View File

@ -90,7 +90,7 @@ namespace Wabbajack.VirtualFileSystem.Test
return await s.xxHashAsync(); return await s.xxHashAsync();
}); });
Assert.Equal(1, results.Count); Assert.Single(results);
foreach (var (path, hash) in results) foreach (var (path, hash) in results)
{ {
Assert.Equal(await temp.Dir.Combine(path).FileHashAsync(), hash); Assert.Equal(await temp.Dir.Combine(path).FileHashAsync(), hash);

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

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200812-03" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" /> <PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

2
Wabbajack.VirtualFileSystem/Context.cs
View File

@ -238,7 +238,7 @@ namespace Wabbajack.VirtualFileSystem
tempFolder: tempFolder, tempFolder: tempFolder,
onlyFiles: fileNames.Keys.ToHashSet()); onlyFiles: fileNames.Keys.ToHashSet());
} }
catch (_7zipReturnError ex) catch (_7zipReturnError)
{ {
await using var stream = await sfn.GetStream(); await using var stream = await sfn.GetStream();
var hash = await stream.xxHashAsync(); var hash = await stream.xxHashAsync();

4
Wabbajack.VirtualFileSystem/VirtualFile.cs
View File

@ -224,11 +224,11 @@ namespace Wabbajack.VirtualFileSystem
self.Children = list.Values.ToImmutableList(); self.Children = list.Values.ToImmutableList();
} }
catch (EndOfStreamException ex) catch (EndOfStreamException)
{ {
return self; return self;
} }
catch (Exception ex) catch (Exception)
{ {
Utils.Log($"Error while examining the contents of {relPath.FileName}"); Utils.Log($"Error while examining the contents of {relPath.FileName}");
throw; throw;

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

@ -18,7 +18,7 @@
<PackageReference Include="K4os.Hash.Crc" Version="1.1.4" /> <PackageReference Include="K4os.Hash.Crc" Version="1.1.4" />
<PackageReference Include="OMODFramework" Version="2.0.1" /> <PackageReference Include="OMODFramework" Version="2.0.1" />
<PackageReference Include="SharpCompress" Version="0.26.0" /> <PackageReference Include="SharpCompress" Version="0.26.0" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.6.20305.11" /> <PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Update="Extractors\7z.dll"> <None Update="Extractors\7z.dll">

2
Wabbajack/Wabbajack.csproj
View File

@ -67,7 +67,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MahApps.Metro" Version="2.3.3" /> <PackageReference Include="MahApps.Metro" Version="2.3.4" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" /> <PackageReference Include="MahApps.Metro.IconPacks" Version="4.8.0" />
<PackageReference Include="PInvoke.Gdi32" Version="0.7.78" /> <PackageReference Include="PInvoke.Gdi32" Version="0.7.78" />
<PackageReference Include="PInvoke.User32" Version="0.7.78" /> <PackageReference Include="PInvoke.User32" Version="0.7.78" />