.

Author: SimonCropp

src/DeterministicIoPackaging/DeterministicPackage.cs

@@ -28,7 +28,7 @@ static void DuplicateEntry(Entry sourceEntry, Archive targetArchive)
         var targetEntry = CreateEntry(sourceEntry, targetArchive);
         using var targetStream = targetEntry.Open();
 
-        if (IsRelationships(sourceEntry))
+        if (sourceEntry.IsRelationships())
         {
             var xml = Relationships.PatchRelationships(sourceStream, true);
             SaveXml(xml, targetStream);
@@ -62,7 +62,7 @@ static async Task DuplicateEntryAsync(Entry sourceEntry, Archive targetArchive,
         using var sourceStream = await sourceEntry.OpenAsync(cancel);
         var targetEntry = CreateEntry(sourceEntry, targetArchive);
         using var targetStream = await targetEntry.OpenAsync(cancel);
-        if (IsRelationships(sourceEntry))
+        if (sourceEntry.IsRelationships())
         {
             var xml = Relationships.PatchRelationships(sourceStream, true);
             await SaveXml(xml, targetStream, cancel);
@@ -92,21 +92,6 @@ static Task SaveXml(XDocument xml, Stream targetStream, Cancel cancel) =>
     static void SaveXml(XDocument xml, Stream targetStream) =>
         xml.Save(targetStream, SaveOptions.DisableFormatting);
 
-
-
-    static XDocument PatchSheet(Stream sourceStream)
-    {
-        var xml = XDocument.Load(sourceStream);
-        return PatchSheet(xml);
-    }
-
-    internal static XDocument PatchSheet(XDocument xml)
-    {
-        XNamespace xr = "http://schemas.microsoft.com/office/spreadsheetml/2014/revision";
-        xml.Root!.Attribute(xr + "uid")?.Remove();
-        return xml;
-    }
-
     static Entry CreateEntry(Entry source, Archive target)
     {
         var entry = target.CreateEntry(source.FullName, CompressionLevel.Fastest);
@@ -117,7 +102,4 @@ static Entry CreateEntry(Entry source, Archive target)
     static bool IsPsmdcp(Entry entry) =>
         entry.FullName.StartsWith("package/services/metadata/core-properties/") &&
         entry.Name.EndsWith("psmdcp");
-
-    static bool IsRelationships(Entry _) =>
-        _.FullName is "_rels/.rels";
 }

src/DeterministicIoPackaging/Relationships.cs

@@ -5,6 +5,9 @@ static class Relationships
     public static bool IsWorkbookRelationships(this Entry entry) =>
         entry.FullName is "xl/_rels/workbook.xml.rels";
 
+    public static bool IsRelationships(this Entry entry) =>
+        entry.FullName is "_rels/.rels";
+
     public static XDocument PatchRelationships(Stream sourceStream, bool patchIds)
     {
         var xml = XDocument.Load(sourceStream);

src/DeterministicIoPackaging/Sheet.cs

@@ -0,0 +1,22 @@
+static class Sheet
+{
+    static XDocument PatchSheet(Stream sourceStream)
+    {
+        var xml = XDocument.Load(sourceStream);
+        return PatchSheet(xml);
+    }
+
+    internal static XDocument PatchSheet(XDocument xml)
+    {
+        XNamespace xr = "http://schemas.microsoft.com/office/spreadsheetml/2014/revision";
+        xml.Root!.Attribute(xr + "uid")?.Remove();
+        return xml;
+    }
+
+    public static bool IsWorksheetXml(this Entry entry)
+    {
+        var name = entry.FullName;
+        return name.StartsWith("xl/worksheets/") &&
+               name.EndsWith(".xml");
+    }
+}

…/PatchSheetTests.Run.DotNet.verified.xml …Tests/SheetTests.Run.DotNet.verified.xmlsrc/Tests/PatchSheetTests.Run.DotNet.verified.xml renamed to src/Tests/SheetTests.Run.DotNet.verified.xml src/Tests/PatchSheetTests.Run.DotNet.verified.xml renamed to src/Tests/SheetTests.Run.DotNet.verified.xml

@@ -1,5 +1,5 @@
 [TestFixture]
-public class PatchSheetTests
+public class SheetTests
 {
     [Test]
     public Task Run()
@@ -35,7 +35,7 @@ public Task Run()
               <pageMargins left="0.75" right="0.75" top="1" bottom="1" header="0.5" footer="0.5"/>
             </worksheet>
             """);
-        DeterministicPackage.PatchSheet(xml);
+        Sheet.PatchSheet(xml);
 
         return Verify(xml);
     }