Skip to content

Commit 6730fb2

Browse files
st0o0st0o0
committed
update xUnit
1 parent e5a14f6 commit 6730fb2

67 files changed

Lines changed: 115 additions & 157 deletions

Some content is hidden

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

‎.github/workflows/build-and-release.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ permissions:
1616
contents: write
1717
deployments: write
1818
checks: write
19-
pull-requests: write
2019

2120
jobs:
2221
build:
@@ -101,15 +100,17 @@ jobs:
101100
/p:ContinuousIntegrationBuild=true
102101
103102
- name: Run tests
103+
working-directory: src
104104
run: >
105-
dotnet test
106-
--configuration Release
107-
--no-build
108-
--collect:"XPlat Code Coverage"
109-
--logger trx
110-
--results-directory ${{ env.TEST_OUTPUT_DIRECTORY }}
111-
--verbosity normal
112-
${{ env.PROJECT_PATH }}
105+
dotnet test
106+
--configuration Release
107+
--no-ansi
108+
--no-build
109+
--results-directory ${{ env.TEST_OUTPUT_DIRECTORY }}
110+
--coverage
111+
--coverage-output-format cobertura
112+
--coverage-output ${{ env.TEST_OUTPUT_DIRECTORY }}/coverage.cobertura.xml
113+
--solution *.sln
113114
114115
- name: Create NuGet package
115116
run: >
@@ -124,7 +125,7 @@ jobs:
124125
- name: Report Code Coverage
125126
uses: danielpalme/ReportGenerator-GitHub-Action@5
126127
with:
127-
reports: '${{ env.TEST_OUTPUT_DIRECTORY }}/*/*cobertura.xml'
128+
reports: '${{ env.TEST_OUTPUT_DIRECTORY }}/**/coverage.cobertura.xml'
128129
targetdir: '${{ env.COVERAGE_REPORT_DIRECTORY }}'
129130
reporttypes: 'MarkdownSummaryGithub'
130131
tag: '${{ steps.gitversion.outputs.fullSemVer }}'

‎src/Directory.Build.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

9-
<PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Tests'))">
9+
<PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Tests')) or $(MSBuildProjectName.EndsWith('.Test'))">
1010
<IsPackable>false</IsPackable>
1111
<IsTestProject>true</IsTestProject>
12+
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
1213
</PropertyGroup>
1314

1415
</Project>

‎src/Directory.Packages.props‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,10 @@
66

77
<ItemGroup>
88
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4"/>
9-
<PackageVersion Include="System.Text.Json" Version="10.0.7"/>
109
<!--- Testing -->
11-
<PackageVersion Include="coverlet.collector" Version="6.0.4"/>
12-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1"/>
10+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.5.2"/>
1311
<PackageVersion Include="NSubstitute" Version="5.3.0"/>
14-
<PackageVersion Include="xunit" Version="2.9.3"/>
15-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5"/>
12+
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2"/>
1613
</ItemGroup>
1714

18-
</Project>
15+
</Project>

‎src/Flickr.Net.Test/Entities/BlogTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System.Text;
1+
using System.Text;
22
using Flickr.Net.Flickrs.Results;
33
using Flickr.Net.Internals;
4-
using Xunit;
54

65
namespace Flickr.Net.Test.Entities;
76

‎src/Flickr.Net.Test/Entities/CSVFileTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System.Text;
1+
using System.Text;
22
using Flickr.Net.Flickrs.Results;
33
using Flickr.Net.Internals;
4-
using Xunit;
54

65
namespace Flickr.Net.Test.Entities;
76

‎src/Flickr.Net.Test/Entities/CameraTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System.Text;
1+
using System.Text;
22
using Flickr.Net.Flickrs.Results;
33
using Flickr.Net.Internals;
4-
using Xunit;
54

65
namespace Flickr.Net.Test.Entities;
76

‎src/Flickr.Net.Test/Entities/ClusterTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System.Text;
1+
using System.Text;
22
using Flickr.Net.Flickrs.Results;
33
using Flickr.Net.Internals;
4-
using Xunit;
54

65
namespace Flickr.Net.Test.Entities;
76

‎src/Flickr.Net.Test/Entities/CollectionTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System.Text;
1+
using System.Text;
22
using Flickr.Net.Flickrs.Results;
33
using Flickr.Net.Internals;
4-
using Xunit;
54

65
namespace Flickr.Net.Test.Entities;
76

‎src/Flickr.Net.Test/Entities/CommentTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System.Text;
1+
using System.Text;
22
using Flickr.Net.Extensions;
33
using Flickr.Net.Flickrs.Results;
44
using Flickr.Net.Internals;
5-
using Xunit;
65

76
namespace Flickr.Net.Test.Entities;
87

‎src/Flickr.Net.Test/Entities/ContactTests.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
using System.Text;
1+
using System.Text;
22
using Flickr.Net.Flickrs.Results;
33
using Flickr.Net.Internals;
4-
using Xunit;
54

65
namespace Flickr.Net.Test.Entities;
76

0 commit comments

Comments
 (0)