.

Author: SimonCropp

src/DeterministicIoPackaging/Relationships.cs

@@ -1,7 +1,5 @@
 static class Relationships
 {
-    static XName relationshipName = XName.Get("Relationship", "http://schemas.openxmlformats.org/package/2006/relationships");
-
     public static bool IsWorkbookRelationships(this Entry entry) =>
         entry.FullName is "xl/_rels/workbook.xml.rels";
 
@@ -11,7 +9,7 @@ public static bool IsRelationships(this Entry entry) =>
     public static XDocument PatchRelationships(Stream sourceStream)
     {
         var xml = XDocument.Load(sourceStream);
-        PatchRelationships(xml, true);
+        PatchRelationships(xml);
         return xml;
     }
 
@@ -22,29 +20,34 @@ public static XDocument PatchWorkbookRelationships(Stream sourceStream)
         return xml;
     }
 
-    public static void PatchWorkbookRelationships(XDocument xml) =>
-        PatchRelationships(xml, false);
+    public static void PatchWorkbookRelationships(XDocument xml)
+    {
+        var root = xml.Root!;
+        var relationships = root.Elements()
+            .OrderBy(_ => _.Attribute("Type")!.Value)
+            .ToList();
+        root.ReplaceAll(relationships);
+    }
 
-    public static void PatchRelationships(XDocument xml, bool patchIds)
+    public static void PatchRelationships(XDocument xml)
     {
         var root = xml.Root!;
-        var relationships = root.Elements(relationshipName)
-            .Where(_ => !IsPsmdcpElement(_))
+        var relationships = root.Elements()
             .OrderBy(_ => _.Attribute("Type")!.Value)
             .ToList();
 
-        root.Elements(relationshipName).Remove();
+        foreach (var element in relationships.Where(IsPsmdcpElement).ToList())
+        {
+            relationships.Remove(element);
+        }
 
-        if (patchIds)
+        for (var index = 0; index < relationships.Count; index++)
         {
-            for (var index = 0; index < relationships.Count; index++)
-            {
-                var relationship = relationships[index];
-                relationship.Attribute("Id")!.SetValue($"DeterministicId{index + 1}");
-            }
+            var relationship = relationships[index];
+            relationship.Attribute("Id")!.SetValue($"DeterministicId{index + 1}");
         }
 
-        root.Add(relationships);
+        root.ReplaceAll(relationships);
 
         static bool IsPsmdcpElement(XElement element)
         {

src/Tests/RelationshipsTests.cs

@@ -25,7 +25,7 @@ public Task Run()
                 Target="package/services/metadata/core-properties/f81c51cec5594be694368ed6b7beba9.psmdcp"/>
             </Relationships>
             """);
-        Relationships.PatchRelationships(xml, true);
+        Relationships.PatchRelationships(xml);
 
         return Verify(xml);
     }