Invoke NuGet.targets directly to avoid race condition caused by issue…

… in solution targets See dotnet/msbuild#1587
aspnet · Jan 20, 2017 · f55ca3b · f55ca3b
1 parent d896eb9
commit f55ca3b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/build/restore.proj b/build/restore.proj
@@ -0,0 +1,10 @@
+<!-- workaround https://github.com/Microsoft/msbuild/issues/1587 -->
+<Project DefaultTargets="Restore">
+    <ItemGroup>
+        <RestoreGraphProjectInputItems Include="..\src\*\*.csproj" />
+        <RestoreGraphProjectInputItems Include="..\test\*\*.csproj" />
+        <RestoreGraphProjectInputItems Include="..\samples\*\*.csproj" />
+        <RestoreGraphProjectInputItems Include="..\tools\*\*.csproj" />
+    </ItemGroup>
+    <Import Project="$(MSBuildToolsPath)\NuGet.targets" />
+</Project>
diff --git a/build/shade/_k-standard-goals.shade b/build/shade/_k-standard-goals.shade
@@ -82,7 +82,14 @@ default SAMPLES_PROJECT_GLOB = "samples/*/*.csproj"
 
 #repo-initialize target='initialize'
   use-volatile-feed
-  dotnet-restore if='!NoRestore'
+  -//dotnet-restore if='!NoRestore'
+  @{
+    // workaround https://github.com/Microsoft/msbuild/issues/1587
+    if (!NoRestore)
+    {
+      Dotnet("msbuild \"" + Path.Combine(BASE_DIR, ".build/restore.proj") + "\"");
+    }
+  }
 
 #target-dir-clean target='clean'
   @{