Commitac9f2af

authored

Merge pull requestdotnet#4502 from brettfo/nuget-package-root

honor the environment variable $NUGET_PACKAGES for package restore

2 parentsac42a1e +414ab19 commitac9f2afCopy full SHA for ac9f2af

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,12 @@`
`16`	`16`	`<!-- nuget-->`
`17`	`17`	`<PropertyGroup>`
`18`	`18`	`<!-- default NuGet package restore location-->`
`19`		`- <NugetPackageRootCondition="'$(NugetPackageRoot)' == ''">$(UserProfile)\.nuget\packages\</NugetPackageRoot>`
	`19`	`+ <NuGetPackageRootCondition="'$(NuGetPackageRoot)' == ''">$(NUGET_PACKAGES)</NuGetPackageRoot>`
	`20`	`+ <NuGetPackageRootCondition="'$(NuGetPackageRoot)' == '' AND '$(OS)' == 'Windows_NT'">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>`
	`21`	`+ <NuGetPackageRootCondition="'$(NuGetPackageRoot)' == '' AND '$(OS)' != 'Windows_NT'">$(HOME)/.nuget/packages/</NuGetPackageRoot>`
	`22`	`+<!-- ensure there is a trailing slash-->`
	`23`	`+ <NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' == 'Windows_NT'">$(NuGetPackageRoot)\</NuGetPackageRoot>`
	`24`	`+ <NuGetPackageRootCondition="!HasTrailingSlash('$(NuGetPackageRoot)') AND '$(OS)' != 'Windows_NT'">$(NuGetPackageRoot)/</NuGetPackageRoot>`
`20`	`25`	`</PropertyGroup>`
`21`	`26`
`22`	`27`	`<!-- signing-->`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`<PackageTargetFallback>net462</PackageTargetFallback>`
`12`	`12`	`</PropertyGroup>`
`13`	`13`
`14`		`- <ImportGroupCondition="'$(ImportVsSDK)' == 'true'">`
	`14`	`+ <ImportGroupCondition="'$(ImportVsSDK)' == 'true' AND Exists('$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)')">`
`15`	`15`	`<ImportProject="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props" />`
`16`	`16`	`<ImportProject="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.targets" />`
`17`	`17`	`<ImportProject="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\tools\vssdk\Microsoft.VsSDK.targets" />`

Comments

(0)