Merge pull request #1726 from wabbajack-tools/branding

Branding
2024-08-30 18:42:17 +00:00 · 2021-11-13 07:12:36 -07:00 · 2021-11-13 07:12:36 -07:00 · 57bf496a88
commit 57bf496a88
parent 9c5821704b b2d642e70c
24 changed files with 50 additions and 50 deletions
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@ -7,7 +7,7 @@ on:
    branches: [ main ]

 env:
-  VERSION: 3.0.0.0-alpha6
+  VERSION: 3.0.0.0-beta1

 jobs:
  build:
--- a/Wabbajack.App/Assets/wabbajack-logo.ico
+++ b/Wabbajack.App/Assets/wabbajack-logo.ico
--- a/Wabbajack.App/Views/MainWindow.axaml
+++ b/Wabbajack.App/Views/MainWindow.axaml
@ -8,7 +8,7 @@
                  xmlns:i="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
                  mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                  x:Class="Wabbajack.App.Views.MainWindow"
-                  Icon="{x:Null}"
+                  Icon="/Assets/wabbajack-logo.ico"
                  WindowStartupLocation="CenterScreen"
                  Background="#121212"

--- a/Wabbajack.App/Wabbajack.App.csproj
+++ b/Wabbajack.App/Wabbajack.App.csproj
@ -19,9 +19,9 @@
        <PackageReference Include="CefNet.Avalonia" Version="94.0.21246.700" />
        <PackageReference Include="DynamicData" Version="7.4.3" />
        <PackageReference Include="Fizzler.Systems.HtmlAgilityPack" Version="1.2.1" />
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
+        <PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
        <PackageReference Include="Material.Icons.Avalonia" Version="1.0.2" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
        <PackageReference Include="ReactiveUI.Fody" Version="16.2.6" />
        <PackageReference Include="ReactiveUI.Validation" Version="2.2.1" />
        <PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
--- a/Wabbajack.CLI/Wabbajack.CLI.csproj
+++ b/Wabbajack.CLI/Wabbajack.CLI.csproj
@ -15,10 +15,10 @@
    <ItemGroup>
        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0-rc.2.21480.5" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
        <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21558.1" />
+        <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21561.1" />
    </ItemGroup>

    <ItemGroup>
--- a/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj
+++ b/Wabbajack.Compiler.Test/Wabbajack.Compiler.Test.csproj
@ -10,7 +10,7 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj
+++ b/Wabbajack.Compression.BSA.Test/Wabbajack.Compression.BSA.Test.csproj
@ -8,9 +8,9 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
-        <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />
+        <PackageReference Include="Xunit.DependencyInjection" Version="8.2.0" />
        <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.0" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj
+++ b/Wabbajack.DTOs.Test/Wabbajack.DTOs.Test.csproj
@ -8,9 +8,9 @@

    <ItemGroup>
        <PackageReference Include="FsCheck.Xunit" Version="3.0.0-beta1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
-        <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />
+        <PackageReference Include="Xunit.DependencyInjection" Version="8.2.0" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
            <PrivateAssets>all</PrivateAssets>
--- a/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj
+++ b/Wabbajack.Downloaders.Dispatcher.Test/Wabbajack.Downloaders.Dispatcher.Test.csproj
@ -8,7 +8,7 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
        <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.0" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
--- a/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj
+++ b/Wabbajack.Downloaders.GameFile/Wabbajack.Downloaders.GameFile.csproj
@ -7,8 +7,8 @@
    </PropertyGroup>

    <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj"/>
-        <ProjectReference Include="..\Wabbajack.VFS\Wabbajack.VFS.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Interfaces\Wabbajack.Downloaders.Interfaces.csproj" />
+        <ProjectReference Include="..\Wabbajack.VFS\Wabbajack.VFS.csproj" />
    </ItemGroup>

    <ItemGroup>
@ -18,10 +18,10 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="GameFinder.StoreHandlers.EGS" Version="1.7.1"/>
-        <PackageReference Include="GameFinder.StoreHandlers.GOG" Version="1.7.1"/>
-        <PackageReference Include="GameFinder.StoreHandlers.Origin" Version="1.7.1"/>
-        <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="1.7.1"/>
+        <PackageReference Include="GameFinder.StoreHandlers.EGS" Version="1.7.2" />
+        <PackageReference Include="GameFinder.StoreHandlers.GOG" Version="1.7.2" />
+        <PackageReference Include="GameFinder.StoreHandlers.Origin" Version="1.7.2" />
+        <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="1.7.2" />
    </ItemGroup>

 </Project>
--- a/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj
+++ b/Wabbajack.Downloaders.MediaFire/Wabbajack.Downloaders.MediaFire.csproj
@ -6,7 +6,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
+        <PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
    </ItemGroup>
--- a/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj
+++ b/Wabbajack.Downloaders.Mega/Wabbajack.Downloaders.Mega.csproj
@ -11,7 +11,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="MegaApiClient" Version="1.9.0" />
+        <PackageReference Include="MegaApiClient" Version="1.10.0" />
        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
    </ItemGroup>

--- a/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj
+++ b/Wabbajack.Downloaders.ModDB/Wabbajack.Downloaders.ModDB.csproj
@ -11,8 +11,8 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="HtmlAgilityPack" Version="1.11.37" />
-        <PackageReference Include="MegaApiClient" Version="1.9.0" />
+        <PackageReference Include="HtmlAgilityPack" Version="1.11.38" />
+        <PackageReference Include="MegaApiClient" Version="1.10.0" />
        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
    </ItemGroup>

--- a/Wabbajack.Downloaders.Nexus/Wabbajack.Downloaders.Nexus.csproj
+++ b/Wabbajack.Downloaders.Nexus/Wabbajack.Downloaders.Nexus.csproj
@ -18,7 +18,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />
+        <PackageReference Include="Xunit.DependencyInjection" Version="8.2.0" />
        <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.0" />
    </ItemGroup>

--- a/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj
+++ b/Wabbajack.FileExtractor.Test/Wabbajack.FileExtractor.Test.csproj
@ -9,9 +9,9 @@
    <ItemGroup>
        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
-        <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />
+        <PackageReference Include="Xunit.DependencyInjection" Version="8.2.0" />
        <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.0" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj
+++ b/Wabbajack.Hashing.PHash.Test/Wabbajack.Hashing.PHash.Test.csproj
@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="Shipwreck.Phash" Version="0.5.0" />
        <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
--- a/Wabbajack.Hashing.xxHash64.Test/Wabbajack.Hashing.xxHash64.Test.csproj
+++ b/Wabbajack.Hashing.xxHash64.Test/Wabbajack.Hashing.xxHash64.Test.csproj
@ -9,7 +9,7 @@
    <ItemGroup>
        <PackageReference Include="FsCheck" Version="3.0.0-beta1" />
        <PackageReference Include="FsCheck.Xunit" Version="3.0.0-beta1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="System.Data.HashFunction.xxHash" Version="2.0.0" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
--- a/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj
+++ b/Wabbajack.Installer.Test/Wabbajack.Installer.Test.csproj
@ -8,7 +8,7 @@

    <ItemGroup>
        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Wabbajack.Installer/Wabbajack.Installer.csproj
+++ b/Wabbajack.Installer/Wabbajack.Installer.csproj
@ -8,24 +8,24 @@
    </PropertyGroup>

    <ItemGroup>
