Update to .NET 10 SDK

.github/workflows/build.yml

@@ -73,7 +73,7 @@ jobs:
 
     env:
       RunPeVerify: true 
-      Solution_Name: Open-XML-SDK.sln  
+      Solution_Name: Open-XML-SDK.slnx
       Configuration: ${{ matrix.configuration }}
       ProjectLoadStyle: ${{ matrix.projectloadstyle }}
 
@@ -88,7 +88,9 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@v4
       with:
-          dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          8.0.x
     - name: Install global.json .NET
       uses: actions/setup-dotnet@v4
     - name: Restore

Directory.Build.props

@@ -62,8 +62,8 @@
     </When>
     <Otherwise>
       <PropertyGroup>
-        <ProductTargetFrameworks>netstandard2.0;net8.0;net35;net40;net46</ProductTargetFrameworks>
-        <FrameworkTargetFrameworks>netstandard2.0;net6.0;net8.0;net35;net40;net46</FrameworkTargetFrameworks>
+        <ProductTargetFrameworks>netstandard2.0;net10.0;net8.0;net35;net40;net46</ProductTargetFrameworks>
+        <FrameworkTargetFrameworks>netstandard2.0;net10.0;net6.0;net8.0;net35;net40;net46</FrameworkTargetFrameworks>
         <AssetsTargetFrameworks>netstandard2.0;net472</AssetsTargetFrameworks>
         <TestTargetFrameworks>net8.0</TestTargetFrameworks>
         <TestTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TestTargetFrameworks);net472</TestTargetFrameworks>
@@ -87,7 +87,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LangVersion>13</LangVersion>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>

Directory.Packages.props

@@ -11,10 +11,10 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.24219.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <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.14.2" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="NuGet.Common" Version="6.13.2" />
@@ -32,6 +32,6 @@
     <PackageVersion Include="System.Text.Json" Version="9.0.0" />
     <PackageVersion Include="System.Xml.ReaderWriter" Version="4.3.1" />
     <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
-    <PackageVersion Include="xunit.v3" Version="1.0.0" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.1" />
   </ItemGroup>
 </Project>

Open-XML-SDK.slnx

@@ -0,0 +1,56 @@
+<Solution>
+  <Folder Name="/gen/">
+    <Project Path="gen/DocumentFormat.OpenXml.Generator.Models/DocumentFormat.OpenXml.Generator.Models.csproj" />
+    <Project Path="gen/DocumentFormat.OpenXml.Generator/DocumentFormat.OpenXml.Generator.csproj" />
+  </Folder>
+  <Folder Name="/samples/">
+    <File Path="samples/Directory.Build.props" />
+    <File Path="samples/Directory.Build.targets" />
+    <Project Path="samples/DocumentTaskExample/DocumentTaskSample.csproj" />
+    <Project Path="samples/IsolatedStorageExceptionWorkaround/IsolatedStorageExceptionWorkaround.csproj" />
+    <Project Path="samples/Linq/SvgExample/SvgExampleLinq.csproj" />
+    <Project Path="samples/NamedSheetView/AddNamedSheetView.csproj" />
+    <Project Path="samples/RichData/RichData.csproj" />
+    <Project Path="samples/SunburstChartExample/SunburstChartExample.csproj" />
+    <Project Path="samples/SVGExample/SVGExample.csproj" />
+    <Project Path="samples/ThreadedCommentExample/ThreadedCommentExample.csproj" />
+  </Folder>
+  <Folder Name="/samples/Linq/">
+    <Project Path="samples/AnimatedModel3DExample/AddAnimatedModel3D.csproj" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".vsconfig" />
+    <File Path="CHANGELOG.md" />
+    <File Path="data/OpenXmlData.targets" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Build.targets" />
+    <File Path="Directory.Packages.props" />
+    <File Path="GitVersion.yml" />
+    <File Path="global.json" />
+    <File Path="LICENSE" />
+    <File Path="NuGet.Config" />
+    <File Path="README.md" />
+    <File Path="stylecop.json" />
+  </Folder>
+  <Folder Name="/src/">
+    <File Path="src/common/FrameworkShims.targets" />
+    <File Path="src/Directory.Build.props" />
+    <File Path="src/Directory.Build.targets" />
+    <Project Path="src/DocumentFormat.OpenXml.Features/DocumentFormat.OpenXml.Features.csproj" />
+    <Project Path="src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj" />
+    <Project Path="src/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Linq.csproj" />
+    <Project Path="src/DocumentFormat.OpenXml/DocumentFormat.OpenXml.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <File Path="test/Directory.Build.props" />
+    <File Path="test/Directory.Build.targets" />
+    <Project Path="test/DocumentFormat.OpenXml.Benchmarks/DocumentFormat.OpenXml.Benchmarks.csproj" />
+    <Project Path="test/DocumentFormat.OpenXml.Framework.Features.Tests/DocumentFormat.OpenXml.Framework.Features.Tests.csproj" />
+    <Project Path="test/DocumentFormat.OpenXml.Framework.Tests/DocumentFormat.OpenXml.Framework.Tests.csproj" />
+    <Project Path="test/DocumentFormat.OpenXml.Linq.Tests/DocumentFormat.OpenXml.Linq.Tests.csproj" />
+    <Project Path="test/DocumentFormat.OpenXml.Packaging.Tests/DocumentFormat.OpenXml.Packaging.Tests.csproj" />
+    <Project Path="test/DocumentFormat.OpenXml.Tests.Assets/DocumentFormat.OpenXml.Tests.Assets.csproj" />
+    <Project Path="test/DocumentFormat.OpenXml.Tests/DocumentFormat.OpenXml.Tests.csproj" />
+  </Folder>
+</Solution>

global.json

@@ -1,6 +1,9 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100",
     "rollForward": "feature"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
   }
 }

src/Directory.Build.targets

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>3.1.1</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>3.3.0</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <ItemGroup Condition="$(IsFramework)">

src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj

@@ -28,7 +28,7 @@
     <RootNamespace>DocumentFormat.OpenXml</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0' ">
+  <ItemGroup Condition="!$(IsFramework)">
     <PackageReference Include="System.IO.Packaging" />
   </ItemGroup>
 

src/DocumentFormat.OpenXml.Framework/PublicAPI/net10.0/PublicAPI.Shipped.txt

@@ -0,0 +1,26 @@
+#nullable enable
+DocumentFormat.OpenXml.Validation.OpenXmlValidator.Validate(DocumentFormat.OpenXml.OpenXmlElement! openXmlElement, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Collections.Generic.IEnumerable<DocumentFormat.OpenXml.Validation.ValidationErrorInfo!>!
+DocumentFormat.OpenXml.Validation.OpenXmlValidator.Validate(DocumentFormat.OpenXml.Packaging.OpenXmlPackage! openXmlPackage, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Collections.Generic.IEnumerable<DocumentFormat.OpenXml.Validation.ValidationErrorInfo!>!
+DocumentFormat.OpenXml.Validation.OpenXmlValidator.Validate(DocumentFormat.OpenXml.Packaging.OpenXmlPart! openXmlPart, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Collections.Generic.IEnumerable<DocumentFormat.OpenXml.Validation.ValidationErrorInfo!>!
+
+DocumentFormat.OpenXml.HexBinaryValue.TryWriteBytes(System.Span<byte> bytes) -> bool
+static DocumentFormat.OpenXml.HexBinaryValue.Create(System.ReadOnlySpan<byte> bytes) -> DocumentFormat.OpenXml.HexBinaryValue!
+
+virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject) -> System.Threading.Tasks.Task!
+virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteEndElementAsync() -> System.Threading.Tasks.Task!
+virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteStartDocumentAsync(bool standalone) -> System.Threading.Tasks.Task!
+virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteStartElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject, System.Collections.Generic.IEnumerable<DocumentFormat.OpenXml.OpenXmlAttribute>! attributes, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string!>>! namespaceDeclarations) -> System.Threading.Tasks.Task!
+virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteStartElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject, System.Collections.Generic.IEnumerable<DocumentFormat.OpenXml.OpenXmlAttribute>! attributes) -> System.Threading.Tasks.Task!
+virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteStartElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject) -> System.Threading.Tasks.Task!
+virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteStringAsync(string! text) -> System.Threading.Tasks.Task!
+virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteStartDocumentAsync() -> System.Threading.Tasks.Task!
+override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject) -> System.Threading.Tasks.Task!
+override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteEndElementAsync() -> System.Threading.Tasks.Task!
+override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteStartDocumentAsync() -> System.Threading.Tasks.Task!
+override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteStartDocumentAsync(bool standalone) -> System.Threading.Tasks.Task!
+override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteStartElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject, System.Collections.Generic.IEnumerable<DocumentFormat.OpenXml.OpenXmlAttribute>! attributes, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string!, string!>>! namespaceDeclarations) -> System.Threading.Tasks.Task!
+override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteStartElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject, System.Collections.Generic.IEnumerable<DocumentFormat.OpenXml.OpenXmlAttribute>! attributes) -> System.Threading.Tasks.Task!
+override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteStartElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject) -> System.Threading.Tasks.Task!
+override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteStringAsync(string! text) -> System.Threading.Tasks.Task!
+DocumentFormat.OpenXml.OpenXmlPartWriterSettings.Async.get -> bool
+DocumentFormat.OpenXml.OpenXmlPartWriterSettings.Async.set -> void

src/DocumentFormat.OpenXml.Framework/PublicAPI/net10.0/PublicAPI.Unshipped.txt

@@ -0,0 +1,2 @@
+#nullable enable
+

test/Directory.Build.targets

@@ -4,7 +4,6 @@
     <When Condition="$(IsTestProject)">
       <PropertyGroup>
         <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
-        <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
       </PropertyGroup>
 
       <PropertyGroup>
@@ -24,7 +23,7 @@
         <PackageReference Include="System.ValueTuple" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" />
         <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
-        <PackageReference Include="xunit.v3" />
+        <PackageReference Include="xunit.v3.mtp-v2" />
       </ItemGroup>
     </When>
   </Choose>