Merge pull request #609 from razzmatazz/fix-csproj-loading-without-so…

…me-properties OmniSharp.MSBuild: fix .csproj loading when some props are missing
OmniSharp · Jul 18, 2016 · 9b7a207 · 9b7a207
2 parents 2798d5b + bd70931
commit 9b7a207
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs b/src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs
@@ -289,18 +289,28 @@ public static ProjectFileInfo Create(
                     projectFileInfo.DefineConstants = defineConstants.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries).Distinct().ToList();
                 }
 
-                var signAssembly = properties["SignAssembly"].FinalValue;
-                if (!string.IsNullOrWhiteSpace(signAssembly))
+                if (properties.ContainsKey("SignAssembly"))
                 {
-                    projectFileInfo.SignAssembly = Convert.ToBoolean(signAssembly);
+                    var signAssembly = properties["SignAssembly"].FinalValue;
+
+                    if (!string.IsNullOrWhiteSpace(signAssembly))
+                    {
+                        projectFileInfo.SignAssembly = Convert.ToBoolean(signAssembly);
+                    }
                 }
 
-                projectFileInfo.AssemblyOriginatorKeyFile = properties["AssemblyOriginatorKeyFile"].FinalValue;
+                if (properties.ContainsKey("AssemblyOriginatorKeyFile"))
+                {
+                    projectFileInfo.AssemblyOriginatorKeyFile = properties["AssemblyOriginatorKeyFile"].FinalValue;
+                }
 
-                var documentationFile = properties["DocumentationFile"].FinalValue;
-                if (!string.IsNullOrWhiteSpace(documentationFile))
+                if (properties.ContainsKey("DocumentationFile"))
                 {
-                    projectFileInfo.GenerateXmlDocumentation = true;
+                    var documentationFile = properties["DocumentationFile"].FinalValue;
+                    if (!string.IsNullOrWhiteSpace(documentationFile))
+                    {
+                        projectFileInfo.GenerateXmlDocumentation = true;
+                    }
                 }
 #endif
             }