diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e2b4a9d5..6631681fe 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/Directory.Build.props b/Directory.Build.props index b14204e9a..195e907ec 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -62,8 +62,8 @@ - netstandard2.0;net8.0;net35;net40;net46 - netstandard2.0;net6.0;net8.0;net35;net40;net46 + netstandard2.0;net10.0;net8.0;net35;net40;net46 + netstandard2.0;net10.0;net6.0;net8.0;net35;net40;net46 netstandard2.0;net472 net8.0 $(TestTargetFrameworks);net472 @@ -87,7 +87,7 @@ - 13 + latest diff --git a/Directory.Packages.props b/Directory.Packages.props index 12b0f3705..31a1af528 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -11,10 +11,10 @@ - + - + @@ -32,6 +32,6 @@ - + \ No newline at end of file diff --git a/Open-XML-SDK.sln b/Open-XML-SDK.sln deleted file mode 100644 index 75a1b8c91..000000000 --- a/Open-XML-SDK.sln +++ /dev/null @@ -1,216 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.31911.260 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0B53C729-D408-450D-B755-7A57184CDE93}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - .vsconfig = .vsconfig - CHANGELOG.md = CHANGELOG.md - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - Directory.Packages.props = Directory.Packages.props - GitVersion.yml = GitVersion.yml - global.json = global.json - LICENSE = LICENSE - NuGet.Config = NuGet.Config - data\OpenXmlData.targets = data\OpenXmlData.targets - README.md = README.md - stylecop.json = stylecop.json - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml", "src\DocumentFormat.OpenXml\DocumentFormat.OpenXml.csproj", "{16941A4A-F8DE-4C8D-BA2B-3C0774848D4B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Tests", "test\DocumentFormat.OpenXml.Tests\DocumentFormat.OpenXml.Tests.csproj", "{B92240AF-6E87-4428-9C5A-371178A04E5B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Packaging.Tests", "test\DocumentFormat.OpenXml.Packaging.Tests\DocumentFormat.OpenXml.Packaging.Tests.csproj", "{B9138975-0D18-4EC7-92C3-A2DB71DF64E9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A4DF60EB-3AA5-48F0-B4D2-3F94B8E62F03}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - src\Directory.Build.targets = src\Directory.Build.targets - src\common\FrameworkShims.targets = src\common\FrameworkShims.targets - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0782A132-968D-4BDD-911A-2C3074EAF886}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - test\Directory.Build.targets = test\Directory.Build.targets - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Tests.Assets", "test\DocumentFormat.OpenXml.Tests.Assets\DocumentFormat.OpenXml.Tests.Assets.csproj", "{1F680DC8-8D1E-4EC9-84E1-72BCEAA7D458}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Benchmarks", "test\DocumentFormat.OpenXml.Benchmarks\DocumentFormat.OpenXml.Benchmarks.csproj", "{B4604C70-721C-42C4-9D29-87E9084E927F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Framework.Tests", "test\DocumentFormat.OpenXml.Framework.Tests\DocumentFormat.OpenXml.Framework.Tests.csproj", "{65D509D0-46DC-4883-AEB3-FF7E521B1E9F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{7DAF7304-40CC-4180-88A5-9A89DD13C565}" - ProjectSection(SolutionItems) = preProject - samples\Directory.Build.props = samples\Directory.Build.props - samples\Directory.Build.targets = samples\Directory.Build.targets - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IsolatedStorageExceptionWorkaround", "samples\IsolatedStorageExceptionWorkaround\IsolatedStorageExceptionWorkaround.csproj", "{F38D119D-A5B7-4027-83B1-804432922E55}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SunburstChartExample", "samples\SunburstChartExample\SunburstChartExample.csproj", "{5034C012-FED8-4DE5-B422-C1E4DF9EDBF2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Linq", "src\DocumentFormat.OpenXml.Linq\DocumentFormat.OpenXml.Linq.csproj", "{8DB6A050-4584-4210-8DE1-CB299A08EA4F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Features", "src\DocumentFormat.OpenXml.Features\DocumentFormat.OpenXml.Features.csproj", "{8D6D3961-9C39-405B-A953-4823D87227D9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Framework.Features.Tests", "test\DocumentFormat.OpenXml.Framework.Features.Tests\DocumentFormat.OpenXml.Framework.Features.Tests.csproj", "{E157C5F1-D70B-4939-A199-0B758FED8541}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Linq.Tests", "test\DocumentFormat.OpenXml.Linq.Tests\DocumentFormat.OpenXml.Linq.Tests.csproj", "{3B82C340-3B10-42BF-9A2C-2E2327A9CFD4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3653266D-2C88-4487-8977-839CB3E78A0A}" -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("{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}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AddAnimatedModel3D", "samples\AnimatedModel3DExample\AddAnimatedModel3D.csproj", "{890B74DD-6316-4D56-B42A-5D66F10F88C6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentTaskSample", "samples\DocumentTaskExample\DocumentTaskSample.csproj", "{5DE9FB8F-A7C2-4038-A4A8-1622CDB6821A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AddNamedSheetView", "samples\NamedSheetView\AddNamedSheetView.csproj", "{F48B7D50-16CB-4BEF-A614-2DED9960AF09}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Generator.Models", "gen\DocumentFormat.OpenXml.Generator.Models\DocumentFormat.OpenXml.Generator.Models.csproj", "{C91489AB-FF14-4FAD-BA51-35371ADD7E1C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Framework", "src\DocumentFormat.OpenXml.Framework\DocumentFormat.OpenXml.Framework.csproj", "{BB5DF535-E849-42AC-852A-A6D4815347C0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThreadedCommentExample", "samples\ThreadedCommentExample\ThreadedCommentExample.csproj", "{5241BCF2-331D-428E-A9C4-F8DF92C8F726}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SVGExample", "samples\SVGExample\SVGExample.csproj", "{BADAC0CC-F3E6-440E-B322-DA2B97625F26}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RichData", "samples\RichData\RichData.csproj", "{8EE9F34E-EAA1-4F03-B388-8076CE44DD7B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {16941A4A-F8DE-4C8D-BA2B-3C0774848D4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16941A4A-F8DE-4C8D-BA2B-3C0774848D4B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16941A4A-F8DE-4C8D-BA2B-3C0774848D4B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16941A4A-F8DE-4C8D-BA2B-3C0774848D4B}.Release|Any CPU.Build.0 = Release|Any CPU - {B92240AF-6E87-4428-9C5A-371178A04E5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B92240AF-6E87-4428-9C5A-371178A04E5B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B92240AF-6E87-4428-9C5A-371178A04E5B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B92240AF-6E87-4428-9C5A-371178A04E5B}.Release|Any CPU.Build.0 = Release|Any CPU - {B9138975-0D18-4EC7-92C3-A2DB71DF64E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9138975-0D18-4EC7-92C3-A2DB71DF64E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9138975-0D18-4EC7-92C3-A2DB71DF64E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9138975-0D18-4EC7-92C3-A2DB71DF64E9}.Release|Any CPU.Build.0 = Release|Any CPU - {1F680DC8-8D1E-4EC9-84E1-72BCEAA7D458}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F680DC8-8D1E-4EC9-84E1-72BCEAA7D458}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F680DC8-8D1E-4EC9-84E1-72BCEAA7D458}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F680DC8-8D1E-4EC9-84E1-72BCEAA7D458}.Release|Any CPU.Build.0 = Release|Any CPU - {B4604C70-721C-42C4-9D29-87E9084E927F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B4604C70-721C-42C4-9D29-87E9084E927F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B4604C70-721C-42C4-9D29-87E9084E927F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B4604C70-721C-42C4-9D29-87E9084E927F}.Release|Any CPU.Build.0 = Release|Any CPU - {65D509D0-46DC-4883-AEB3-FF7E521B1E9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {65D509D0-46DC-4883-AEB3-FF7E521B1E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65D509D0-46DC-4883-AEB3-FF7E521B1E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {65D509D0-46DC-4883-AEB3-FF7E521B1E9F}.Release|Any CPU.Build.0 = Release|Any CPU - {F38D119D-A5B7-4027-83B1-804432922E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F38D119D-A5B7-4027-83B1-804432922E55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F38D119D-A5B7-4027-83B1-804432922E55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F38D119D-A5B7-4027-83B1-804432922E55}.Release|Any CPU.Build.0 = Release|Any CPU - {5034C012-FED8-4DE5-B422-C1E4DF9EDBF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5034C012-FED8-4DE5-B422-C1E4DF9EDBF2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5034C012-FED8-4DE5-B422-C1E4DF9EDBF2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5034C012-FED8-4DE5-B422-C1E4DF9EDBF2}.Release|Any CPU.Build.0 = Release|Any CPU - {8DB6A050-4584-4210-8DE1-CB299A08EA4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DB6A050-4584-4210-8DE1-CB299A08EA4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DB6A050-4584-4210-8DE1-CB299A08EA4F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DB6A050-4584-4210-8DE1-CB299A08EA4F}.Release|Any CPU.Build.0 = Release|Any CPU - {8D6D3961-9C39-405B-A953-4823D87227D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D6D3961-9C39-405B-A953-4823D87227D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D6D3961-9C39-405B-A953-4823D87227D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D6D3961-9C39-405B-A953-4823D87227D9}.Release|Any CPU.Build.0 = Release|Any CPU - {E157C5F1-D70B-4939-A199-0B758FED8541}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E157C5F1-D70B-4939-A199-0B758FED8541}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E157C5F1-D70B-4939-A199-0B758FED8541}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E157C5F1-D70B-4939-A199-0B758FED8541}.Release|Any CPU.Build.0 = Release|Any CPU - {3B82C340-3B10-42BF-9A2C-2E2327A9CFD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B82C340-3B10-42BF-9A2C-2E2327A9CFD4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B82C340-3B10-42BF-9A2C-2E2327A9CFD4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B82C340-3B10-42BF-9A2C-2E2327A9CFD4}.Release|Any CPU.Build.0 = Release|Any CPU - {E04F2FB4-DBC6-46DC-857C-F0E89B42F385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {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 - {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 - {DE06FC2B-EABB-4535-BC73-C51A32B5AC01}.Release|Any CPU.Build.0 = Release|Any CPU - {890B74DD-6316-4D56-B42A-5D66F10F88C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {890B74DD-6316-4D56-B42A-5D66F10F88C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {890B74DD-6316-4D56-B42A-5D66F10F88C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {890B74DD-6316-4D56-B42A-5D66F10F88C6}.Release|Any CPU.Build.0 = Release|Any CPU - {5DE9FB8F-A7C2-4038-A4A8-1622CDB6821A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5DE9FB8F-A7C2-4038-A4A8-1622CDB6821A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5DE9FB8F-A7C2-4038-A4A8-1622CDB6821A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5DE9FB8F-A7C2-4038-A4A8-1622CDB6821A}.Release|Any CPU.Build.0 = Release|Any CPU - {F48B7D50-16CB-4BEF-A614-2DED9960AF09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F48B7D50-16CB-4BEF-A614-2DED9960AF09}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F48B7D50-16CB-4BEF-A614-2DED9960AF09}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F48B7D50-16CB-4BEF-A614-2DED9960AF09}.Release|Any CPU.Build.0 = Release|Any CPU - {C91489AB-FF14-4FAD-BA51-35371ADD7E1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C91489AB-FF14-4FAD-BA51-35371ADD7E1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C91489AB-FF14-4FAD-BA51-35371ADD7E1C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C91489AB-FF14-4FAD-BA51-35371ADD7E1C}.Release|Any CPU.Build.0 = Release|Any CPU - {BB5DF535-E849-42AC-852A-A6D4815347C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB5DF535-E849-42AC-852A-A6D4815347C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB5DF535-E849-42AC-852A-A6D4815347C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB5DF535-E849-42AC-852A-A6D4815347C0}.Release|Any CPU.Build.0 = Release|Any CPU - {5241BCF2-331D-428E-A9C4-F8DF92C8F726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5241BCF2-331D-428E-A9C4-F8DF92C8F726}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5241BCF2-331D-428E-A9C4-F8DF92C8F726}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5241BCF2-331D-428E-A9C4-F8DF92C8F726}.Release|Any CPU.Build.0 = Release|Any CPU - {BADAC0CC-F3E6-440E-B322-DA2B97625F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BADAC0CC-F3E6-440E-B322-DA2B97625F26}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BADAC0CC-F3E6-440E-B322-DA2B97625F26}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BADAC0CC-F3E6-440E-B322-DA2B97625F26}.Release|Any CPU.Build.0 = Release|Any CPU - {8EE9F34E-EAA1-4F03-B388-8076CE44DD7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8EE9F34E-EAA1-4F03-B388-8076CE44DD7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8EE9F34E-EAA1-4F03-B388-8076CE44DD7B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8EE9F34E-EAA1-4F03-B388-8076CE44DD7B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {16941A4A-F8DE-4C8D-BA2B-3C0774848D4B} = {A4DF60EB-3AA5-48F0-B4D2-3F94B8E62F03} - {B92240AF-6E87-4428-9C5A-371178A04E5B} = {0782A132-968D-4BDD-911A-2C3074EAF886} - {B9138975-0D18-4EC7-92C3-A2DB71DF64E9} = {0782A132-968D-4BDD-911A-2C3074EAF886} - {1F680DC8-8D1E-4EC9-84E1-72BCEAA7D458} = {0782A132-968D-4BDD-911A-2C3074EAF886} - {B4604C70-721C-42C4-9D29-87E9084E927F} = {0782A132-968D-4BDD-911A-2C3074EAF886} - {65D509D0-46DC-4883-AEB3-FF7E521B1E9F} = {0782A132-968D-4BDD-911A-2C3074EAF886} - {F38D119D-A5B7-4027-83B1-804432922E55} = {7DAF7304-40CC-4180-88A5-9A89DD13C565} - {5034C012-FED8-4DE5-B422-C1E4DF9EDBF2} = {7DAF7304-40CC-4180-88A5-9A89DD13C565} - {8DB6A050-4584-4210-8DE1-CB299A08EA4F} = {A4DF60EB-3AA5-48F0-B4D2-3F94B8E62F03} - {8D6D3961-9C39-405B-A953-4823D87227D9} = {A4DF60EB-3AA5-48F0-B4D2-3F94B8E62F03} - {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} - {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} - {5DE9FB8F-A7C2-4038-A4A8-1622CDB6821A} = {7DAF7304-40CC-4180-88A5-9A89DD13C565} - {F48B7D50-16CB-4BEF-A614-2DED9960AF09} = {7DAF7304-40CC-4180-88A5-9A89DD13C565} - {C91489AB-FF14-4FAD-BA51-35371ADD7E1C} = {3653266D-2C88-4487-8977-839CB3E78A0A} - {BB5DF535-E849-42AC-852A-A6D4815347C0} = {A4DF60EB-3AA5-48F0-B4D2-3F94B8E62F03} - {5241BCF2-331D-428E-A9C4-F8DF92C8F726} = {7DAF7304-40CC-4180-88A5-9A89DD13C565} - {BADAC0CC-F3E6-440E-B322-DA2B97625F26} = {7DAF7304-40CC-4180-88A5-9A89DD13C565} - {8EE9F34E-EAA1-4F03-B388-8076CE44DD7B} = {7DAF7304-40CC-4180-88A5-9A89DD13C565} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6F476383-E917-43D1-A1E5-9A61A47DA3F5} - EndGlobalSection -EndGlobal diff --git a/Open-XML-SDK.slnx b/Open-XML-SDK.slnx new file mode 100644 index 000000000..e5f71b362 --- /dev/null +++ b/Open-XML-SDK.slnx @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/global.json b/global.json index c6fbdb46a..5daad763e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,9 @@ { "sdk": { - "version": "9.0.100", + "version": "10.0.100", "rollForward": "feature" + }, + "test": { + "runner": "Microsoft.Testing.Platform" } } diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 95fc646f3..e3bdd29ce 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -3,7 +3,7 @@ true - 3.1.1 + 3.3.0 diff --git a/src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj b/src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj index 3da050f2b..a74ae05bc 100644 --- a/src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj +++ b/src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj @@ -28,7 +28,7 @@ DocumentFormat.OpenXml - + diff --git a/src/DocumentFormat.OpenXml.Framework/PublicAPI/net10.0/PublicAPI.Shipped.txt b/src/DocumentFormat.OpenXml.Framework/PublicAPI/net10.0/PublicAPI.Shipped.txt new file mode 100644 index 000000000..cd480faa8 --- /dev/null +++ b/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.OpenXmlValidator.Validate(DocumentFormat.OpenXml.Packaging.OpenXmlPackage! openXmlPackage, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Collections.Generic.IEnumerable! +DocumentFormat.OpenXml.Validation.OpenXmlValidator.Validate(DocumentFormat.OpenXml.Packaging.OpenXmlPart! openXmlPart, System.Threading.CancellationToken token = default(System.Threading.CancellationToken)) -> System.Collections.Generic.IEnumerable! + +DocumentFormat.OpenXml.HexBinaryValue.TryWriteBytes(System.Span bytes) -> bool +static DocumentFormat.OpenXml.HexBinaryValue.Create(System.ReadOnlySpan 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! attributes, System.Collections.Generic.IEnumerable>! namespaceDeclarations) -> System.Threading.Tasks.Task! +virtual DocumentFormat.OpenXml.OpenXmlWriter.WriteStartElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject, System.Collections.Generic.IEnumerable! 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! attributes, System.Collections.Generic.IEnumerable>! namespaceDeclarations) -> System.Threading.Tasks.Task! +override DocumentFormat.OpenXml.OpenXmlPartWriter.WriteStartElementAsync(DocumentFormat.OpenXml.OpenXmlElement! elementObject, System.Collections.Generic.IEnumerable! 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 diff --git a/src/DocumentFormat.OpenXml.Framework/PublicAPI/net10.0/PublicAPI.Unshipped.txt b/src/DocumentFormat.OpenXml.Framework/PublicAPI/net10.0/PublicAPI.Unshipped.txt new file mode 100644 index 000000000..e2eebeccc --- /dev/null +++ b/src/DocumentFormat.OpenXml.Framework/PublicAPI/net10.0/PublicAPI.Unshipped.txt @@ -0,0 +1,2 @@ +#nullable enable + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index c1153f3f8..f77cf4244 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -4,7 +4,6 @@ true - true @@ -24,7 +23,7 @@ - +