Merge remote-tracking branch 'origin/main' into add-child

Author: twsouthwick

.github/workflows/build.yml

@@ -96,10 +96,10 @@ jobs:
     - name: Build
       run: dotnet build --no-restore --verbosity normal
     - name: Test
-      run: dotnet test --no-restore --verbosity normal --logger trx --results-directory test-results/
+      run: dotnet test --no-restore -- --results-directory ${{ github.workspace }}/test-results/ --report-xunit-trx
     - name: Upload Test Results
       if: always()
       uses: actions/upload-artifact@v4
       with:
         name: Test Results (${{ matrix.os }} ${{ matrix.configuration }} ${{ matrix.projectloadstyle }})
-        path: test-results/*
+        path: ${{ github.workspace }}/test-results/*

.github/workflows/code-coverage.yml

@@ -20,6 +20,7 @@ on:
 
 jobs:
   build_and_test:
+    if: false # Disable for now while getting XUnit v3 working
     name: Run
 
     env:
@@ -47,7 +48,7 @@ jobs:
       run: dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage" --results-directory coverage
 
     - name: ReportGenerator
-      uses: danielpalme/ReportGenerator-GitHub-Action@5.4.1
+      uses: danielpalme/ReportGenerator-GitHub-Action@5.4.4
       with:
         reports: coverage/**/coverage.cobertura.xml
         targetdir: coveragereport

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
         if: github.event.workflow_run.conclusion == 'success'
         steps:
         - name: Download Release Info
-          uses: dawidd6/action-download-artifact@v6
+          uses: dawidd6/action-download-artifact@v9
           with:
            run_id: ${{ github.event.workflow_run.id }}
            name: release-info
@@ -39,7 +39,7 @@ jobs:
       runs-on: ubuntu-latest
       steps:
         - name: Download and Extract Artifacts from build
-          uses: dawidd6/action-download-artifact@v6
+          uses: dawidd6/action-download-artifact@v9
           with:
             run_id: ${{ github.event.workflow_run.id }}
             name: Signed

.github/workflows/test-results.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       # Need to download from the associated workflow
       - name: Download and Extract Artifacts from build
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v9
         with:
           run_id: ${{ github.event.workflow_run.id }}
           path: artifacts

CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.3.0] - 2025-03-06
+
+### Added
+
+- Added `DocumentFormat.OpenXml.Office.SpreadSheetML.Y2024.WorkbookCompatibilityVersion` namespace
+
+### Fixed
+- Performance of `.ToFlatOpc(...)` has been greatly improved for large parts (#1863)
+
+Thanks to the following for their contributions:
+
+@QuocDatHoang
+
 ## [3.2.0] - 2024-11-22
 
 ### Added

CONTRIBUTING.md

@@ -1,11 +1,6 @@
 # Contributing
 
-This project has adopted the [Microsoft Open Source Code of
-Conduct](https://opensource.microsoft.com/codeofconduct/).
-For more information see the [Code of Conduct
-FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or
-contact [opencode@microsoft.com](mailto:opencode@microsoft.com)
-with any additional questions or comments.
+This project has adopted the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/about/policies/code-of-conduct).
 
 For our general contributing guidelines please see [our dotnet/runtime contributing guide](https://github.com/dotnet/runtime/blob/master/CONTRIBUTING.md).
 
@@ -25,4 +20,4 @@ This repository can be built on Windows, Linux, and OSX.
 
 Building, testing, and packing this repository can be done by using the standard dotnet CLI commands (e.g. `dotnet build`, `dotnet test`, `dotnet pack`, etc.).
 
-[VisualStudio]: https://docs.microsoft.com/dotnet/core/install/sdk?pivots=os-windows#install-with-visual-studio
+[VisualStudio]: https://docs.microsoft.com/dotnet/core/install/sdk?pivots=os-windows#install-with-visual-studio

Directory.Build.props

@@ -41,10 +41,11 @@
         <NoWarn>$(NoWarn);CS1685</NoWarn>
         <ProductTargetFrameworks>net35</ProductTargetFrameworks>
         <FrameworkTargetFrameworks>net35</FrameworkTargetFrameworks>
-        <TestTargetFrameworks>net462</TestTargetFrameworks>
-        <AssetsTargetFrameworks>net462</AssetsTargetFrameworks>
-        <LatestTargetFramework>net462</LatestTargetFramework>
+        <TestTargetFrameworks>net472</TestTargetFrameworks>
+        <AssetsTargetFrameworks>net472</AssetsTargetFrameworks>
+        <LatestTargetFramework>net472</LatestTargetFramework>
         <SamplesFrameworks>net472</SamplesFrameworks>
+        <DefineConstants>$(DefineConstants);FEATURE_NO_VALIDATOR_CANCELLATIONTOKEN</DefineConstants>
       </PropertyGroup>
     </When>
     <When Condition=" '$(ProjectLoadStyle)' == 'net40' ">
@@ -53,22 +54,23 @@
         <NoWarn>$(NoWarn);CS1685</NoWarn>
         <ProductTargetFrameworks>net40</ProductTargetFrameworks>
         <FrameworkTargetFrameworks>net40</FrameworkTargetFrameworks>
-        <TestTargetFrameworks>net462</TestTargetFrameworks>
-        <AssetsTargetFrameworks>net462</AssetsTargetFrameworks>
-        <LatestTargetFramework>net462</LatestTargetFramework>
+        <TestTargetFrameworks>net472</TestTargetFrameworks>
+        <AssetsTargetFrameworks>net472</AssetsTargetFrameworks>
+        <LatestTargetFramework>net472</LatestTargetFramework>
         <SamplesFrameworks>net472</SamplesFrameworks>
       </PropertyGroup>
     </When>
     <Otherwise>
       <PropertyGroup>
         <ProductTargetFrameworks>netstandard2.0;net8.0;net35;net40;net46</ProductTargetFrameworks>
         <FrameworkTargetFrameworks>netstandard2.0;net6.0;net8.0;net35;net40;net46</FrameworkTargetFrameworks>
-        <AssetsTargetFrameworks>netstandard2.0;net462</AssetsTargetFrameworks>
+        <AssetsTargetFrameworks>netstandard2.0;net472</AssetsTargetFrameworks>
         <TestTargetFrameworks>net8.0</TestTargetFrameworks>
-        <TestTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TestTargetFrameworks);net462</TestTargetFrameworks>
+        <TestTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TestTargetFrameworks);net472</TestTargetFrameworks>
         <LatestTargetFramework>net8.0</LatestTargetFramework>
         <SamplesFrameworks>net8.0</SamplesFrameworks>
-        <SamplesFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TestTargetFrameworks);net472</SamplesFrameworks>
+        <SamplesFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(SamplesFrameworks);net472</SamplesFrameworks>
+        <DefineConstants Condition=" '$(TargetFramework)' != 'net35' And '$(TargetFramework)' != 'net40' And '$(TargetFramework)' != 'net46' And '$(TargetFramework)' != 'net472' ">$(DefineConstants);FEATURE_ASYNC_SAX_XML</DefineConstants>
       </PropertyGroup>
     </Otherwise>
   </Choose>

