Skip to content

Commit f8d57ba

Browse files
committed
use xunit.v3 for unit tests
Update dependencies and refactor test framework - Bump `Nerdbank.GitVersioning` to version `3.7.115`. - Add new package references for `Tmds.ExecFunction`, `xunit.v3`, and `System.Buffers`. - Remove outdated package references in `Directory.Packages.props`. - Update `Microsoft.NET.Test.Sdk` and `xunit` versions across projects. - Refactor tests to use standard `Fact` attributes instead of `ConditionalFact`. - Enhance logging and error handling in `CoverletInProcDataCollector` and `InstrumentationTask` tests. - Clean up deprecated code and comments in test files. - Adjust project files for compatibility with the latest .NET SDK.
1 parent e106d0d commit f8d57ba

File tree

89 files changed

+1086
-883
lines changed

Some content is hidden

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

89 files changed

+1086
-883
lines changed

Directory.Packages.props

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
8-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.112" />
8+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<PackageVersion Include="DotNetConfig" Version="1.2.0" />
@@ -22,7 +22,7 @@
2222
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2323
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.12.0" />
2424
<!-- Microsoft.TestPlatform.ObjectModel has a dependency to NuGet.Frameworks with specific version -->
25-
<!-- https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L35-->
25+
<!-- https://github.com/microsoft/vstest/blob/9a0c41811637edf4afe0e265e08fdd1cb18109ed/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj#L36-->
2626
<!-- wrong configuration will create "build\coverlet.msbuild.targets(72,5): error : Unable to read beyond the end of the stream." -->
2727
<!--
2828
vstest 17.5 version /scripts/build/TestPlatform.Dependencies.props
@@ -41,22 +41,23 @@
4141
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.7" />
4242
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
4343
<!--To test issue 1104 https://github.com/coverlet-coverage/coverlet/issues/1104-->
44+
<!-- latest Tmds.ExecFunction package uses EnvDTE V17.8.37221 -->
45+
<PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
46+
<PackageVersion Include="xunit.v3" Version="1.0.1" />
47+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
48+
49+
<PackageVersion Include="System.Buffers" Version="4.6.0" />
4450
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
4551
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
4652
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
47-
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
48-
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
49-
<PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
50-
<PackageVersion Include="xunit" Version="2.9.2" />
51-
<PackageVersion Include="xunit.assemblyfixture" Version="2.2.0" />
52-
<PackageVersion Include="xunit.assert" Version="2.9.2" />
53-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
54-
<PackageVersion Include="System.Buffers" Version="4.6.0" />
5553
<PackageVersion Include="System.Memory" Version="4.6.0" />
5654
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
55+
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
56+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.0" />
5757
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
5858
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
5959
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
6060
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
61+
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
6162
</ItemGroup>
6263
</Project>

Documentation/Examples/MSBuild/DeterministicBuild/HowTo.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
To run test we need to generates packages to reference in on test project.
1+
To run test we need to generates packages to reference in on test project.
22
Run from repo root
33

44
```shell
@@ -44,9 +44,9 @@ Add msbuild package version generated to `"..\Documentation\Examples\MSBuild\Det
4444
</PropertyGroup>
4545

4646
<ItemGroup>
47-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
48-
<PackageReference Include="xunit" Version="2.6.5" />
49-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
47+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
48+
<PackageReference Include="xunit.v3" Version="1.0.1" />
49+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
5050
<PrivateAssets>all</PrivateAssets>
5151
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
5252
</PackageReference>

Documentation/Examples/MSBuild/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11-
<PackageReference Include="xunit" Version="2.6.6" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
11+
<PackageReference Include="xunit.v3" Version="1.0.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject1/XUnitTestProject1.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15-
<PackageReference Include="xunit" Version="2.6.6" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
15+
<PackageReference Include="xunit.v3" Version="1.0.1" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
19-
</PackageReference>
19+
</PackageReference>
2020
</ItemGroup>
2121

2222
<ItemGroup>

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject2/XUnitTestProject2.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15-
<PackageReference Include="xunit" Version="2.6.6" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
15+
<PackageReference Include="xunit.v3" Version="1.0.1" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1919
</PackageReference>

Documentation/Examples/MSBuild/MergeWith/XUnitTestProject3/XUnitTestProject3.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
15-
<PackageReference Include="xunit" Version="2.6.6" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
15+
<PackageReference Include="xunit.v3" Version="1.0.1" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1717
<PrivateAssets>all</PrivateAssets>
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1919
</PackageReference>

Documentation/Examples/VSTest/DeterministicBuild/HowTo.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ Add collectors package version generated to `"..\Documentation\Examples\VSTest\D
4444
</PropertyGroup>
4545

4646
<ItemGroup>
47-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
48-
<PackageReference Include="xunit" Version="2.6.5" />
49-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
47+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
48+
<PackageReference Include="xunit.v3" Version="1.0.1" />
49+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
5050
<PrivateAssets>all</PrivateAssets>
5151
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
5252
</PackageReference>

Documentation/Examples/VSTest/DeterministicBuild/XUnitTestProject1/XUnitTestProject1.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11-
<PackageReference Include="xunit" Version="2.6.6" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
11+
<PackageReference Include="xunit.v3" Version="1.0.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1515
</PackageReference>

Documentation/Examples/VSTest/HelloWorld/XUnitTestProject1/XUnitTestProject1.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
12-
<PackageReference Include="xunit" Version="2.6.6" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
12+
<PackageReference Include="xunit.v3" Version="1.0.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1616
</PackageReference>

Documentation/KnownIssues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ If you upgrade the collector package with a version greater than 1.0.0, in-proc
6565
```xml
6666
<ItemGroup>
6767
...
68-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
68+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
6969
...
7070
</ItemGroup>
7171
```

0 commit comments

Comments
 (0)