From dbc28c523e6a25a557775320a8e7acb683fbf697 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 25 Oct 2018 13:28:19 -0700
Subject: [PATCH] Avoid double restores by invoking NuGet.targets directly

---
 build/SharedFx.targets | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 3fe37c3d10..3111c1de28 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -1,12 +1,6 @@
 <Project>
   <Import Project="SharedFx.props" />
 
-  <ItemDefinitionGroup>
-    <ProjectToBuild>
-      <Restore>true</Restore>
-    </ProjectToBuild>
-  </ItemDefinitionGroup>
-
   <PropertyGroup>
     <UnitTestFxProject>$(RepositoryRoot)\src\Framework\Framework.UnitTests\Framework.UnitTests.csproj</UnitTestFxProject>
   </PropertyGroup>
@@ -15,18 +9,19 @@
     <ProjectToBuild Include="$(RepositoryRoot)src\Framework\**\*.pkgproj" />
     <ProjectToBuild Include="$(RepositoryRoot)src\Framework\**\*.shfxproj" />
     <ProjectToBuild Include="$(UnitTestFxProject)" />
-    <ProjectToBuild Include="$(RepositoryRoot)src\Installers\Archive.Internal\*.*proj" Restore="false" />
-    <ProjectToBuild Include="$(RepositoryRoot)src\Installers\Archive.Redist\*.*proj" Restore="false" />
+    <ProjectToBuild Include="$(RepositoryRoot)src\Installers\Archive.Internal\*.*proj" />
+    <ProjectToBuild Include="$(RepositoryRoot)src\Installers\Archive.Redist\*.*proj" />
   </ItemGroup>
 
   <Target Name="_BuildSharedFxProjects" DependsOnTargets="ResolveCommitHash">
 
-    <MSBuild Projects="@(ProjectToBuild)"
+    <PropertyGroup>
+      <_RestoreGraphProjectInput>@(ProjectToBuild)</_RestoreGraphProjectInput>
+    </PropertyGroup>
+
+    <MSBuild Projects="$(MSBuildToolsPath)\NuGet.targets"
              Targets="Restore"
-             Properties="$(SolutionProperties);_DummyTarget=Restore"
-             BuildInParallel="true"
-             SkipNonexistentTargets="true"
-             Condition=" '%(Restore)' != 'false' " />
+             Properties="$(SolutionProperties);RestoreGraphProjectInput=$(_RestoreGraphProjectInput);_DummyTarget=Restore" />
 
     <MSBuild Projects="@(ProjectToBuild)"
              Properties="$(SolutionProperties)"