Directory.Packages.props

@@ -3,7 +3,7 @@
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.0" />
     <PackageVersion Include="Microsoft.DotNet.BuildTools.GenAPI" Version="3.0.0-preview4-06015-01" />
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
@@ -14,24 +14,24 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
-    <PackageVersion Include="NuGet.Common" Version="6.12.1" />
-    <PackageVersion Include="NuGet.Packaging" Version="6.12.1" />
+    <PackageVersion Include="NuGet.Common" Version="6.13.2" />
+    <PackageVersion Include="NuGet.Packaging" Version="6.13.2" />
     <PackageVersion Include="NuGet.Protocol" Version="6.12.1" />
     <PackageVersion Include="NuGet.Resolver" Version="6.12.1" />
     <PackageVersion Include="ObjectLayoutInspector" Version="0.1.4" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="Svg" Version="3.4.7" />
     <PackageVersion Include="System.CodeDom" Version="8.0.0" />
     <PackageVersion Include="System.IO.Packaging" Version="8.0.1" />
-    <PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
     <PackageVersion Include="System.Text.Json" Version="9.0.0" />
     <PackageVersion Include="System.Xml.ReaderWriter" Version="4.3.1" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="xunit.v3" Version="1.0.0" />
   </ItemGroup>
 </Project>

GitVersion.yml

@@ -1,5 +1,5 @@
 mode: ContinuousDeployment
-next-version: 3.1.0
+next-version: 3.4.0
 branches: {}
 ignore:
   sha: []

Open-XML-SDK.sln

@@ -67,8 +67,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3653266D-2C8
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Generator", "gen\DocumentFormat.OpenXml.Generator\DocumentFormat.OpenXml.Generator.csproj", "{E04F2FB4-DBC6-46DC-857C-F0E89B42F385}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Generator.Tests", "test\DocumentFormat.OpenXml.Generator.Tests\DocumentFormat.OpenXml.Generator.Tests.csproj", "{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linq", "Linq", "{C5AE39F0-A152-471A-B90E-B8F4E94AA6C2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SvgExampleLinq", "samples\Linq\SvgExample\SvgExampleLinq.csproj", "{DE06FC2B-EABB-4535-BC73-C51A32B5AC01}"
@@ -149,10 +147,6 @@ Global
 		{E04F2FB4-DBC6-46DC-857C-F0E89B42F385}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E04F2FB4-DBC6-46DC-857C-F0E89B42F385}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E04F2FB4-DBC6-46DC-857C-F0E89B42F385}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DE06FC2B-EABB-4535-BC73-C51A32B5AC01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE06FC2B-EABB-4535-BC73-C51A32B5AC01}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DE06FC2B-EABB-4535-BC73-C51A32B5AC01}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -211,7 +205,6 @@ Global
 		{E157C5F1-D70B-4939-A199-0B758FED8541} = {0782A132-968D-4BDD-911A-2C3074EAF886}
 		{3B82C340-3B10-42BF-9A2C-2E2327A9CFD4} = {0782A132-968D-4BDD-911A-2C3074EAF886}
 		{E04F2FB4-DBC6-46DC-857C-F0E89B42F385} = {3653266D-2C88-4487-8977-839CB3E78A0A}
-		{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62} = {0782A132-968D-4BDD-911A-2C3074EAF886}
 		{C5AE39F0-A152-471A-B90E-B8F4E94AA6C2} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
 		{DE06FC2B-EABB-4535-BC73-C51A32B5AC01} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
 		{890B74DD-6316-4D56-B42A-5D66F10F88C6} = {C5AE39F0-A152-471A-B90E-B8F4E94AA6C2}