From 810caaf8e2e45ada23d9de05c0460ab11038ff50 Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Mon, 13 Nov 2017 18:31:47 +0100
Subject: [PATCH] Test project uses Nuget for lib

---
 .../ModernKeePassLib.Test.csproj              | 19 +++++++++++++------
 ModernKeePassLib.Test/packages.config         |  6 +++++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj b/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
index c78031a..cdc0420 100644
--- a/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
+++ b/ModernKeePassLib.Test/ModernKeePassLib.Test.csproj
@@ -19,6 +19,8 @@
     <PackageCertificateKeyFile>ModernKeePassLib.Test_TemporaryKey.pfx</PackageCertificateKeyFile>
     <AppxBundle>Never</AppxBundle>
     <AllowCrossPlatformRetargeting>False</AllowCrossPlatformRetargeting>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -143,17 +145,15 @@
     <None Include="ModernKeePassLib.Test_TemporaryKey.pfx" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ModernKeePassLib\ModernKeePassLib.csproj">
-      <Project>{2e710089-9559-4967-846c-e763dd1f3acb}</Project>
-      <Name>ModernKeePassLib</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
       <HintPath>..\packages\Portable.BouncyCastle.1.8.1.3\lib\netstandard1.0\BouncyCastle.Crypto.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="ModernKeePassLib, Version=2.37.0.2000, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ModernKeePassLib.2.37.6000\lib\netstandard1.2\ModernKeePassLib.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Splat, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Splat.2.0.0\lib\Portable-Win81+Wpa81\Splat.dll</HintPath>
       <Private>True</Private>
@@ -185,6 +185,13 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.0\build\NETStandard.Library.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/ModernKeePassLib.Test/packages.config b/ModernKeePassLib.Test/packages.config
index eeb6464..74dc2e1 100644
--- a/ModernKeePassLib.Test/packages.config
+++ b/ModernKeePassLib.Test/packages.config
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="win81" />
-  <package id="NETStandard.Library" version="1.6.1" targetFramework="win81" />
+  <package id="Microsoft.NETCore.Portable.Compatibility" version="1.0.2" targetFramework="win81" />
+  <package id="ModernKeePassLib" version="2.37.6000" targetFramework="win81" />
+  <package id="NETStandard.Library" version="2.0.0" targetFramework="win81" />
   <package id="Portable.BouncyCastle" version="1.8.1.3" targetFramework="win81" />
   <package id="Splat" version="2.0.0" targetFramework="win81" />
   <package id="System.Collections" version="4.3.0" targetFramework="win81" />
@@ -16,6 +18,7 @@
   <package id="System.Linq.Expressions" version="4.3.0" targetFramework="win81" />
   <package id="System.Net.Http" version="4.3.0" targetFramework="win81" />
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="win81" />
+  <package id="System.Net.Requests" version="4.3.0" targetFramework="win81" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="win81" />
   <package id="System.Reflection" version="4.3.0" targetFramework="win81" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="win81" />
@@ -35,5 +38,6 @@
   <package id="System.Threading.Timer" version="4.3.0" targetFramework="win81" />
   <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="win81" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="win81" />
+  <package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="win81" />
   <package id="Validation" version="2.4.18" targetFramework="win81" />
 </packages>
\ No newline at end of file