From 7145b72a69a54e6d56b72b2cc9e588af2dd2ded3 Mon Sep 17 00:00:00 2001
From: Timothy Baldridge <tbaldridge@gmail.com>
Date: Thu, 26 Dec 2019 11:21:57 -0700
Subject: [PATCH] Test fixes

---
 Wabbajack.Common/Wabbajack.Common.csproj |  3 +++
 Wabbajack.Test/DownloaderTests.cs        |  3 +++
 Wabbajack.Test/Wabbajack.Test.csproj     | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj
index 08bc2583..03ff59a2 100644
--- a/Wabbajack.Common/Wabbajack.Common.csproj
+++ b/Wabbajack.Common/Wabbajack.Common.csproj
@@ -6,10 +6,12 @@
     <ItemGroup>
       <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" />
     </ItemGroup>
     <ItemGroup>
         <Folder Include="KnownFolders\" />
@@ -25,6 +27,7 @@
       <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" />
+      <PackageReference Include="System.Security.Principal.Windows" Version="4.7.0" />
       <PackageReference Include="YamlDotNet" Version="8.0.0" />
     </ItemGroup>
     <ItemGroup>
diff --git a/Wabbajack.Test/DownloaderTests.cs b/Wabbajack.Test/DownloaderTests.cs
index 676a3ccf..75144bac 100644
--- a/Wabbajack.Test/DownloaderTests.cs
+++ b/Wabbajack.Test/DownloaderTests.cs
@@ -306,6 +306,8 @@ namespace Wabbajack.Test
         [TestMethod]
         public async Task GameFileSourceDownload()
         {
+            // Test mode off for this test
+            Consts.TestMode = false;
             await DownloadDispatcher.GetInstance<LoversLabDownloader>().Prepare();
             var ini = $@"[General]
                         gameName={Game.SkyrimSpecialEdition.MetaData().MO2ArchiveName}
@@ -325,6 +327,7 @@ namespace Wabbajack.Test
 
             Assert.AreEqual("/DLG/LjdGXI=", Utils.FileHash(filename));
             CollectionAssert.AreEqual(File.ReadAllBytes(Path.Combine(Game.SkyrimSpecialEdition.MetaData().GameLocation(), "Data/Update.esm")), File.ReadAllBytes(filename));
+            Consts.TestMode = true;
         }
 
     }
diff --git a/Wabbajack.Test/Wabbajack.Test.csproj b/Wabbajack.Test/Wabbajack.Test.csproj
index 815ba1c2..47f5659b 100644
--- a/Wabbajack.Test/Wabbajack.Test.csproj
+++ b/Wabbajack.Test/Wabbajack.Test.csproj
@@ -32,6 +32,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <NoWarn>CS1998</NoWarn>
     <WarningsAsErrors>CS4014</WarningsAsErrors>
+      <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -42,6 +44,8 @@
     <WarningLevel>4</WarningLevel>
     <NoWarn>CS1998</NoWarn>
     <WarningsAsErrors>CS4014</WarningsAsErrors>
+      <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -51,6 +55,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+      <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -60,6 +66,8 @@
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+      <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -70,6 +78,8 @@
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+      <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -80,6 +90,8 @@
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+      <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />