Merge pull request #605 from KevinMartin/patch-3

Fix Content Types created by Mono
Squirrel · Feb 27, 2016 · 53fe066 · 53fe066
2 parents 3a208fc + c0a3e95
commit 53fe066
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Squirrel/ContentType.cs b/src/Squirrel/ContentType.cs
@@ -6,6 +6,23 @@ namespace Squirrel
 {
     internal static class ContentType
     {
+        public static void Clean(XmlDocument doc)
+        {
+            var typesElement = doc.FirstChild.NextSibling;
+            if (typesElement.Name.ToLowerInvariant() != "types") {
+                throw new Exception("Invalid ContentTypes file, expected root node should be 'Types'");
+            }
+
+            var children = typesElement.ChildNodes.OfType<XmlElement>();
+            for (var child in children)
+            {
+                if (child.GetAttribute("Extension") == "")
+                {
+                    typesElement.RemoveChild(child);
+                }
+            }
+        }
+
         public static void Merge(XmlDocument doc)
         {
             var elements = new [] {

diff --git a/src/Squirrel/ReleasePackage.cs b/src/Squirrel/ReleasePackage.cs
@@ -349,6 +349,7 @@ static internal void addDeltaFilesToContentTypes(string rootDirectory)
             doc.Load(path);
 
             ContentType.Merge(doc);
+            ContentType.Clean(doc);
 
             using (var sw = new StreamWriter(path, false, Encoding.UTF8)) {
                 doc.Save(sw);