Skip to content

Commit 729627b

Browse files
samtrionsamtrion
authored
feat: Support for TUnit (#549)
* feat: Support for TUnit * chore: Cleanup * ci: Changed `dotnet-version` to `vars.NE_DOTNET_TARGETFRAMEWORKS` * chore: Made methods static * chore(deps): upgraded packages * ci(deps): Updated pipelines * chore(deps): Added codecoverage for TUnit projects
1 parent 110b8ae commit 729627b

File tree

109 files changed

+2369
-23
lines changed

Some content is hidden

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

109 files changed

+2369
-23
lines changed

‎.github/workflows/cicd.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ on:
2121
jobs:
2222
all:
2323
name: Build & Tests
24-
uses: dailydevops/pipelines/.github/workflows/cicd-dotnet.yml@0.12.43
24+
uses: dailydevops/pipelines/.github/workflows/cicd-dotnet.yml@0.12.44
2525
with:
2626
dotnet-logging: ${{ inputs.dotnet-logging }}
27-
dotnet-version: 7.x
27+
dotnet-version: ${{ vars.NE_DOTNET_TARGETFRAMEWORKS }}
2828
enableSonarQube: true
2929
solution: ./Extensions.Test.sln
3030
secrets: inherit

‎.gitmodules‎

Whitespace-only changes.

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Title>$(PackageId)</Title>
5-
<Description>This library provides various compatibility features between `NUnit`, `XUnit` and `MSTest`.</Description>
5+
<Description>This library provides various compatibility features between `NUnit`, `XUnit`, `TUnit` and `MSTest`.</Description>
66

77
<CopyrightYearStart>2023</CopyrightYearStart>
88

@@ -22,7 +22,7 @@
2222

2323
<PropertyGroup>
2424
<NetEvolve_ProjectTargetFrameworks>netstandard2.0;net8.0;net9.0</NetEvolve_ProjectTargetFrameworks>
25-
<NetEvolve_TestTargetFrameworks>net6.0;net8.0;</NetEvolve_TestTargetFrameworks>
25+
<NetEvolve_TestTargetFrameworks>net6.0;net8.0;net9.0</NetEvolve_TestTargetFrameworks>
2626

2727
<NoWarn Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NoWarn);CA1062;</NoWarn>
2828

‎Directory.Build.targets‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Directory.Packages.props‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,25 @@
1717
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
1818
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
1919
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
20+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
2021
<PackageVersion Include="Microsoft.TestPlatform.TestHost" Version="17.12.0" />
2122
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.4" />
2223
<PackageVersion Include="MSTest.TestFramework" Version="3.6.4" />
2324
<PackageVersion Include="NUnit" Version="4.2.2" />
2425
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
2526
<PackageVersion Include="NUnit.Analyzers" Version="4.4.0" />
2627
<PackageVersion Include="PublicApiGenerator" Version="11.1.0" />
28+
<PackageVersion Include="TUnit" Version="0.4.99" />
29+
<PackageVersion Include="TUnit.Core" Version="0.4.99" />
2730
<PackageVersion Include="Verify.MSTest" Version="28.4.0" />
2831
<PackageVersion Include="Verify.NUnit" Version="28.4.0" />
32+
<PackageVersion Include="Verify.TUnit" Version="28.4.0" />
2933
<PackageVersion Include="Verify.Xunit" Version="28.4.0" />
30-
<PackageVersion Include="Verify.XunitV3" Version="28.1.3" />
34+
<PackageVersion Include="Verify.XunitV3" Version="28.4.0" />
3135
<PackageVersion Include="xunit" Version="2.9.2" />
3236
<PackageVersion Include="xunit.extensibility.core" Version="2.9.2" />
3337
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0-pre.49" />
34-
<PackageVersion Include="xunit.v3" Version="0.5.0-pre.27" />
35-
<PackageVersion Include="xunit.v3.extensibility.core" Version="0.5.0-pre.27" />
38+
<PackageVersion Include="xunit.v3" Version="0.7.0-pre.15" />
39+
<PackageVersion Include="xunit.v3.extensibility.core" Version="0.7.0-pre.15" />
3640
</ItemGroup>
37-
</Project>
41+
</Project>

