Using a path from `DNX_PACKAGES` if defined
This commit is contained in:
parent
d2f282f54f
commit
e47192b9e9
|
|
@ -11,10 +11,17 @@ namespace Microsoft.AspNet.Server.Kestrel.LibuvCopier
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var dnxFolder = Environment.GetEnvironmentVariable("DNX_HOME");
|
var packagesFolder = Environment.GetEnvironmentVariable("DNX_PACKAGES");
|
||||||
if (string.IsNullOrEmpty(dnxFolder))
|
|
||||||
|
if (string.IsNullOrEmpty(packagesFolder))
|
||||||
{
|
{
|
||||||
dnxFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".dnx");
|
var dnxFolder = Environment.GetEnvironmentVariable("DNX_HOME");
|
||||||
|
if (string.IsNullOrEmpty(dnxFolder))
|
||||||
|
{
|
||||||
|
dnxFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".dnx");
|
||||||
|
}
|
||||||
|
|
||||||
|
packagesFolder = Path.Combine(dnxFolder, "packages");
|
||||||
}
|
}
|
||||||
|
|
||||||
var lockJson = JObject.Parse(File.ReadAllText("project.lock.json"));
|
var lockJson = JObject.Parse(File.ReadAllText("project.lock.json"));
|
||||||
|
|
@ -27,7 +34,7 @@ namespace Microsoft.AspNet.Server.Kestrel.LibuvCopier
|
||||||
if (filePath.ToString().StartsWith("runtimes/", StringComparison.Ordinal))
|
if (filePath.ToString().StartsWith("runtimes/", StringComparison.Ordinal))
|
||||||
{
|
{
|
||||||
Directory.CreateDirectory(Path.GetDirectoryName(filePath));
|
Directory.CreateDirectory(Path.GetDirectoryName(filePath));
|
||||||
File.Copy(Path.Combine(dnxFolder, "packages", libuvLib.Name, filePath), filePath, overwrite: true);
|
File.Copy(Path.Combine(packagesFolder, libuvLib.Name, filePath), filePath, overwrite: true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue