From e0e1df51e0497d62ef6efc65423b8ec27ff4fd0c Mon Sep 17 00:00:00 2001 From: Andreas Weizel Date: Sun, 30 Mar 2014 03:26:56 +0200 Subject: [PATCH] Revert "Fix #414: Loading enum-typed formatter settings from .csproj files fails." This reverts commit 48502c9d85622265927ce88ed3c91eb2023d402a. --- src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs b/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs index dc6ff540dc..cfdc97341a 100644 --- a/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs +++ b/src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs @@ -1467,15 +1467,11 @@ namespace ICSharpCode.SharpDevelop.Project existing = projectFile.CreateProjectExtensionsElement(); return new XElement(name); } - // Instead of using existing[name] we use a workaround here, because existing[name] - // removes all xmlns="..." definitions, which are needed for XAML deserialization. - string content = existing.Content; + string content = existing[name]; if (string.IsNullOrEmpty(content)) return new XElement(name); try { - var extensionsElement = XElement.Parse(content); - var propertiesElement = extensionsElement.Elements().FirstOrDefault(); // Should be the "Properties" node - return propertiesElement ?? new XElement(name); + return XElement.Parse(content); } catch (XmlException ex) { LoggingService.Warn(ex); return new XElement(name);