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 #938 from wabbajack-tools/upgrade-all-deps-6-30-2020

Browse Source 
Upgrade all deps
This commit is contained in:
Timothy Baldridge 2020-07-01 05:46:58 -07:00 committed by GitHub
commit dd01229351
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
</ItemGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

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

@ -15,7 +15,7 @@
<PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
<PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.2.2-beta" />
<PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="5.0.0-preview.6.20305.6" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />

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

@ -10,7 +10,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
<PackageReference Include="Xunit.StaFact" Version="0.3.18" />
</ItemGroup>

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

@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
</ItemGroup>
<ItemGroup>

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

@ -41,19 +41,19 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.23" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
<PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Octodiff" Version="1.2.1" />
<PackageReference Include="ReactiveUI" Version="11.4.1" />
<PackageReference Include="ReactiveUI" Version="11.4.17" />
<PackageReference Include="RocksDbNative" Version="6.2.2" />
<PackageReference Include="RocksDbSharp" Version="6.2.2" />
<PackageReference Include="SharpZipLib" Version="1.2.0" />
<PackageReference Include="System.Data.HashFunction.xxHash" Version="2.0.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0-preview.6.20305.6" />
<PackageReference Include="YamlDotNet" Version="8.1.2" />
</ItemGroup>
<ItemGroup>

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

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Alphaleonis.Win32.Filesystem;
using F23.StringSimilarity;
using Newtonsoft.Json;
using Wabbajack.Common;
using Wabbajack.VirtualFileSystem;
@ -75,8 +76,11 @@ namespace Wabbajack.Lib.CompilationSteps
var relName = (RelativePath)Path.GetFileName(matchAllName);
if (_indexedByName.TryGetValue(relName, out var arch))
{
// Just match some file in the archive based on the smallest delta difference
found = arch.SelectMany(a => a.ThisAndAllChildren).ToArray();
var dist = new Levenshtein();
found = arch.SelectMany(a => a.ThisAndAllChildren)
.OrderBy(a => dist.Distance(a.FullPath.FileName.ToString(), source.File.FullPath.FileName.ToString()))
.Take(3)
.ToArray();
}
}

22
Wabbajack.Lib/Wabbajack.Lib.csproj
View File

@ -8,25 +8,25 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common">
<Version>81.3.100</Version>
<Version>83.3.120-pre</Version>
</PackageReference>
<PackageReference Include="CefSharp.OffScreen">
<Version>81.3.100</Version>
<Version>83.3.120-pre</Version>
</PackageReference>
<PackageReference Include="F23.StringSimilarity">
<Version>3.1.0</Version>
</PackageReference>
<PackageReference Include="Fody">
<Version>6.1.2</Version>
<Version>6.2.0</Version>
</PackageReference>
<PackageReference Include="Genbox.AlphaFS">
<Version>2.2.2.1</Version>
</PackageReference>
<PackageReference Include="GraphQL.Client">
<Version>3.1.1</Version>
<Version>3.1.3</Version>
</PackageReference>
<PackageReference Include="HtmlAgilityPack">
<Version>1.11.23</Version>
<Version>1.11.24</Version>
</PackageReference>
<PackageReference Include="MegaApiClient">
<Version>1.8.1</Version>
@ -38,25 +38,25 @@
<Version>2.1.0</Version>
</PackageReference>
<PackageReference Include="ReactiveUI">
<Version>11.4.1</Version>
<Version>11.4.17</Version>
</PackageReference>
<PackageReference Include="ReactiveUI.Fody">
<Version>11.4.1</Version>
<Version>11.4.17</Version>
</PackageReference>
<PackageReference Include="SharpCompress">
<Version>0.25.1</Version>
</PackageReference>
<PackageReference Include="System.Collections.Immutable">
<Version>5.0.0-preview.4.20251.6</Version>
<Version>5.0.0-preview.6.20305.6</Version>
</PackageReference>
<PackageReference Include="System.Drawing.Common">
<Version>5.0.0-preview.4.20251.6</Version>
<Version>5.0.0-preview.6.20305.6</Version>
</PackageReference>
<PackageReference Include="System.Net.Http">
<Version>4.3.4</Version>
</PackageReference>
<PackageReference Include="System.ServiceModel.Syndication">
<Version>5.0.0-preview.4.20251.6</Version>
<Version>5.0.0-preview.6.20305.6</Version>
</PackageReference>
<PackageReference Include="WebSocketSharp-netstandard">
<Version>1.0.1</Version>
@ -68,7 +68,7 @@
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="YoutubeExplode">
<Version>5.0.5</Version>
<Version>5.1.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>

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

