From 921a848cceef426c9b1349cae970e5bf9a5d90a8 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Mon, 27 Jan 2014 14:50:02 -0800 Subject: [PATCH] Read compliationOptions per config. --- build/_k-generate-projects.shade | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build/_k-generate-projects.shade b/build/_k-generate-projects.shade index f7e49adcfd..084cf2bf64 100644 --- a/build/_k-generate-projects.shade +++ b/build/_k-generate-projects.shade @@ -185,7 +185,6 @@ functions var d = serializer.DeserializeObject(jsonText) as IDictionary; var configs = GetObject(d, "configurations") ?? new Dictionary(); var dependencies = GetObject(d, "dependencies") ?? new Dictionary(); - var compilationOptions = GetObject(d, "compilationOptions") ?? new Dictionary(); if(configs.Count == 0) { @@ -209,12 +208,6 @@ functions .Select(r => r.Key) .ToList(); - var defines = Get>(compilationOptions, "define") ?? new object[0]; - object unsafeValue = Get(compilationOptions, "allowUnsafe"); - bool allowUnsafeCode = unsafeValue == null ? false : (bool)unsafeValue; - - string extraProperties = allowUnsafeCode ? "\ntrue" : ""; - // HACK: Assume the packages folder is 2 up from the projectDir string packagesDir = Path.GetFullPath(Path.Combine(projectDir, "..", "..", "packages")); @@ -225,6 +218,14 @@ functions var targetFramework = pair.Key; var props = (IDictionary)pair.Value; + var compilationOptions = GetObject(props, "compilationOptions") ?? new Dictionary(); + + var defines = Get>(compilationOptions, "define") ?? new object[0]; + object unsafeValue = Get(compilationOptions, "allowUnsafe"); + bool allowUnsafeCode = unsafeValue == null ? false : (bool)unsafeValue; + + string extraProperties = allowUnsafeCode ? "\ntrue" : ""; + string id = (string)GetObject(projectMapping, projectName)[targetFramework]; var specificDependencies = GetObject(props, "dependencies") ?? new Dictionary();