From 3188acfc457530add2451b817ee36f34de99919d Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Tue, 6 Mar 2018 14:34:52 -0800 Subject: [PATCH] restore SDK projects after proto has been built This is necessary due to the projects expecting some targets files to be present. --- build.cmd | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build.cmd b/build.cmd index 4ae0f0622..de57676d5 100644 --- 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" ( -- GitLab