Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Determine FX dir using FX_DEPS_FILE#2617

Merged
schellap merged 1 commit intodotnet:rel/1.0.0from
schellap:fx-deps-file
Apr 21, 2016
Merged

Determine FX dir using FX_DEPS_FILE#2617
schellap merged 1 commit intodotnet:rel/1.0.0from
schellap:fx-deps-file

Conversation

@schellap
Copy link
Copy Markdown

This change is Reviewable

@schellap
Copy link
Copy Markdown
Author

@brthor, PTAL.

@schellap
Copy link
Copy Markdown
Author

@dotnet-bot test Windows_NT x64 Release Build please

var appBase = new FileInfo(typeof(object).GetTypeInfo().Assembly.Location);
var muxerDir = appBase.Directory?.Parent?.Parent?.Parent;
var fxDepsFile = GetDataFromAppDomain("FX_DEPS_FILE");
if (fxDepsFile == null)

This comment was marked as spam.

@schellap
Copy link
Copy Markdown
Author

Fixes #2489

@schellap
Copy link
Copy Markdown
Author

@dotnet-bot test Windows_NT x86 Debug Build
Build please

@schellap
Copy link
Copy Markdown
Author

@piotrpMSFT, this is the last RC bug. I am going to update CLI builds to use a known Muxer next.

@schellap
Copy link
Copy Markdown
Author

@Sridhar-MS could you PTAL?

{
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 });

This comment was marked as spam.

This comment was marked as spam.

@Sridhar-MS
Copy link
Copy Markdown

LGTM modulo one comment

{
var appBase = new FileInfo(typeof(object).GetTypeInfo().Assembly.Location);
var muxerDir = appBase.Directory?.Parent?.Parent?.Parent;
var fxDepsFile = GetDataFromAppDomain("FX_DEPS_FILE");

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

@schellap schellap merged commit 3d8cbba into dotnet:rel/1.0.0 Apr 21, 2016
@schellap schellap deleted the fx-deps-file branch April 21, 2016 20:49
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants