Commit61660da

committed

enable additional NuGet restore sources to be passed in

1 parent26b66fb commit61660daCopy full SHA for 61660da

File tree

+19

-8

lines changed

+19

-8

lines changed

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -570,18 +570,24 @@ if "%RestorePackages%" == "true" (`
`570`	`570`	`cd..`
`571`	`571`	`@if ERRORLEVEL1echo Error: Paket restore failed&&goto :failure`
`572`	`572`
`573`		`-%_ngenexe% install%_nugetexe% /nologo`
	`573`	`+%_ngenexe% install%_nugetexe% /nologo`
	`574`	`+set_nugetoptions=-PackagesDirectory packages -ConfigFile%_nugetconfig%`
	`575`	`+ifnot"%PB_RESTORESOURCE%"=="" (`
	`576`	`+set_nugetoptions=!_nugetoptions! -Source%PB_RESTORESOURCE%`
	`577`	`+ )`
	`578`	`+`
	`579`	`+echo _nugetoptions=!_nugetoptions!`
`574`	`580`
`575`		`-%_nugetexe% restore packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%`
	`581`	`+%_nugetexe% restore packages.config!_nugetoptions!`
`576`	`582`	`@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure`
`577`	`583`
`578`	`584`	`if"%BUILD_VS%"=="1" (`
`579`		`-%_nugetexe% restore vsintegration\packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%`
	`585`	`+%_nugetexe% restore vsintegration\packages.config!_nugetoptions!`
`580`	`586`	`@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure`
`581`	`587`	`)`
`582`	`588`
`583`	`589`	`if"%BUILD_SETUP%"=="1" (`
`584`		`-%_nugetexe% restore setup\packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%`
	`590`	`+%_nugetexe% restore setup\packages.config!_nugetoptions!`
`585`	`591`	`@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure`
`586`	`592`	`)`
`587`	`593`	`)`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -432,21 +432,26 @@ if [ "${RestorePackages:-true}" = 'true' ]; then`
`432`	`432`	`if [$exit_code-ne 0 ];then`
`433`	`433`	`exit$exit_code`
`434`	`434`	`fi`
`435`		`-`
`436`		`-eval"$_nugetexe restore packages.config -PackagesDirectory packages -ConfigFile$_nugetconfig"`
	`435`	`+`
	`436`	`+ _nugetoptions="-PackagesDirectory packages -ConfigFile$_nugetconfig"`
	`437`	`+if ["$PB_RESTORESOURCE"!="" ];then`
	`438`	`+ _nugetoptions="$_nugetoptions -Source$PB_RESTORESOURCE"`
	`439`	`+fi`
	`440`	`+`
	`441`	`+eval"$_nugetexe restore packages.config$_nugetoptions"`
`437`	`442`	`if [$?-ne 0 ];then`
`438`	`443`	`failwith"Nuget restore failed"`
`439`	`444`	`fi`
`440`	`445`
`441`	`446`	`if ["$BUILD_VS"='1' ];then`
`442`		`-eval"$_nugetexe restore vsintegration/packages.config-PackagesDirectory packages -ConfigFile$_nugetconfig"`
	`447`	`+eval"$_nugetexe restore vsintegration/packages.config$_nugetoptions"`
`443`	`448`	`if [$?-ne 0 ];then`
`444`	`449`	`failwith"Nuget restore failed"`
`445`	`450`	`fi`
`446`	`451`	`fi`
`447`	`452`
`448`	`453`	`if ["$BUILD_SETUP"='1' ];then`
`449`		`-eval"$_nugetexe restore setup/packages.config-PackagesDirectory packages -ConfigFile$_nugetconfig"`
	`454`	`+eval"$_nugetexe restore setup/packages.config$_nugetoptions"`
`450`	`455`	`if [$?-ne 0 ];then`
`451`	`456`	`failwith"Nuget restore failed"`
`452`	`457`	`fi`

Comments

(0)