Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support .NET 8 #122

Merged
merged 2 commits into from
Nov 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ jobs:
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v3
name: Install .NET Core 3.1
name: Install .NET 8
with:
dotnet-version: '3.1.x'
dotnet-version: '8.0.x'
dotnet-quality: 'ga'
- name: Build
run: ./build.sh --package
- name: Upload NuGet packages
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/security-scanning-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Install .NET 8
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
dotnet-quality: 'ga'

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
Expand Down
4 changes: 1 addition & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Nuke.Common" Version="7.0.6" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageVersion Include="xunit" Version="2.6.1" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" Condition="'$(TargetFramework)' != 'netcoreapp3.1'" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
<GlobalPackageReference Include="AsyncFixer" Version="1.6.0" />
<GlobalPackageReference Include="Meziantou.Analyzer" Version="2.0.106" />
<GlobalPackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30" />
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
| ----------------------- | ------------------------------------------------ |
| `dotnet-xunit-to-junit` | [![NuGet][nuget-tool-badge]][nuget-tool-command] |

| CI | Status | Platform(s) | Framework(s) | Test Framework(s) |
| ------------------------ | -------------------------------------------------------- | ----------- | ----------------------------------- | ----------------------------------- |
| [GitHub][github-actions] | [![Build Status][github-actions-shield]][github-actions] | `Ubuntu` | `netcoreapp3.1`, `net6.0`, `net7.0` | `netcoreapp3.1`, `net6.0`, `net7.0` |
| CI | Status | Platform(s) | Framework(s) | Test Framework(s) |
| ------------------------ | -------------------------------------------------------- | ----------- | ---------------------------- | ---------------------------- |
| [GitHub][github-actions] | [![Build Status][github-actions-shield]][github-actions] | `Ubuntu` | `net6.0`, `net7.0`, `net8.0` | `net6.0`, `net7.0`, `net8.0` |

[CircleCI][circle-ci] can only parse test results in the [JUnit format][junit-format]. This `Extensible Stylesheet Language Transformations` can transform a `xUnit.net v2 XML` test results file into a `JUnit` test results file.

Expand Down
2 changes: 1 addition & 1 deletion build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ from framework in testProject.GetTargetFrameworks()
.Executes(() =>
{
ReportGeneratorTasks.ReportGenerator(s => s
.SetFramework("net6.0")
.SetFramework("net8.0")
.SetReports($"{TestResultsDirectory}/**/coverage.cobertura.xml")
.SetTargetDirectory(CodeCoverageDirectory)
.SetReportTypes(ReportTypes.Html));
Expand Down
3 changes: 2 additions & 1 deletion build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Gabo</RootNamespace>
<NoWarn>CS0649;CS0169;CA1707</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
<NukeScriptDirectory>..</NukeScriptDirectory>
<NukeTelemetryVersion>1</NukeTelemetryVersion>
<EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 1 addition & 7 deletions src/xUnitToJUnit/xUnitToJUnit.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<RootNamespace>Gabo.DotNet.xUnitToJUnit</RootNamespace>
<AssemblyName>dotnet-xunit-to-junit</AssemblyName>
<LangVersion>latest</LangVersion>
Expand Down Expand Up @@ -32,10 +32,4 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion tests/XsltTests/XsltTests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<RootNamespace>Gabo.DotNet.xUnitToJUnit.Tests</RootNamespace>
<AssemblyName>Gabo.DotNet.xUnitToJUnit.Tests</AssemblyName>
<LangVersion>latest</LangVersion>
Expand Down