From d3ca896dd0a1a5c61453a5f19e997ee2dcd4f7fd Mon Sep 17 00:00:00 2001 From: David Fowler Date: Sat, 25 Jan 2014 23:25:52 -0800 Subject: [PATCH] Handle per configuration package references when genning projects. --- build/_k-generate-projects.shade | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build/_k-generate-projects.shade b/build/_k-generate-projects.shade index 63b093d383..ff7e9340a5 100644 --- a/build/_k-generate-projects.shade +++ b/build/_k-generate-projects.shade @@ -185,6 +185,8 @@ functions foreach (var pair in configs) { + var allPackageReferences = new Dictionary(packageReferences); + var targetFramework = pair.Key; var props = (IDictionary)pair.Value; @@ -197,10 +199,16 @@ functions { if (!projectMapping.ContainsKey(dep.Key)) { - if(String.IsNullOrEmpty((string)dep.Value)) + var version = (string)dep.Value; + + if(String.IsNullOrEmpty(version)) { gacReferences.Add(dep.Key); } + else + { + allPackageReferences[dep.Key] = version; + } } else { @@ -215,7 +223,7 @@ functions .Replace("{ExtraProperties}", extraProperties) .Replace("{Files}", filesString) .Replace("{ProjectReferences}", BuildProjectReferences(projectReferences, targetFramework, projectMapping)) - .Replace("{References}", BuildReferences(packageReferences, gacReferences, packagesDir, targetFramework, GetCandidates(targetFramework))); + .Replace("{References}", BuildReferences(allPackageReferences, gacReferences, packagesDir, targetFramework, GetCandidates(targetFramework))); if (targetFramework.StartsWith("k")) {