‎Extensions.Test.sln‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
.editorconfig = .editorconfig
1010
.filenesting.json = .filenesting.json
1111
.gitignore = .gitignore
12-
.gitmodules = .gitmodules
1312
Directory.Build.props = Directory.Build.props
14-
Directory.Build.targets = Directory.Build.targets
1513
Directory.Packages.props = Directory.Packages.props
1614
Directory.Solution.props = Directory.Solution.props
1715
GitVersion.yml = GitVersion.yml
@@ -50,6 +48,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetEvolve.Extensions.XUnit.
5048
EndProject
5149
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.Extensions.XUnit.V3.Tests.PublicApi", "tests\NetEvolve.Extensions.XUnit.V3.Tests.PublicApi\NetEvolve.Extensions.XUnit.V3.Tests.PublicApi.csproj", "{852AA7AA-0F8B-4A13-8C56-D86753B3C054}"
5250
EndProject
51+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.Extensions.TUnit", "src\NetEvolve.Extensions.TUnit\NetEvolve.Extensions.TUnit.csproj", "{12320F24-3F55-4BCF-A773-6FCAB46EA6A6}"
52+
EndProject
53+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.Extensions.TUnit.Tests.Unit", "tests\NetEvolve.Extensions.TUnit.Tests.Unit\NetEvolve.Extensions.TUnit.Tests.Unit.csproj", "{1E5B501F-C9D5-4C75-AF7A-EFC7D77EEAF5}"
54+
EndProject
55+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetEvolve.Extensions.TUnit.Tests.PublicApi", "tests\NetEvolve.Extensions.TUnit.Tests.PublicApi\NetEvolve.Extensions.TUnit.Tests.PublicApi.csproj", "{D6A20E67-D073-4EBF-A5B7-AD08EF401AC8}"
56+
EndProject
5357
Global
5458
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5559
Debug|Any CPU = Debug|Any CPU
@@ -104,6 +108,18 @@ Global
104108
{852AA7AA-0F8B-4A13-8C56-D86753B3C054}.Debug|Any CPU.Build.0 = Debug|Any CPU
105109
{852AA7AA-0F8B-4A13-8C56-D86753B3C054}.Release|Any CPU.ActiveCfg = Release|Any CPU
106110
{852AA7AA-0F8B-4A13-8C56-D86753B3C054}.Release|Any CPU.Build.0 = Release|Any CPU
111+
{12320F24-3F55-4BCF-A773-6FCAB46EA6A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112+
{12320F24-3F55-4BCF-A773-6FCAB46EA6A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
113+
{12320F24-3F55-4BCF-A773-6FCAB46EA6A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
114+
{12320F24-3F55-4BCF-A773-6FCAB46EA6A6}.Release|Any CPU.Build.0 = Release|Any CPU
115+
{1E5B501F-C9D5-4C75-AF7A-EFC7D77EEAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116+
{1E5B501F-C9D5-4C75-AF7A-EFC7D77EEAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
117+
{1E5B501F-C9D5-4C75-AF7A-EFC7D77EEAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
118+
{1E5B501F-C9D5-4C75-AF7A-EFC7D77EEAF5}.Release|Any CPU.Build.0 = Release|Any CPU
119+
{D6A20E67-D073-4EBF-A5B7-AD08EF401AC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
120+
{D6A20E67-D073-4EBF-A5B7-AD08EF401AC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
121+
{D6A20E67-D073-4EBF-A5B7-AD08EF401AC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
122+
{D6A20E67-D073-4EBF-A5B7-AD08EF401AC8}.Release|Any CPU.Build.0 = Release|Any CPU
107123
EndGlobalSection
108124
GlobalSection(SolutionProperties) = preSolution
109125
HideSolutionNode = FALSE
@@ -121,6 +137,9 @@ Global
121137
{E59DDFAC-7E76-41B8-B347-344E2AB5046C} = {19B4116B-14B4-436F-8A52-E71DB9CFCA7C}
122138
{8CB5E4DA-E255-40A2-97FA-834CE0CA7F17} = {D67E420A-2329-4879-B82C-069039603B81}
123139
{852AA7AA-0F8B-4A13-8C56-D86753B3C054} = {D67E420A-2329-4879-B82C-069039603B81}
140+
{12320F24-3F55-4BCF-A773-6FCAB46EA6A6} = {19B4116B-14B4-436F-8A52-E71DB9CFCA7C}
141+
{1E5B501F-C9D5-4C75-AF7A-EFC7D77EEAF5} = {D67E420A-2329-4879-B82C-069039603B81}
142+
{D6A20E67-D073-4EBF-A5B7-AD08EF401AC8} = {D67E420A-2329-4879-B82C-069039603B81}
124143
EndGlobalSection
125144
GlobalSection(ExtensibilityGlobals) = postSolution
126145
SolutionGuid = {EBB4607C-57F7-4F91-93B2-A444A3D33755}

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
Compatibility library for solutions using multiple .NET test frameworks.
44
The following test frameworks are supported
5-
- [MSTest](https://www.nuget.org/packages/NetEvolve.Extensions.MSTest),
6-
- [NUnit](https://www.nuget.org/packages/NetEvolve.Extensions.NUnit)
5+
- [MSTest](https://www.nuget.org/packages/NetEvolve.Extensions.MSTest)
6+
- [NUnit](https://www.nuget.org/packages/NetEvolve.Extensions.NUnit)
7+
- [TUnit](https://www.nuget.org/packages/NetEvolve.Extensions.TUnit)
78
- [XUnit](https://www.nuget.org/packages/NetEvolve.Extensions.XUnit)
89
- [XUnit.V3](https://www.nuget.org/packages/NetEvolve.Extensions.XUnit.V3)

‎src/NetEvolve.Extensions.MSTest/NetEvolve.Extensions.MSTest.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

7+
<PropertyGroup>
8+
<PackageTags>$(PackageTags);mstest</PackageTags>
9+
</PropertyGroup>
10+
711
<ItemGroup>
812
<PackageReference Include="MSTest.TestFramework" />
913
</ItemGroup>

‎src/NetEvolve.Extensions.MSTest/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
Compatibility library for solutions using multiple .NET test frameworks.
44
The following test frameworks are supported
5-
- [MSTest](https://www.nuget.org/packages/NetEvolve.Extensions.MSTest),
6-
- [NUnit](https://www.nuget.org/packages/NetEvolve.Extensions.NUnit)
5+
- [MSTest](https://www.nuget.org/packages/NetEvolve.Extensions.MSTest)
6+
- [NUnit](https://www.nuget.org/packages/NetEvolve.Extensions.NUnit)
7+
- [TUnit](https://www.nuget.org/packages/NetEvolve.Extensions.TUnit)
78
- [XUnit](https://www.nuget.org/packages/NetEvolve.Extensions.XUnit)
89
- [XUnit.V3](https://www.nuget.org/packages/NetEvolve.Extensions.XUnit.V3)
910

‎src/NetEvolve.Extensions.NUnit/NetEvolve.Extensions.NUnit.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

7+
<PropertyGroup>
8+
<PackageTags>$(PackageTags);nunit</PackageTags>
9+
</PropertyGroup>
10+
711
<ItemGroup>
812
<PackageReference Include="NUnit" />
913
</ItemGroup>

0 commit comments

Comments
 (0)