Skip to content

Commit

Permalink
.net 8 upgrade (#32)
Browse files Browse the repository at this point in the history
  • Loading branch information
tknightnd authored Jan 2, 2024
1 parent 46435a1 commit cffd8d2
Show file tree
Hide file tree
Showing 15 changed files with 2,134 additions and 2,327 deletions.
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-stryker": {
"version": "3.10.0",
"version": "3.13.0",
"commands": [
"dotnet-stryker"
]
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/actions_buildtestpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.x

- name: Restore tools
run: dotnet tool restore
Expand Down Expand Up @@ -74,13 +74,13 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v3
with:
dotnet-version: "7.0.x"
dotnet-version: "8.x"

- name: dotnet SCA
run: |
dotnet tool restore
dotnet restore benchmarkdotnetanalyser.sln
dotnet list benchmarkdotnetanalyser.sln package --vulnerable --include-transitive | tee results.log
dotnet list package --vulnerable --include-transitive | tee results.log
FOUND_VULN=`grep -c 'has the following vulnerable packages' results.log` || true
FOUND_CRIT=`grep -c 'Critical' results.log` || true
FOUND_HIGH=`grep -c 'High' results.log` || true
Expand All @@ -107,7 +107,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.x

- name: Restore tools
run: dotnet tool restore
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
dotnet-version: 8.x

- name: Download package
uses: actions/download-artifact@v3
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ BDNA aggregates and analyses [BenchmarkDotNet](https://benchmarkdotnet.org/) res

## Installation

To install BDNA, you'll need the [.NET 7 SDK or runtime](https://dotnet.microsoft.com/download/dotnet/7.0). BDNA can be downloaded and installed from [Nuget](https://www.nuget.org/packages/bdna/).
To install BDNA, you'll need the [.NET 8 SDK or runtime](https://dotnet.microsoft.com/download/dotnet/8.0). BDNA can be downloaded and installed from [Nuget](https://www.nuget.org/packages/bdna/).


---


## Building locally

To build, you'll need the [.NET 7 SDK](https://dotnet.microsoft.com/download/dotnet/7.0).
To build, you'll need the [.NET 8 SDK](https://dotnet.microsoft.com/download/dotnet/8.0).

By default, the build script will restore, build, run tests and package:

Expand Down Expand Up @@ -260,7 +260,7 @@ Options:


## Technologies used
We use C# and .NET 6.0 for this project. Some 3rd party packages that we depend on:-
We use C# and .NET 8.0 for this project. Some 3rd party packages that we depend on:-
* [Newtonsoft.Json](https://www.nuget.org/packages/Newtonsoft.Json/)
* [Nate McMaster's Command line utils](https://www.nuget.org/packages/McMaster.Extensions.CommandLineUtils)
* [Microsoft's Dependency Injection](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection)
Expand Down
5 changes: 4 additions & 1 deletion build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let publishDir = "publish"
let unitTestDir = "test/BenchmarkDotNetAnalyser.Tests.Unit"
let integrationTestDir = "test/BenchmarkDotNetAnalyser.Tests.Integration"
let integrationTestResultsDir = "BenchmarkDotNetResults"
let sampleBenchmarksDir = "test/BenchmarkDotNetAnalyser.SampleBenchmarks/bin/Release/net7.0"
let sampleBenchmarksDir = "test/BenchmarkDotNetAnalyser.SampleBenchmarks/bin/Release/net8.0"
let sampleBenchmarksResults = "BenchmarkDotNet.Artifacts/results"
let sampleBenchmarksResultsDir = combine sampleBenchmarksDir sampleBenchmarksResults

Expand Down Expand Up @@ -177,15 +177,18 @@ let initTargets() =
==> "Consolidate code coverage"
==> "Package"
==> "BuildTestAndPackage"
|> ignore

"Build"
==> "Run Sample benchmarks"
==> "Copy benchmark results"
==> "Integration Tests Standalone"
==> "RebuildTestDataValidate"
|> ignore

"Build"
==> "Stryker"
|> ignore


[<EntryPoint>]
Expand Down
2 changes: 1 addition & 1 deletion build.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="build.fs" />
Expand Down
2 changes: 1 addition & 1 deletion src/BenchmarkDotNetAnalyser/BenchmarkDotNetAnalyser.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Company>NewDay Cards Ltd</Company>
<Copyright>Copyright 2023 NewDay Cards Ltd</Copyright>
<Version>0.0.0</Version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Loading

0 comments on commit cffd8d2

Please sign in to comment.