Skip to content

Commit 522630b

Browse files
samtrionsamtrion
authored
feat!: .NET 10 Support and removed XUnit.V2 Support (#841)
* feat!: .NET 10 Support * fix(pipeline): Use `.slnx` solution file * docs: Updated readme * chore(deps): Removed gitversion * fix: Switched to MTP context * fix(test): Switched to MSTest for PublicAPI * fix(test): Switched NUnit.PublicAPI also to NUnit * chore: Removed Support for XUnit V2 * fix(deps): Added missing `Microsoft.Testing.Extensions.CodeCoverage` * fix(coverage): Downgraded `Microsoft.Testing.Extensions.CodeCoverage` for NUnit and XUnit
1 parent a8ea16c commit 522630b

131 files changed

Lines changed: 949 additions & 3192 deletions

File tree

Some content is hidden

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

‎.github/workflows/cicd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ jobs:
2525
with:
2626
dotnetLogging: ${{ inputs.dotnet-logging }}
2727
dotnetVersion: ${{ vars.NE_DOTNET_TARGETFRAMEWORKS }}
28-
solution: ./Extensions.Test.sln
28+
solution: ./Extensions.Test.slnx
2929
secrets: inherit

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<None Include="..\_snapshots\**\*.*" Link="_sharedSnapshots\%(RecursiveDir)%(Filename)%(Extension)" Visible="" />
1515
</ItemGroup>
1616
<PropertyGroup>
17-
<NetEvolve_ProjectTargetFrameworks>netstandard2.0;net8.0;net9.0</NetEvolve_ProjectTargetFrameworks>
18-
<NetEvolve_TestTargetFrameworks>net8.0;net9.0</NetEvolve_TestTargetFrameworks>
17+
<NetEvolve_ProjectTargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</NetEvolve_ProjectTargetFrameworks>
18+
<NetEvolve_TestTargetFrameworks>net8.0;net9.0;net10.0</NetEvolve_TestTargetFrameworks>
1919
<NoWarn Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NoWarn);CA1062;</NoWarn>
2020
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
2121
</PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<GlobalPackageReference Include="CSharpier.MSBuild" Version="1.2.1" />
8-
<GlobalPackageReference Include="GitVersion.MsBuild" Version="6.4.0" />
98
<GlobalPackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
109
<GlobalPackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100" />
1110
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@@ -15,8 +14,6 @@
1514
<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848" />
1615
</ItemGroup>
1716
<ItemGroup>
18-
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
19-
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
2017
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2118
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
2219
<PackageVersion Include="Microsoft.TestPlatform.TestHost" Version="18.0.1" />
@@ -31,10 +28,7 @@
3128
<PackageVersion Include="Verify.MSTest" Version="31.7.2" />
3229
<PackageVersion Include="Verify.NUnit" Version="31.7.2" />
3330
<PackageVersion Include="Verify.TUnit" Version="31.7.2" />
34-
<PackageVersion Include="Verify.Xunit" Version="31.7.2" />
3531
<PackageVersion Include="Verify.XunitV3" Version="31.7.2" />
36-
<PackageVersion Include="xunit" Version="2.9.3" />
37-
<PackageVersion Include="xunit.extensibility.core" Version="2.9.3" />
3832
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
3933
<PackageVersion Include="xunit.v3" Version="3.2.0" />
4034
<PackageVersion Include="xunit.v3.common" Version="3.2.0" />

‎Extensions.Test.sln‎

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

‎Extensions.Test.slnx‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Solution>
2+
<Folder Name="/Solution Items/">
3+
<File Path=".csharpierignore" />
4+
<File Path=".editorconfig" />
5+
<File Path=".filenesting.json" />
6+
<File Path=".gitignore" />
7+
<File Path="Directory.Build.props" />
8+
<File Path="Directory.Packages.props" />
9+
<File Path="Directory.Solution.props" />
10+
<File Path="GitVersion.yml" />
11+
<File Path="LICENSE" />
12+
<File Path="new-project.ps1" />
13+
<File Path="nuget.config" />
14+
<File Path="README.md" />
15+
<File Path="update-solution.ps1" />
16+
</Folder>
17+
<Folder Name="/src/">
18+
<Project Path="src/NetEvolve.Extensions.MSTest/NetEvolve.Extensions.MSTest.csproj" />
19+
<Project Path="src/NetEvolve.Extensions.NUnit/NetEvolve.Extensions.NUnit.csproj" />
20+
<Project Path="src/NetEvolve.Extensions.TUnit/NetEvolve.Extensions.TUnit.csproj" />
21+
<Project Path="src/NetEvolve.Extensions.XUnit.V3/NetEvolve.Extensions.XUnit.V3.csproj" />
22+
</Folder>
23+
<Folder Name="/tests/">
24+
<Project Path="tests/NetEvolve.Extensions.MSTest.Tests.PublicApi/NetEvolve.Extensions.MSTest.Tests.PublicApi.csproj" />
25+
<Project Path="tests/NetEvolve.Extensions.MSTest.Tests.Unit/NetEvolve.Extensions.MSTest.Tests.Unit.csproj" />
26+
<Project Path="tests/NetEvolve.Extensions.NUnit.Tests.PublicApi/NetEvolve.Extensions.NUnit.Tests.PublicApi.csproj" />
27+
<Project Path="tests/NetEvolve.Extensions.NUnit.Tests.Unit/NetEvolve.Extensions.NUnit.Tests.Unit.csproj" />
28+
<Project Path="tests/NetEvolve.Extensions.TUnit.Tests.PublicApi/NetEvolve.Extensions.TUnit.Tests.PublicApi.csproj" />
29+
<Project Path="tests/NetEvolve.Extensions.TUnit.Tests.Unit/NetEvolve.Extensions.TUnit.Tests.Unit.csproj" />
30+
<Project Path="tests/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi/NetEvolve.Extensions.XUnit.V3.Tests.PublicApi.csproj" />
31+
<Project Path="tests/NetEvolve.Extensions.XUnit.V3.Tests.Unit/NetEvolve.Extensions.XUnit.V3.Tests.Unit.csproj" />
32+
</Folder>
33+
</Solution>

0 commit comments

Comments
 (0)