patch sheets

Author: SimonCropp

src/DeterministicIoPackaging/DeterministicPackage.cs

@@ -49,6 +49,13 @@ static void DuplicateEntry(Entry sourceEntry, Archive targetArchive)
             return;
         }
 
+        if (sourceEntry.IsWorksheetXml())
+        {
+            var xml = Sheet.Patch(sourceStream);
+            SaveXml(xml, targetStream);
+            return;
+        }
+
         sourceStream.CopyTo(targetStream);
     }
 
@@ -83,6 +90,13 @@ static async Task DuplicateEntryAsync(Entry sourceEntry, Archive targetArchive,
             return;
         }
 
+        if (sourceEntry.IsWorksheetXml())
+        {
+            var xml = await Sheet.Patch(sourceStream, cancel);
+            await SaveXml(xml, targetStream, cancel);
+            return;
+        }
+
         await sourceStream.CopyToAsync(targetStream, cancel);
     }
 

src/DeterministicIoPackaging/Patching/Relationships.cs

@@ -13,11 +13,10 @@ public static XDocument Patch(Stream stream)
     public static async Task<XDocument> Patch(Stream stream, Cancel cancel)
     {
         var xml = await XDocument.LoadAsync(stream, LoadOptions.None, cancel);
-
         Patch(xml);
-
         return xml;
     }
+
     static void Patch(XDocument xml)
     {
         var root = xml.Root!;

src/DeterministicIoPackaging/Patching/Sheet.cs

@@ -7,6 +7,13 @@ internal static XDocument Patch(Stream stream)
         return xml;
     }
 
+    public static async Task<XDocument> Patch(Stream stream, Cancel cancel)
+    {
+        var xml = await XDocument.LoadAsync(stream, LoadOptions.None, cancel);
+        Patch(xml);
+        return xml;
+    }
+
     static XNamespace xr = "http://schemas.microsoft.com/office/spreadsheetml/2014/revision";
     static XName xName = xr + "uid";
 

src/DeterministicIoPackaging/Patching/Workbook.cs

@@ -1,31 +1,29 @@
 static class Workbook
 {
     static XNamespace mc = "http://schemas.openxmlformats.org/markup-compatibility/2006";
+    static XName alternateContent = mc + "AlternateContent";
     static XNamespace x15ac = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/ac";
+    static XName abspath = x15ac + "absPath";
 
     public static XDocument Patch(Stream stream)
     {
         var xml = XDocument.Load(stream);
-
         Patch(xml);
-
         return xml;
     }
 
     public static async Task<XDocument> Patch(Stream stream, Cancel cancel)
     {
         var xml = await XDocument.LoadAsync(stream, LoadOptions.None, cancel);
-
         Patch(xml);
-
         return xml;
     }
 
     static void Patch(XDocument xml)
     {
         var absPath = xml
-            .Descendants(mc + "AlternateContent")
-            .FirstOrDefault(_ => _.Descendants(x15ac + "absPath").Any());
+            .Descendants(alternateContent)
+            .FirstOrDefault(_ => _.Descendants(abspath).Any());
 
         absPath?.Remove();
     }

src/DeterministicIoPackaging/Patching/WorkbookRelationships.cs

@@ -13,11 +13,10 @@ public static XDocument Patch(Stream sourceStream)
     public static async Task<XDocument> Patch(Stream stream, Cancel cancel)
     {
         var xml = await XDocument.LoadAsync(stream, LoadOptions.None, cancel);
-
         Patch(xml);
-
         return xml;
     }
+
     static void Patch(XDocument xml)
     {
         var root = xml.Root!;

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649;CA1416;NU1608;NU1109</NoWarn>
-    <Version>0.3.0</Version>
+    <Version>0.4.0</Version>
     <LangVersion>preview</LangVersion>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <Description>Modify System.IO.Packaging (https://learn.microsoft.com/en-us/dotnet/api/system.io.packaging) files to ensure they are deterministic. Helpful for testing, build reproducibility, security verification, and ensuring package integrity across different build environments.</Description>

src/Tests/Tests.AbsPath.DotNet.verified.xlsx

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac xr xr2 xr3" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" xr:uid="{8CEE6BCD-0185-4B0D-A16D-65794877B9A9}"><dimension ref="A5" /><sheetViews><sheetView tabSelected="1" workbookViewId="0" topLeftCell="A1" /></sheetViews><sheetFormatPr defaultRowHeight="12.75" /><sheetData><row r="5" spans="1:1" ht="23.25" customHeight="1"><c r="A5" s="3" t="s"><v>30</v></c></row></sheetData><pageMargins left="0.75" right="0.75" top="1" bottom="1" header="0.5" footer="0.5" /></worksheet>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?><worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing" xmlns:x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac xr xr2 xr3" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3"><dimension ref="A5" /><sheetViews><sheetView tabSelected="1" workbookViewId="0" topLeftCell="A1" /></sheetViews><sheetFormatPr defaultRowHeight="12.75" /><sheetData><row r="5" spans="1:1" ht="23.25" customHeight="1"><c r="A5" s="3" t="s"><v>30</v></c></row></sheetData><pageMargins left="0.75" right="0.75" top="1" bottom="1" header="0.5" footer="0.5" /></worksheet>