From 12a41c8d501325d06922a5c2a69f657464d6cd30 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Thu, 7 May 2015 16:25:32 +0900 Subject: [PATCH] [xbuild] for resolving assemblies from pkg-config, prefer specified version ... even if SpecificVersion is false. There is no reason to prefer any mismatching version when SpecificVersion=false. That behavior caused monodevelop build failures because of incorrectly- resolved gtk# packages. After this fix, this issue goes away. https://github.com/mono/monodevelop/blob/2436ad1874694ec811871dacf9a659a79b5fad0d/README.md#known-problems --- .../Microsoft.Build.Tasks/AssemblyResolver.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs index 9c1d478eb18..bf14075f7ff 100644 --- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs +++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/AssemblyResolver.cs @@ -256,9 +256,8 @@ namespace Microsoft.Build.Tasks { { PackageAssemblyInfo pkg = null; - if (specific_version) { - pkg = PcCache.GetAssemblyLocation (reference.ItemSpec); - } else { + pkg = PcCache.GetAssemblyLocation (reference.ItemSpec); + if (pkg == null && !specific_version) { // if not specific version, then just match simple name string name = reference.ItemSpec; if (name.IndexOf (',') > 0) -- 2.25.1