Use the new NuGet package location in LibuvCopier

This commit is contained in:
Stephen Halter 2016-01-23 19:30:22 -08:00
parent b062f851dc
commit 63e0ed8773
1 changed files with 2 additions and 24 deletions

View File

@ -11,30 +11,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.LibuvCopier
{
try
{
var packagesFolder = Environment.GetEnvironmentVariable("DNX_PACKAGES");
if (string.IsNullOrEmpty(packagesFolder))
{
var dnxFolder = Environment.GetEnvironmentVariable("DNX_HOME") ??
Environment.GetEnvironmentVariable("DNX_USER_HOME") ??
Environment.GetEnvironmentVariable("DNX_GLOBAL_HOME");
var firstCandidate = dnxFolder?.Split(';')
?.Select(path => Environment.ExpandEnvironmentVariables(path))
?.Where(path => Directory.Exists(path))
?.FirstOrDefault();
if (string.IsNullOrEmpty(firstCandidate))
{
dnxFolder = Path.Combine(GetHome(), ".dnx");
}
else
{
dnxFolder = firstCandidate;
}
packagesFolder = Path.Combine(dnxFolder, "packages");
}
var packagesFolder = Environment.GetEnvironmentVariable("DNX_PACKAGES") ??
Path.Combine(GetHome(), ".nuget", "packages");
packagesFolder = Environment.ExpandEnvironmentVariables(packagesFolder);