Merge pull request #4306 from brettfo/build-tools-order

restore tools before dependency uptake work

build.cmd

@@ -603,6 +603,11 @@ if "%RestorePackages%" == "true" (
     )
 )
 
+if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
+    :: Restore the Tools directory
+    call %~dp0init-tools.cmd
+)
+
 echo ----------- Done with package restore, starting dependency uptake check -------------
 
 if not "%PB_PackageVersionPropsUrl%" == "" (
@@ -624,11 +629,6 @@ if not "%PB_PackageVersionPropsUrl%" == "" (
     if ERRORLEVEL 1 echo Error restoring dependency uptake packages && goto :failure
 )
 
-if "%BUILD_PROTO_WITH_CORECLR_LKG%" == "1" (
-    :: Restore the Tools directory
-    call %~dp0init-tools.cmd
-)
-
 set _dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe
 set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
 set NUGET_PACKAGES=%~dp0Packages