Commit1b6c1ba

committed

combine support forPB_PackageVersionPropsUrl andDotNetPackageVersionPropsPath

1 parent2bf8095 commit1b6c1baCopy full SHA for 1b6c1ba

File tree

-5

lines changed

-5

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -664,6 +664,9 @@ if not "%PB_PackageVersionPropsUrl%" == "" (`
`664`	`664`	`:: restore dependencies`
`665`	`665`	`%_nugetexe% restore!dependencyUptakeDir!\packages.config -PackagesDirectory packages -ConfigFile!dependencyUptakeDir!\NuGet.config`
`666`	`666`	`ifERRORLEVEL1echo Error restoring dependency uptake packages&&goto :failure`
	`667`	`+`
	`668`	`+:: set DotNetPackageVersionPropsPath`
	`669`	`+setDotNetPackageVersionPropsPath=!dependencyUptakeDir!\PackageVersions.props`
`667`	`670`	`)`
`668`	`671`
`669`	`672`	`set_fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe"`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,6 @@`
`58`	`58`	`</PropertyGroup>`
`59`	`59`
`60`	`60`	`<!-- dependency uptake version overrides-->`
`61`		`- <PropertyGroup>`
`62`		`- <DependencyUptakePackageVersionPropsFile>$(MSBuildThisFileDirectory)..\..\Tools\dependencyUptake\PackageVersions.props</DependencyUptakePackageVersionPropsFile>`
`63`		`- </PropertyGroup>`
`64`		`-`
`65`		`- <ImportProject="$(DependencyUptakePackageVersionPropsFile)"Condition="Exists('$(DependencyUptakePackageVersionPropsFile)')" />`
	`61`	`+ <ImportProject="$(DotNetPackageVersionPropsPath)"Condition="'$(DotNetPackageVersionPropsPath)' != '' AND Exists('$(DotNetPackageVersionPropsPath)')" />`
`66`	`62`
`67`	`63`	`</Project>`

Comments

(0)