From a8a3f99f1a9c3e530222af8f35007a55d7c8623b Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 25 Oct 2018 10:36:18 -0700
Subject: [PATCH] Skip restore on .zipproj files

Attempting to workaround a race condition in /t:Restore when building the shared framework projects
---
 build/SharedFx.targets | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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