Commitae34e3b

authored

Merge pull request #3876 from brettfo/nuget-sources

enable additional NuGet restore sources to be passed in

2 parentsd903cf6 +61660da commitae34e3bCopy full SHA for ae34e3b

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
`@@ -517,18 +517,24 @@ if "%RestorePackages%" == "true" (`
`517`	`517`	`cd..`
`518`	`518`	`@if ERRORLEVEL1echo Error: Paket restore failed&&goto :failure`
`519`	`519`
`520`		`-%_ngenexe% install%_nugetexe% /nologo`
	`520`	`+%_ngenexe% install%_nugetexe% /nologo`
	`521`	`+set_nugetoptions=-PackagesDirectory packages -ConfigFile%_nugetconfig%`
	`522`	`+ifnot"%PB_RESTORESOURCE%"=="" (`
	`523`	`+set_nugetoptions=!_nugetoptions! -Source%PB_RESTORESOURCE%`
	`524`	`+ )`
	`525`	`+`
	`526`	`+echo _nugetoptions=!_nugetoptions!`
`521`	`527`
`522`		`-%_nugetexe% restore packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%`
	`528`	`+%_nugetexe% restore packages.config!_nugetoptions!`
`523`	`529`	`@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure`
`524`	`530`
`525`	`531`	`if"%BUILD_VS%"=="1" (`
`526`		`-%_nugetexe% restore vsintegration\packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%`
	`532`	`+%_nugetexe% restore vsintegration\packages.config!_nugetoptions!`
`527`	`533`	`@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure`
`528`	`534`	`)`
`529`	`535`
`530`	`536`	`if"%BUILD_SETUP%"=="1" (`
`531`		`-%_nugetexe% restore setup\packages.config-PackagesDirectory packages -ConfigFile%_nugetconfig%`
	`537`	`+%_nugetexe% restore setup\packages.config!_nugetoptions!`
`532`	`538`	`@if ERRORLEVEL1echo Error: Nuget restore failed&&goto :failure`
`533`	`539`	`)`
`534`	`540`	`)`

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)