From 8b131b210df789ff751d6e715954c641a891c3e4 Mon Sep 17 00:00:00 2001
From: Christopher Costa <chcosta@microsoft.com>
Date: Tue, 6 Jun 2017 20:25:40 -0700
Subject: [PATCH] Ensure buildversion.props is evaluated before dotnet restore

Commit migrated from https://github.com/dotnet/core-setup/commit/936a6f7dd9c539aaa4ea6e2dd246c3fb1ecc3975
---
 src/installer/build.proj   | 10 ++++++----
 src/installer/restore.proj | 10 ++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 src/installer/restore.proj

diff --git a/src/installer/build.proj b/src/installer/build.proj
index c08c0271ae8..cec1b1c73a5 100644
--- a/src/installer/build.proj
+++ b/src/installer/build.proj
@@ -14,10 +14,10 @@
 
   <PropertyGroup>
     <TraversalBuildDependencies>
-      BatchRestorePackages;
-      ValidateExactRestore;
       CreateOrUpdateCurrentVersionFile;
       CreateVersionInfoFile;
+      BatchRestorePackages;
+      ValidateExactRestore;
       BuildCustomTasks;
     </TraversalBuildDependencies>
     <TraversalBuildDependsOn>
@@ -56,8 +56,10 @@
   </Target>
 
   <Target Name="BatchRestorePackages" Condition="'$(RestoreDuringBuild)'=='true'">
-    <Message Importance="High" Text="Restoring all packages..." />
-    <Exec Condition="'@(SdkRestoreProjects)' != ''" Command="$(DotnetRestoreCommand) &quot;%(SdkRestoreProjects.FullPath)&quot; %(SdkRestoreProjects.ExtraRestoreArgs)" StandardOutputImportance="Low" />
+    <!--<Message Importance="High" Text="Restoring all packages..." /> -->
+    <!--<Exec Condition="'@(SdkRestoreProjects)' != ''" Command="$(DotnetRestoreCommand) &quot;%(SdkRestoreProjects.FullPath)&quot; %(SdkRestoreProjects.ExtraRestoreArgs)" StandardOutputImportance="Low" /> -->
+    <MSBuild Projects="$(MSBuildThisFileDirectory)restore.proj"
+             Condition="'$(RestoreDuringBuild)' == 'true'" />
   </Target>
 
   <!-- Task from buildtools that uses lockfiles to validate that packages restored are exactly what were specified. -->
diff --git a/src/installer/restore.proj b/src/installer/restore.proj
new file mode 100644
index 00000000000..093c3088646
--- /dev/null
+++ b/src/installer/restore.proj
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="dir.props" />
+
+  <Target Name="Build">
+    <Message Importance="High" Text="Restoring all packages..." />
+    <Exec Condition="'@(SdkRestoreProjects)' != ''" Command="$(DotnetRestoreCommand) &quot;%(SdkRestoreProjects.FullPath)&quot; %(SdkRestoreProjects.ExtraRestoreArgs)" StandardOutputImportance="Low" />
+  </Target>
+
+</Project>
\ No newline at end of file
-- 
GitLab