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

Merge pull request #1284 from dotnet/pakrym/dcfix

Browse source 
Fix dependency context bug and add load overload
This commit is contained in:
Pavel Krymets 2016-02-08 13:23:42 -08:00
commit 129bd03098
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Microsoft.DotNet.ProjectModel/DependencyContextBuilder.cs
View file

@ -68,8 +68,12 @@ namespace Microsoft.Extensions.DependencyModel
var libraryAssets = runtime ? export.RuntimeAssemblies : export.CompilationAssemblies;
foreach (var libraryDependency in export.Library.Dependencies)
foreach (var libraryDependenciesGroup in export.Library.Dependencies.GroupBy(d => d.Name))
{
LibraryRange libraryDependency = libraryDependenciesGroup
.OrderByDescending(d => d.Target == LibraryType.ReferenceAssembly)
.First();
Dependency dependency;
if (dependencyLookup.TryGetValue(libraryDependency.Name, out dependency))
{

7
src/Microsoft.Extensions.DependencyModel/DependencyContext.cs
View file

@ -38,7 +38,12 @@ namespace Microsoft.Extensions.DependencyModel
private static DependencyContext LoadDefault()
{
var entryAssembly = Assembly.GetEntryAssembly();
var stream = entryAssembly?.GetManifestResourceStream(entryAssembly.GetName().Name + DepsResourceSufix);
return Load(entryAssembly);
}
public static DependencyContext Load(Assembly assembly)
{
var stream = assembly.GetManifestResourceStream(assembly.GetName().Name + DepsResourceSufix);
if (stream == null)
{