From bf1be9fb79cba22dd99d55ac91059fe9720d5e41 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Tue, 27 Jun 2017 10:28:23 -0700
Subject: [PATCH] Restore the VSIX project with MSBuild instead of NuGet.exe
 (#1471)

* Restore the VSIX project with MSBuild instead of NuGet.exe
* Upgrade AppVeyor image to VS Preview
---
 appveyor.yml       |  2 +-
 build/VSIX.targets | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1041615c68..8aeecbfb6f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,4 +11,4 @@ build_script:
 clone_depth: 1
 test: off
 deploy: off
-os: Visual Studio 2017
+os: Visual Studio 2017 Preview
diff --git a/build/VSIX.targets b/build/VSIX.targets
index 961e3759be..348ac0ce4f 100644
--- a/build/VSIX.targets
+++ b/build/VSIX.targets
@@ -1,15 +1,10 @@
 <Project>
   <PropertyGroup>
     <PackageDependsOn Condition="'$(OS)'=='Windows_NT'">$(PackageDependsOn);GenerateVSIX</PackageDependsOn>
-    <NuGetCommandLineVersion>4.1.0</NuGetCommandLineVersion>
     <VSIXName>Microsoft.VisualStudio.RazorExtension</VSIXName>
     <VSIXProject>$(RepositoryRoot)tooling\$(VSIXName)\$(VSIXName).csproj</VSIXProject>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NuGet.CommandLine" Version="$(NuGetCommandLineVersion)" Condition="'$(OS)'=='Windows_NT'" />
-  </ItemGroup>
-
   <Target
     Name="GenerateVSIX"
     DependsOnTargets="_LocateMSBuildExe;_BuildVSIX"
@@ -29,13 +24,6 @@
     </PropertyGroup>
   </Target>
 
-  <Target Name="_RestoreProject">
-    <PropertyGroup>
-      <NuGetExe>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))nuget.commandline\$(NuGetCommandLineVersion)\tools\nuget.exe</NuGetExe>
-    </PropertyGroup>
-    <Exec Command="$(NuGetExe) restore &quot;$(VSIXProject)&quot; -SolutionDir &quot;$(RepositoryRoot) &quot; -verbosity quiet" />
-  </Target>
-
   <Target Name="_BuildVSIX" Condition="'$(MSBuildExePath)'!=''">
     <PropertyGroup>
       <MSBuildArtifactsDir>$(ArtifactsDir)msbuild\</MSBuildArtifactsDir>
@@ -44,7 +32,8 @@
       <VSIXOutputPath>$(BuildDir)$(VSIXName).vsix</VSIXOutputPath>
     </PropertyGroup>
 
-    <CallTarget Targets="_RestoreProject" />
+    <Exec Command="&quot;$(MSBuildExePath)&quot; &quot;$(VSIXProject)&quot; /nologo /t:Restore /v:m" />
+
     <ItemGroup>
       <MSBuildArguments Include="
         $(VSIXProject);
@@ -66,4 +55,4 @@
     <Exec Command="&quot;$(MSBuildExePath)&quot; @&quot;$(VSIXResponseFilePath)&quot;" />
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>