From 9935af3a43dea3272351b1872b41c9756d1dcc10 Mon Sep 17 00:00:00 2001 From: AndrewPeters Date: Tue, 28 Jan 2014 21:51:42 -0800 Subject: [PATCH] Improved package reference resolution. --- build/_k-generate-projects.shade | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/_k-generate-projects.shade b/build/_k-generate-projects.shade index c4d37c8c17..6bfb517959 100644 --- a/build/_k-generate-projects.shade +++ b/build/_k-generate-projects.shade @@ -392,8 +392,14 @@ functions Log(reference.Key + " = " + version + " ==> " + packageDir); - var candidate = candidates.Select(c => Path.Combine(packageDir, "lib", c)) - .FirstOrDefault(Directory.Exists); + var libPath = Path.Combine(packageDir, "lib"); + + var candidate + = candidates.Select(c => Path.Combine(libPath, c)) + .FirstOrDefault(Directory.Exists) + ?? candidates + .SelectMany(c => Directory.GetDirectories(libPath, "*" + c + "*")) + .FirstOrDefault(); if (candidate == null) {