Merge pull request #315 from OmniSharp/fix314

don't expect AllowUnsafeBlocks and DefineConstants to be in all csproj files
OmniSharp · Oct 8, 2015 · 9204b2e · 9204b2e
2 parents 8949a79 + 4fa79aa
commit 9204b2e
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/OmniSharp/MSBuild/ProjectFile/ProjectFileInfo.cs b/src/OmniSharp/MSBuild/ProjectFile/ProjectFileInfo.cs
@@ -205,13 +205,13 @@ public static ProjectFileInfo Create(MSBuildOptions options, ILogger logger, str
                     .Select(p => Path.GetFullPath(Path.Combine(projectFileInfo.ProjectDirectory, p.FinalItemSpec)))
                     .ToList();
 
-                var allowUnsafe = properties["AllowUnsafeBlocks"].FinalValue;
+                var allowUnsafe = properties.GetPropertyValue("AllowUnsafeBlocks");
                 if (!string.IsNullOrWhiteSpace(allowUnsafe))
                 {
                     projectFileInfo.AllowUnsafe = Convert.ToBoolean(allowUnsafe);
                 }
 
-                var defineConstants = properties["DefineConstants"].FinalValue;
+                var defineConstants = properties.GetPropertyValue("DefineConstants");
                 if (!string.IsNullOrWhiteSpace(defineConstants))
                 {
                     projectFileInfo.DefineConstants = defineConstants.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries).Distinct().ToList();
@@ -241,4 +241,16 @@ public static ProjectFileInfo Create(MSBuildOptions options, ILogger logger, str
             return null;
         }
     }
+
+    #if DNX451
+    static class DictionaryExt
+    {
+        public static string GetPropertyValue(this Dictionary<string, BuildProperty> dict, string key)
+        {
+            return dict.ContainsKey(key)
+                ? dict[key].FinalValue
+                : null;
+        }
+    }
+    #endif
 }