Skip to content
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
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ All notable changes to **bUnit** will be documented in this file. The project ad

## [Unreleased]

## Changed
### Added

- Update bunit templates to support the target framework version of the project. By [@linkdotnet](https://github.com/linkdotnet).

### Changed

- Change all bUnit services registration from singleton to scoped. By [@egil](https://github.com/egil). Closes https://github.com/bUnit-dev/bUnit/issues/1138.

Expand Down
10 changes: 7 additions & 3 deletions src/bunit.template/template/.template.config/dotnetcli.host.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@
"UnitTestFramework": {
"longName": "framework",
"shortName": ""
},
"TargetSdk": {
"longName": "sdk",
"shortName": ""
}
},
"usageExamples": [
"--framework xunit",
"--framework nunit",
"--framework mstest"
"--framework xunit --sdk net7.0",
"--framework nunit --sdk net7.0",
"--framework mstest --sdk net7.0"
]
}
25 changes: 25 additions & 0 deletions src/bunit.template/template/.template.config/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,31 @@
"testFramework_mstest": {
"type": "computed",
"value": "UnitTestFramework == \"mstest\""
},
"targetSdk": {
"type": "parameter",
"description": "The target framework sdk for the project.",
"displayName": "Target framework sdk",
"datatype": "choice",
"defaultValue": "net7.0",
"replaces": "targetSdk",
"choices": [
{
"choice": "net6.0",
"description": ".net 6.0",
"displayName": ".net 6.0"
},
{
"choice": "net7.0",
"description": ".net 7.0",
"displayName": ".net 7.0"
},
{
"choice": "net8.0",
"description": ".net 8.0",
"displayName": ".net 8.0"
}
]
}
},
"primaryOutputs": [
Expand Down
18 changes: 9 additions & 9 deletions src/bunit.template/template/Company.BlazorTests1.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>targetSdk</TargetFramework>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -17,29 +17,29 @@

<ItemGroup>
<PackageReference Include="bunit" Version="#{NBGV_NuGetPackageVersion}#" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
<PackageReference Include="coverlet.collector" Version="3.1.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.12.0" />
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(testFramework_xunit)' == 'true'">
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(testFramework_nunit)' == 'true'">
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
</ItemGroup>

<ItemGroup Condition="'$(testFramework_mstest)' == 'true'">
<PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
<PackageReference Include="MSTest.TestAdapter" Version="3.0.4" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.4" />
</ItemGroup>

</Project>