Commitbeadbdb

authored

Merge pull requestdotnet#4453 from brettfo/restore-order

restore SDK projects after proto has been built

2 parentsba9b757 +3188acf commitbeadbdbCopy full SHA for beadbdb

File tree

-7

lines changed

-7

lines changed

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -656,12 +656,6 @@ set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe`
`656`	`656`	`setNUGET_PACKAGES=%~dp0Packages`
`657`	`657`	`setpath=%~dp0Tools\dotnet20\;%path%`
`658`	`658`
`659`		`-if"%NEEDS_DOTNET_CLI_TOOLS%"=="1" (`
`660`		`-:: Restore projects using dotnet CLI tool`
`661`		`-echo%_dotnet20exe% restore -v:d build-everything.proj%msbuildflags%%BUILD_DIAG%`
`662`		`-%_dotnet20exe% restore -v:d build-everything.proj%msbuildflags%%BUILD_DIAG%`
`663`		`-)`
`664`		`-`
`665`	`659`	`echo ----------- Done with package restore, starting dependency uptake check -------------`
`666`	`660`
`667`	`661`	`ifnot"%PB_PackageVersionPropsUrl%"=="" (`
`@@ -726,7 +720,14 @@ if "%BUILD_PROTO%" == "1" (`
`726`	`720`	`@if ERRORLEVEL1echo Error: NGen of proto failed&&goto :failure`
`727`	`721`	`)`
`728`	`722`
`729`		`-echo ---------------- Done with proto, starting build ------------------------`
	`723`	`+if"%NEEDS_DOTNET_CLI_TOOLS%"=="1" (`
	`724`	`+echo ---------------- Done with proto, starting SDK restore ------------------------`
	`725`	`+:: Restore projects using dotnet CLI tool`
	`726`	`+echo%_dotnet20exe% restore -v:d build-everything.proj%msbuildflags%%BUILD_DIAG%`
	`727`	`+%_dotnet20exe% restore -v:d build-everything.proj%msbuildflags%%BUILD_DIAG%`
	`728`	`+)`
	`729`	`+`
	`730`	`+echo ---------------- Done with SDK restore, starting build ------------------------`
`730`	`731`
`731`	`732`	`if"%BUILD_PHASE%"=="1" (`
`732`	`733`

Comments

(0)