Merge pull request #4453 from brettfo/restore-order

restore SDK projects after proto has been built
dotnet · Mar 7, 2018 · beadbdb · beadbdb
2 parents ba9b757 + 3188acf
commit beadbdb
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/build.cmd b/build.cmd
@@ -656,12 +656,6 @@ set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe
 set NUGET_PACKAGES=%~dp0Packages
 set path=%~dp0Tools\dotnet20\;%path%
 
-if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
-    :: Restore projects using dotnet CLI tool 
-    echo %_dotnet20exe% restore -v:d build-everything.proj %msbuildflags% %BUILD_DIAG%
-         %_dotnet20exe% restore -v:d build-everything.proj %msbuildflags% %BUILD_DIAG%
-)
-
 echo ----------- Done with package restore, starting dependency uptake check -------------
 
 if not "%PB_PackageVersionPropsUrl%" == "" (
@@ -726,7 +720,14 @@ if "%BUILD_PROTO%" == "1" (
   @if ERRORLEVEL 1 echo Error: NGen of proto failed  && goto :failure
 )
 
-echo ---------------- Done with proto, starting build ------------------------
+if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" (
+    echo ---------------- Done with proto, starting SDK restore ------------------------
+    :: Restore projects using dotnet CLI tool 
+    echo %_dotnet20exe% restore -v:d build-everything.proj %msbuildflags% %BUILD_DIAG%
+         %_dotnet20exe% restore -v:d build-everything.proj %msbuildflags% %BUILD_DIAG%
+)
+
+echo ---------------- Done with SDK restore, starting build ------------------------
 
 if "%BUILD_PHASE%" == "1" (