Browse Source

Revert "Fix #414: Loading enum-typed formatter settings from .csproj files fails."

This reverts commit 48502c9d85.
pull/419/head
Andreas Weizel 11 years ago
parent
commit
e0e1df51e0
  1. 8
      src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs

8
src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs

@ -1467,15 +1467,11 @@ namespace ICSharpCode.SharpDevelop.Project
existing = projectFile.CreateProjectExtensionsElement(); existing = projectFile.CreateProjectExtensionsElement();
return new XElement(name); return new XElement(name);
} }
// Instead of using existing[name] we use a workaround here, because existing[name] string content = existing[name];
// removes all xmlns="..." definitions, which are needed for XAML deserialization.
string content = existing.Content;
if (string.IsNullOrEmpty(content)) if (string.IsNullOrEmpty(content))
return new XElement(name); return new XElement(name);
try { try {
var extensionsElement = XElement.Parse(content); return XElement.Parse(content);
var propertiesElement = extensionsElement.Elements().FirstOrDefault(); // Should be the "Properties" node
return propertiesElement ?? new XElement(name);
} catch (XmlException ex) { } catch (XmlException ex) {
LoggingService.Warn(ex); LoggingService.Warn(ex);
return new XElement(name); return new XElement(name);

Loading…
Cancel
Save