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

Upgrade packages #20

Merged
merged 9 commits into from
Mar 21, 2022
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
14 changes: 7 additions & 7 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
"isRoot": true,
"tools": {
"dotnet-stryker": {
"version": "0.22.11",
"version": "1.4.2",
"commands": [
"dotnet-stryker"
]
},
"fake-cli": {
"version": "5.20.4",
"commands": [
"fake"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "4.8.12",
"commands": [
"reportgenerator"
]
},
"fake-cli": {
"version": "5.22.0",
"commands": [
"fake"
]
}
}
}
4 changes: 2 additions & 2 deletions .github/workflows/actions_buildtestpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x

- name: Restore tools
run: dotnet tool restore
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x

- name: Download package
uses: actions/download-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion FakeBuild.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Target.create "Consolidate code coverage" (fun _ ->
Target.create "Stryker" (fun _ ->
let opts (o: DotNet.Options) = { o with WorkingDirectory = unitTestDir }

let args = sprintf "-th %i -tl %i -tb %i" strykerHigh strykerLow strykerBreak
let args = sprintf "--threshold-high %i --threshold-low %i -b %i" strykerHigh strykerLow strykerBreak
let result = DotNet.exec opts "dotnet-stryker" args

if not result.OK then failwithf "Stryker failed!"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ BDNA aggregates and analyses [BenchmarkDotNet](https://benchmarkdotnet.org/) res

## Installation

To install BDNA, you'll need the [.NET 5 SDK or runtime](https://dotnet.microsoft.com/download/dotnet/5.0). BDNA can be downloaded and installed from [Github Packages](https://github.com/orgs/NewDayTechnology/packages).
To install BDNA, you'll need the [.NET 6 SDK or runtime](https://dotnet.microsoft.com/download/dotnet/6.0). BDNA can be downloaded and installed from [Github Packages](https://github.com/orgs/NewDayTechnology/packages).


---


## Building locally

To build, you'll need the [.NET 5 SDK](https://dotnet.microsoft.com/download/dotnet/5.0).
To build, you'll need the [.NET 6 SDK](https://dotnet.microsoft.com/download/dotnet/6.0).
The local build scripts are a [FAKE build script](FakeBuild.fsx) and a [Powershell bootstrapper](build.ps1).

By default, the build script will restore, build, run tests and package:
Expand Down Expand Up @@ -258,7 +258,7 @@ Options:


## Technologies used
We use C# and .NET 5.0 for this project. Some 3rd party packages that we depend on:-
We use C# and .NET 6.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
6 changes: 3 additions & 3 deletions 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>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Company>NewDay Cards Ltd</Company>
<Copyright>Copyright 2021 NewDay Cards Ltd</Copyright>
<Version>0.0.0</Version>
Expand All @@ -17,8 +17,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Crayon" Version="2.0.60" />
<PackageReference Include="CsvHelper" Version="27.0.2" />
<PackageReference Include="Crayon" Version="2.0.64" />
<PackageReference Include="CsvHelper" Version="27.2.1" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

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

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="3.0.3">
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="5.10.3" />
<PackageReference Include="FsCheck.Xunit" Version="2.15.1" />
<PackageReference Include="FluentAssertions" Version="6.5.1" />
<PackageReference Include="FsCheck.Xunit" Version="2.16.4" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="NSubstitute" Version="4.2.2" />
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="TestStack.BDDfy.Xunit" Version="1.2.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="1.3.0">
<PackageReference Include="coverlet.collector" Version="3.1.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Loading