From f03d72c4a26323588e40e1982f1ba4d1878494c6 Mon Sep 17 00:00:00 2001
From: Christian Soltenborn <christian@soltenborn.de>
Date: Sat, 29 Feb 2020 14:29:40 +0100
Subject: [PATCH] updated nuspec

---
 GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj |  6 ++++--
 GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec     | 11 ++++++++---
 GoogleTestAdapter/Packaging.GTA/packages.config      |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj b/GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj
index c80d781bc..d985aa810 100644
--- a/GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj
+++ b/GoogleTestAdapter/Packaging.GTA/Packaging.GTA.csproj
@@ -91,7 +91,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Resources\gtest-logo.png" />
+    <Content Include="Resources\gtest-logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Resources\Preview.png">
       <IncludeInVSIX>true</IncludeInVSIX>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -109,7 +111,7 @@
   <PropertyGroup>
     <PostBuildEvent>echo At least one file is needed within the lib/native folder to convince VS that our package can be installed into native C++ projects. &gt;"$(TargetDir)_.txt"
 
-$(NuGetPackages)NuGet.CommandLine.4.9.2\tools\nuget pack VsPackage.nuspec -NonInteractive</PostBuildEvent>
+$(NuGetPackages)NuGet.CommandLine.5.4.0\tools\nuget pack VsPackage.nuspec -NonInteractive</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
diff --git a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec
index 68ae49fd6..34259f355 100644
--- a/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec
+++ b/GoogleTestAdapter/Packaging.GTA/VsPackage.nuspec
@@ -11,11 +11,15 @@
     <language>en-US</language>
     <projectUrl>https://github.com/csoltenborn/GoogleTestAdapter</projectUrl>
     <iconUrl>https://github.com/csoltenborn/GoogleTestAdapter/raw/4e1957f62df47a2dad6b3e2fed1f790503cba399/GoogleTestAdapter/Packaging.GTA/Resources/gtest-logo.png</iconUrl>
-    <license type="file">LICENSE.txt</license>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+	<icon>gtest-logo.png</icon>
+	<license type="expression">Apache-2.0</license>
+	<requireLicenseAcceptance>false</requireLicenseAcceptance>
     <developmentDependency>true</developmentDependency>
-    <copyright>Copyright 2015-2019 Christian Soltenborn</copyright>
+    <copyright>Copyright 2015-2020 Christian Soltenborn</copyright>
     <tags>native gtest Google Test adapter C++ unit integration automated testing</tags>
+	<dependencies>
+	    <group targetFramework="native0.0" />
+	</dependencies>
   </metadata>
   <files>
     <file src="GoogleTestAdapter.Common.dll" target="build\_common\" />
@@ -28,6 +32,7 @@
     <file src="x64\msdia140.dll" target="build\_common\x64\" />
 
     <file src="LICENSE.txt" target="" />
+    <file src="Resources\gtest-logo.png" target="" />
     <file src="_.txt" target="lib\native\" />
   </files>
 </package>
\ No newline at end of file
diff --git a/GoogleTestAdapter/Packaging.GTA/packages.config b/GoogleTestAdapter/Packaging.GTA/packages.config
index 253b9b290..2c2d7e644 100644
--- a/GoogleTestAdapter/Packaging.GTA/packages.config
+++ b/GoogleTestAdapter/Packaging.GTA/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NuGet.CommandLine" version="4.9.2" targetFramework="net45" developmentDependency="true" />
+  <package id="NuGet.CommandLine" version="5.4.0" targetFramework="net45" developmentDependency="true" />
 </packages>
\ No newline at end of file