Merge pull request dotnet/core-setup#2638 from chcosta/dep-fix

Ensure buildversion.props is evaluated before dotnet restore

Commit migrated from https://github.com/dotnet/core-setup/commit/a9a6aa0237f8a7d4ccfc908bfeabeda76e58e181

src/installer/build.proj

@@ -14,10 +14,10 @@
 
   <PropertyGroup>
     <TraversalBuildDependencies>
-      BatchRestorePackages;
-      ValidateExactRestore;
       CreateOrUpdateCurrentVersionFile;
       CreateVersionInfoFile;
+      BatchRestorePackages;
+      ValidateExactRestore;
       BuildCustomTasks;
     </TraversalBuildDependencies>
     <TraversalBuildDependsOn>
@@ -55,8 +55,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" />
+    <!-- Restore packages in a separate msbuild instance so that the buildversion props file generated in
+         CreateVersionInfoFile target gets evaluated, this ensures VersionSuffix is set (especially during 
+         'dotnet restore') to work around https://github.com/NuGet/Home/issues/4337 -->
+    <MSBuild Projects="$(MSBuildThisFileDirectory)restore.proj" />
   </Target>
 
   <!-- Task from buildtools that uses lockfiles to validate that packages restored are exactly what were specified. -->

src/installer/restore.proj

+<?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