Commit71fcc34

authored

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

restore tools before dependency uptake work

2 parents58c4e60 +02cb8cd commit71fcc34Copy full SHA for 71fcc34

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -603,6 +603,11 @@ if "%RestorePackages%" == "true" (`
`603`	`603`	`)`
`604`	`604`	`)`
`605`	`605`
	`606`	`+if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (`
	`607`	`+:: Restore the Tools directory`
	`608`	`+call%~dp0init-tools.cmd`
	`609`	`+)`
	`610`	`+`
`606`	`611`	`echo ----------- Done with package restore, starting dependency uptake check -------------`
`607`	`612`
`608`	`613`	`ifnot"%PB_PackageVersionPropsUrl%"=="" (`
`@@ -624,11 +629,6 @@ if not "%PB_PackageVersionPropsUrl%" == "" (`
`624`	`629`	`ifERRORLEVEL1echo Error restoring dependency uptake packages&&goto :failure`
`625`	`630`	`)`
`626`	`631`
`627`		`-if"%BUILD_PROTO_WITH_CORECLR_LKG%"=="1" (`
`628`		`-:: Restore the Tools directory`
`629`		`-call%~dp0init-tools.cmd`
`630`		`-)`
`631`		`-`
`632`	`632`	`set_dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe`
`633`	`633`	`set_dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe`
`634`	`634`	`setNUGET_PACKAGES=%~dp0Packages`

Comments

(0)