-        <ProjectReference Include="..\Wabbajack.Downloaders.Dispatcher\Wabbajack.Downloaders.Dispatcher.csproj"/>
-        <ProjectReference Include="..\Wabbajack.Downloaders.GameFile\Wabbajack.Downloaders.GameFile.csproj"/>
-        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj"/>
-        <ProjectReference Include="..\Wabbajack.FileExtractor\Wabbajack.FileExtractor.csproj"/>
-        <ProjectReference Include="..\Wabbajack.Networking.WabbajackClientApi\Wabbajack.Networking.WabbajackClientApi.csproj"/>
-        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj"/>
-        <ProjectReference Include="..\Wabbajack.Paths\Wabbajack.Paths.csproj"/>
-        <ProjectReference Include="..\Wabbajack.VFS\Wabbajack.VFS.csproj"/>
+        <ProjectReference Include="..\Wabbajack.Downloaders.Dispatcher\Wabbajack.Downloaders.Dispatcher.csproj" />
+        <ProjectReference Include="..\Wabbajack.Downloaders.GameFile\Wabbajack.Downloaders.GameFile.csproj" />
+        <ProjectReference Include="..\Wabbajack.DTOs\Wabbajack.DTOs.csproj" />
+        <ProjectReference Include="..\Wabbajack.FileExtractor\Wabbajack.FileExtractor.csproj" />
+        <ProjectReference Include="..\Wabbajack.Networking.WabbajackClientApi\Wabbajack.Networking.WabbajackClientApi.csproj" />
+        <ProjectReference Include="..\Wabbajack.Paths.IO\Wabbajack.Paths.IO.csproj" />
+        <ProjectReference Include="..\Wabbajack.Paths\Wabbajack.Paths.csproj" />
+        <ProjectReference Include="..\Wabbajack.VFS\Wabbajack.VFS.csproj" />
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="GameFinder.StoreHandlers.BethNet" Version="1.7.1"/>
-        <PackageReference Include="GameFinder.StoreHandlers.EGS" Version="1.7.1"/>
-        <PackageReference Include="GameFinder.StoreHandlers.GOG" Version="1.7.1"/>
-        <PackageReference Include="GameFinder.StoreHandlers.Origin" Version="1.7.1"/>
-        <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="1.7.1"/>
-        <PackageReference Include="ini-parser-netstandard" Version="2.5.2"/>
-        <PackageReference Include="Octodiff" Version="1.2.36"/>
+        <PackageReference Include="GameFinder.StoreHandlers.BethNet" Version="1.7.2" />
+        <PackageReference Include="GameFinder.StoreHandlers.EGS" Version="1.7.2" />
+        <PackageReference Include="GameFinder.StoreHandlers.GOG" Version="1.7.2" />
+        <PackageReference Include="GameFinder.StoreHandlers.Origin" Version="1.7.2" />
+        <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="1.7.2" />
+        <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
+        <PackageReference Include="Octodiff" Version="1.2.36" />
    </ItemGroup>

 </Project>
--- a/Wabbajack.Networking.NexusApi.Test/Wabbajack.Networking.NexusApi.Test.csproj
+++ b/Wabbajack.Networking.NexusApi.Test/Wabbajack.Networking.NexusApi.Test.csproj
@ -7,9 +7,9 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
-        <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />
+        <PackageReference Include="Xunit.DependencyInjection" Version="8.2.0" />
        <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.0" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Wabbajack.Paths.IO.Test/Wabbajack.Paths.IO.Test.csproj
+++ b/Wabbajack.Paths.IO.Test/Wabbajack.Paths.IO.Test.csproj
@ -8,7 +8,7 @@

    <ItemGroup>
        <PackageReference Include="FsCheck.Xunit" Version="3.0.0-beta1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Wabbajack.Paths.Test/Wabbajack.Paths.Test.csproj
+++ b/Wabbajack.Paths.Test/Wabbajack.Paths.Test.csproj
@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Wabbajack.RateLimiter.Test/Wabbajack.RateLimiter.Test.csproj
+++ b/Wabbajack.RateLimiter.Test/Wabbajack.RateLimiter.Test.csproj
@ -8,7 +8,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj
+++ b/Wabbajack.VFS.Test/Wabbajack.VFS.Test.csproj
@ -10,12 +10,12 @@
        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.115.5" />
-        <PackageReference Include="Xunit.DependencyInjection" Version="8.1.0" />
+        <PackageReference Include="Xunit.DependencyInjection" Version="8.2.0" />
        <PackageReference Include="Xunit.DependencyInjection.Logging" Version="8.0.0" />
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0-preview-20211109-03" />
        <PackageReference Include="xunit" Version="2.4.2-pre.12" />
        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>