Skip to content

Commit

Permalink
Support .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielweyer committed Nov 18, 2023
1 parent 28863b2 commit 835f893
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 14 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-dotnet@v3
name: Install .NET 8
with:
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 @@ -35,6 +35,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
1 change: 0 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Nuke.Common" Version="7.0.6" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
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-decode-jwt` | [![NuGet][nuget-package-badge]][nuget-package-command] |

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

![Sample output](docs/sample-output.png)

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>net6.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/dotnet-decode-jwt/dotnet-decode-jwt.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down Expand Up @@ -29,12 +29,6 @@
<Using Include="System.Text" />
<Using Include="System.Text.Json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>
<PropertyGroup>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down

0 comments on commit 835f893

Please sign in to comment.