Use the new NuGet package location in LibuvCopier
This commit is contained in:
parent
b062f851dc
commit
63e0ed8773
|
|
@ -11,30 +11,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.LibuvCopier
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var packagesFolder = Environment.GetEnvironmentVariable("DNX_PACKAGES");
|
var packagesFolder = Environment.GetEnvironmentVariable("DNX_PACKAGES") ??
|
||||||
|
Path.Combine(GetHome(), ".nuget", "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");
|
|
||||||
}
|
|
||||||
|
|
||||||
packagesFolder = Environment.ExpandEnvironmentVariables(packagesFolder);
|
packagesFolder = Environment.ExpandEnvironmentVariables(packagesFolder);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue