mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2617 from schellap/fx-deps-file

Browse source 
Determine FX dir using FX_DEPS_FILE
This commit is contained in:
Senthil 2016-04-21 13:49:20 -07:00
commit 3d8cbba932
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Microsoft.DotNet.Cli.Utils/CoreHost.cs
View file

@ -28,7 +28,8 @@ namespace Microsoft.DotNet.Cli.Utils
{ {
if (_hostDir == null) if (_hostDir == null)
{ {
_hostDir = Path.GetDirectoryName(typeof(object).GetTypeInfo().Assembly.Location); var fxDepsFile = Muxer.GetDataFromAppDomain("FX_DEPS_FILE");
_hostDir = Path.GetDirectoryName(fxDepsFile);
} }
return _hostDir; return _hostDir;

17
src/Microsoft.DotNet.Cli.Utils/Muxer.cs
View file

@ -33,11 +33,24 @@ namespace Microsoft.DotNet.Cli.Utils
} }
} }
public static string GetDataFromAppDomain(string propertyName)
{
var appDomainType = typeof(object).GetTypeInfo().Assembly?.GetType("System.AppDomain");
var currentDomain = appDomainType?.GetProperty("CurrentDomain")?.GetValue(null);
var deps = appDomainType?.GetMethod("GetData")?.Invoke(currentDomain, new[] { propertyName });
return deps as string;
}
private bool TryResolveMuxerFromParentDirectories() private bool TryResolveMuxerFromParentDirectories()
{ {
var appBase = new FileInfo(typeof(object).GetTypeInfo().Assembly.Location); var fxDepsFile = GetDataFromAppDomain("FX_DEPS_FILE");
var muxerDir = appBase.Directory?.Parent?.Parent?.Parent; if (string.IsNullOrEmpty(fxDepsFile))
{
return false;
}
var muxerDir = new FileInfo(fxDepsFile).Directory?.Parent?.Parent?.Parent;
if (muxerDir == null) if (muxerDir == null)
{ {
return false; return false;