Skip to content

Commit dc15de0

Browse files
twsouthwicktwsouthwick
authored
Update XUnit to v3 (#1857)
1 parent a34e967 commit dc15de0

File tree

62 files changed

+663
-717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+663
-717
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ jobs:
9696
- name: Build
9797
run: dotnet build --no-restore --verbosity normal
9898
- name: Test
99-
run: dotnet test --no-restore --verbosity normal --logger trx --results-directory test-results/
99+
run: dotnet test --no-restore -- --results-directory ${{ github.workspace }}/test-results/ --report-xunit-trx
100100
- name: Upload Test Results
101101
if: always()
102102
uses: actions/upload-artifact@v4
103103
with:
104104
name: Test Results (${{ matrix.os }} ${{ matrix.configuration }} ${{ matrix.projectloadstyle }})
105-
path: test-results/*
105+
path: ${{ github.workspace }}/test-results/*

‎.github/workflows/code-coverage.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020

2121
jobs:
2222
build_and_test:
23+
if: false # Disable for now while getting XUnit v3 working
2324
name: Run
2425

2526
env:

‎Directory.Build.props‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,11 @@
4141
<NoWarn>$(NoWarn);CS1685</NoWarn>
4242
<ProductTargetFrameworks>net35</ProductTargetFrameworks>
4343
<FrameworkTargetFrameworks>net35</FrameworkTargetFrameworks>
44-
<TestTargetFrameworks>net462</TestTargetFrameworks>
45-
<AssetsTargetFrameworks>net462</AssetsTargetFrameworks>
46-
<LatestTargetFramework>net462</LatestTargetFramework>
44+
<TestTargetFrameworks>net472</TestTargetFrameworks>
45+
<AssetsTargetFrameworks>net472</AssetsTargetFrameworks>
46+
<LatestTargetFramework>net472</LatestTargetFramework>
4747
<SamplesFrameworks>net472</SamplesFrameworks>
48+
<DefineConstants>$(DefineConstants);FEATURE_NO_VALIDATOR_CANCELLATIONTOKEN</DefineConstants>
4849
</PropertyGroup>
4950
</When>
5051
<When Condition=" '$(ProjectLoadStyle)' == 'net40' ">
@@ -53,22 +54,22 @@
5354
<NoWarn>$(NoWarn);CS1685</NoWarn>
5455
<ProductTargetFrameworks>net40</ProductTargetFrameworks>
5556
<FrameworkTargetFrameworks>net40</FrameworkTargetFrameworks>
56-
<TestTargetFrameworks>net462</TestTargetFrameworks>
57-
<AssetsTargetFrameworks>net462</AssetsTargetFrameworks>
58-
<LatestTargetFramework>net462</LatestTargetFramework>
57+
<TestTargetFrameworks>net472</TestTargetFrameworks>
58+
<AssetsTargetFrameworks>net472</AssetsTargetFrameworks>
59+
<LatestTargetFramework>net472</LatestTargetFramework>
5960
<SamplesFrameworks>net472</SamplesFrameworks>
6061
</PropertyGroup>
6162
</When>
6263
<Otherwise>
6364
<PropertyGroup>
6465
<ProductTargetFrameworks>netstandard2.0;net8.0;net35;net40;net46</ProductTargetFrameworks>
6566
<FrameworkTargetFrameworks>netstandard2.0;net6.0;net8.0;net35;net40;net46</FrameworkTargetFrameworks>
66-
<AssetsTargetFrameworks>netstandard2.0;net462</AssetsTargetFrameworks>
67+
<AssetsTargetFrameworks>netstandard2.0;net472</AssetsTargetFrameworks>
6768
<TestTargetFrameworks>net8.0</TestTargetFrameworks>
68-
<TestTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TestTargetFrameworks);net462</TestTargetFrameworks>
69+
<TestTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TestTargetFrameworks);net472</TestTargetFrameworks>
6970
<LatestTargetFramework>net8.0</LatestTargetFramework>
7071
<SamplesFrameworks>net8.0</SamplesFrameworks>
71-
<SamplesFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TestTargetFrameworks);net472</SamplesFrameworks>
72+
<SamplesFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(SamplesFrameworks);net472</SamplesFrameworks>
7273
</PropertyGroup>
7374
</Otherwise>
7475
</Choose>

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1414
<PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
1515
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
16+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
1617
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
1718
<PackageVersion Include="NSubstitute" Version="5.3.0" />
1819
<PackageVersion Include="NuGet.Common" Version="6.13.2" />
@@ -30,7 +31,6 @@
3031
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
3132
<PackageVersion Include="System.Xml.ReaderWriter" Version="4.3.1" />
3233
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
33-
<PackageVersion Include="xunit" Version="2.9.2" />
34-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
34+
<PackageVersion Include="xunit.v3" Version="1.0.0" />
3535
</ItemGroup>
3636
</Project>

‎Open-XML-SDK.sln‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{3653266D-2C8
6767
EndProject
6868
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DocumentFormat.OpenXml.Generator", "gen\DocumentFormat.OpenXml.Generator\DocumentFormat.OpenXml.Generator.csproj", "{E04F2FB4-DBC6-46DC-857C-F0E89B42F385}"
6969
EndProject
70-
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}"
71-
EndProject
7270
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Linq", "Linq", "{C5AE39F0-A152-471A-B90E-B8F4E94AA6C2}"
7371
EndProject
7472
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SvgExampleLinq", "samples\Linq\SvgExample\SvgExampleLinq.csproj", "{DE06FC2B-EABB-4535-BC73-C51A32B5AC01}"
@@ -149,10 +147,6 @@ Global
149147
{E04F2FB4-DBC6-46DC-857C-F0E89B42F385}.Debug|Any CPU.Build.0 = Debug|Any CPU
150148
{E04F2FB4-DBC6-46DC-857C-F0E89B42F385}.Release|Any CPU.ActiveCfg = Release|Any CPU
151149
{E04F2FB4-DBC6-46DC-857C-F0E89B42F385}.Release|Any CPU.Build.0 = Release|Any CPU
152-
{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153-
{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}.Debug|Any CPU.Build.0 = Debug|Any CPU
154-
{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}.Release|Any CPU.ActiveCfg = Release|Any CPU
155-
{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62}.Release|Any CPU.Build.0 = Release|Any CPU
156150
{DE06FC2B-EABB-4535-BC73-C51A32B5AC01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157151
{DE06FC2B-EABB-4535-BC73-C51A32B5AC01}.Debug|Any CPU.Build.0 = Debug|Any CPU
158152
{DE06FC2B-EABB-4535-BC73-C51A32B5AC01}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -211,7 +205,6 @@ Global
211205
{E157C5F1-D70B-4939-A199-0B758FED8541} = {0782A132-968D-4BDD-911A-2C3074EAF886}
212206
{3B82C340-3B10-42BF-9A2C-2E2327A9CFD4} = {0782A132-968D-4BDD-911A-2C3074EAF886}
213207
{E04F2FB4-DBC6-46DC-857C-F0E89B42F385} = {3653266D-2C88-4487-8977-839CB3E78A0A}
214-
{BAC36A8F-AA8E-4097-B2BA-2EFE559BEE62} = {0782A132-968D-4BDD-911A-2C3074EAF886}
215208
{C5AE39F0-A152-471A-B90E-B8F4E94AA6C2} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
216209
{DE06FC2B-EABB-4535-BC73-C51A32B5AC01} = {7DAF7304-40CC-4180-88A5-9A89DD13C565}
217210
{890B74DD-6316-4D56-B42A-5D66F10F88C6} = {C5AE39F0-A152-471A-B90E-B8F4E94AA6C2}

‎test/Common/ITestOutputHelperExtenstions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Newtonsoft.Json;
55
using Newtonsoft.Json.Converters;
66
using System.IO;
7-
using Xunit.Abstractions;
7+
using Xunit;
88

99
namespace DocumentFormat.OpenXml.Tests
1010
{

‎test/Common/VerifiableLog.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
using System;
77
using Xunit;
8-
using Xunit.Abstractions;
98

109
namespace LogUtil
1110
{

‎test/Directory.Build.targets‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<Project>
33
<Choose>
44
<When Condition="$(IsTestProject)">
5+
<PropertyGroup>
6+
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
7+
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
8+
</PropertyGroup>
9+
510
<PropertyGroup>
611
<NoWarn>$(NoWarn);CA1303;CA1307;CA1309;CA1822;CA1062</NoWarn>
712
<CommonFilesDirectory>$(MSBuildThisFileDirectory)Common/</CommonFilesDirectory>
@@ -12,20 +17,11 @@
1217
<Link>Common/$([MSBuild]::MakeRelative($(CommonFilesDirectory), %(FullPath)))</Link>
1318
</Compile>
1419
</ItemGroup>
20+
1521
<ItemGroup>
16-
<PackageReference Include="Newtonsoft.Json" />
17-
<PackageReference Include="System.ValueTuple" />
1822
<PackageReference Include="Microsoft.NET.Test.Sdk" />
19-
<PackageReference Include="NSubstitute" />
20-
<PackageReference Include="xunit" />
21-
<PackageReference Include="xunit.runner.visualstudio">
22-
<PrivateAssets>all</PrivateAssets>
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
24-
</PackageReference>
25-
<PackageReference Include="coverlet.collector">
26-
<PrivateAssets>all</PrivateAssets>
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
28-
</PackageReference>
23+
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
24+
<PackageReference Include="xunit.v3" />
2925
</ItemGroup>
3026
</When>
3127
</Choose>

‎test/DocumentFormat.OpenXml.Benchmarks/DocumentFormat.OpenXml.Benchmarks.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ItemGroup>
1313
<PackageReference Include="BenchmarkDotNet" />
1414
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
15-
<PackageReference Include="xunit" />
1615
</ItemGroup>
1716
<ItemGroup>
1817
<ProjectReference Include="..\..\src\DocumentFormat.OpenXml\DocumentFormat.OpenXml.csproj" />

‎test/DocumentFormat.OpenXml.Framework.Features.Tests/DocumentFormat.OpenXml.Framework.Features.Tests.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<IsTestProject>true</IsTestProject>
66
<Nullable>enable</Nullable>
77
<IncludeFrameworkShims>true</IncludeFrameworkShims>
8+
<OutputType>Exe</OutputType>
89
</PropertyGroup>
910

1011
<ItemGroup>
@@ -15,4 +16,9 @@
1516
<ProjectReference Include="..\..\src\DocumentFormat.OpenXml.Features\DocumentFormat.OpenXml.Features.csproj" />
1617
</ItemGroup>
1718

19+
<ItemGroup>
20+
<PackageReference Include="Newtonsoft.Json" />
21+
<PackageReference Include="NSubstitute" />
22+
</ItemGroup>
23+
1824
</Project>

0 commit comments

Comments
 (0)