@ -9,9 +9,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="coverlet.collector" Version="1.2.1" />
<PackageReference Include="XunitContext" Version="1.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
<PackageReference Include="coverlet.collector" Version="1.3.0" />
<PackageReference Include="XunitContext" Version="2.0.0" />
</ItemGroup>
<ItemGroup>

6
Wabbajack.Server/Wabbajack.Server.csproj
View File

@ -16,12 +16,12 @@
<ItemGroup>
<PackageReference Include="CsvHelper" Version="15.0.5" />
<PackageReference Include="Dapper" Version="2.0.35" />
<PackageReference Include="FluentFTP" Version="32.4.1" />
<PackageReference Include="FluentFTP" Version="32.4.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Core" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
<PackageReference Include="Nettle" Version="1.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" />
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
</ItemGroup>

2
Wabbajack.Test/EndToEndTests.cs
View File

@ -61,7 +61,7 @@ namespace Wabbajack.Test
DownloadAndInstall(Game.SkyrimSpecialEdition, 12604, "SkyUI"),
DownloadAndInstall(Game.Fallout4, 11925, "Anti-Tank Rifle"),
DownloadAndInstall(Game.SkyrimSpecialEdition, 4783, "Frost Armor UNP"),
DownloadAndInstall(Game.SkyrimSpecialEdition, 32359, "Frost Armor HDT"));
DownloadAndInstall(Game.SkyrimSpecialEdition, 31948, "Frost Armor HDT"));
// We're going to fully patch this mod from another source.
await modfiles[3].Download.DeleteAsync();

10
Wabbajack.Test/Wabbajack.Test.csproj
View File

@ -25,13 +25,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Common" Version="81.3.100" />
<PackageReference Include="CefSharp.OffScreen" Version="81.3.100" />
<PackageReference Include="CefSharp.Common" Version="83.3.120-pre" />
<PackageReference Include="CefSharp.OffScreen" Version="83.3.120-pre" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0-preview-20200519-01" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="coverlet.collector" Version="1.2.1" />
<PackageReference Include="XunitContext" Version="1.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
<PackageReference Include="coverlet.collector" Version="1.3.0" />
<PackageReference Include="XunitContext" Version="2.0.0" />
</ItemGroup>
<ItemGroup>

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

@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
</ItemGroup>
<ItemGroup>

4
Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
View File

@ -15,8 +15,8 @@
<ItemGroup>
<PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
<PackageReference Include="K4os.Hash.Crc" Version="1.1.4" />
<PackageReference Include="OMODFramework" Version="2.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.4.20251.6" />
<PackageReference Include="OMODFramework" Version="2.0.1" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0-preview.6.20305.6" />
</ItemGroup>
<ItemGroup>
<None Update="Extractors\7z.dll">

20
Wabbajack/Wabbajack.csproj
View File

@ -55,10 +55,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CefSharp.Wpf" Version="81.3.100" />
<PackageReference Include="DynamicData" Version="6.14.18" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="3.8.1" />
<PackageReference Include="Fody" Version="6.1.2">
<PackageReference Include="CefSharp.Wpf" Version="83.3.120-pre" />
<PackageReference Include="DynamicData" Version="6.15.4" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.0.0" />
<PackageReference Include="Fody" Version="6.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -67,13 +67,13 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="MahApps.Metro" Version="2.0.0" />
<PackageReference Include="MahApps.Metro" Version="2.1.0" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.2.0" />
<PackageReference Include="PInvoke.Gdi32" Version="0.6.6" />
<PackageReference Include="PInvoke.User32" Version="0.6.6" />
<PackageReference Include="ReactiveUI" Version="11.4.1" />
<PackageReference Include="ReactiveUI.Fody" Version="11.4.1" />
<PackageReference Include="ReactiveUI.WPF" Version="11.4.1" />
<PackageReference Include="PInvoke.Gdi32" Version="0.6.49" />
<PackageReference Include="PInvoke.User32" Version="0.6.49" />
<PackageReference Include="ReactiveUI" Version="11.4.17" />
<PackageReference Include="ReactiveUI.Fody" Version="11.4.17" />
<PackageReference Include="ReactiveUI.WPF" Version="11.4.17" />
<PackageReference Include="SharpDX.DXGI" Version="4.2.0" />
<PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
<PackageReference Include="WPFThemes.DarkBlend" Version="1.0.8" />