From 8d1f1dfe3b1e6fbc7a4b4575e9a6751a783d8c9d Mon Sep 17 00:00:00 2001 From: David Fowler Date: Mon, 26 May 2014 23:08:11 -0700 Subject: [PATCH] Fixed duplicate assembly registration on mono - Overwrite assemblies registered by name when finding reference assemblies. - Also set the path of the framework directory Fixed #252 --- src/Microsoft.Framework.Runtime/FrameworkReferenceResolver.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.Framework.Runtime/FrameworkReferenceResolver.cs b/src/Microsoft.Framework.Runtime/FrameworkReferenceResolver.cs index 0b6c6932e..4807166c6 100644 --- a/src/Microsoft.Framework.Runtime/FrameworkReferenceResolver.cs +++ b/src/Microsoft.Framework.Runtime/FrameworkReferenceResolver.cs @@ -101,6 +101,7 @@ private void PopulateCache() var frameworkName = new FrameworkName(VersionUtility.DefaultTargetFramework.Identifier, new Version(version)); var frameworkInfo = new FrameworkInformation(); + frameworkInfo.Path = targetFrameworkPath; var assemblies = new List>(); @@ -109,7 +110,7 @@ private void PopulateCache() foreach (var pair in assemblies) { - frameworkInfo.Assemblies.Add(pair.Item1, pair.Item2); + frameworkInfo.Assemblies[pair.Item1] = pair.Item2; } _cache[frameworkName] = frameworkInfo;