Skip to content

Rebase v2 on main #1727

New issue

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

#

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

Already on GitHub? # to your account

Open
wants to merge 8 commits into
base: v2
Choose a base branch
from
Open

Rebase v2 on main #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7df5ce5
chore: Upgrade dependencies (#1726)
linkdotnet Jun 14, 2025
596a874
docs: Update CHANGELOG.md
linkdotnet Jun 14, 2025
8ef00a7
Set version to '1.40'
bUnitBot Jun 14, 2025
ea80d66
Set version to '1.41-preview'
bUnitBot Jun 14, 2025
872691f
Merge branch 'release/v1.40'
bUnitBot Jun 14, 2025
1fc2c77
Merge pull request #1728 from bUnit-dev/release/v1.40
linkdotnet Jun 14, 2025
0b3b16b
Updated CHANGELOG.md for 1.40.0 release
bUnitBot Jun 14, 2025
f039dbe
Merge branch 'stable'
bUnitBot Jun 14, 2025
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
12 changes: 2 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
9.0.x

Expand Down Expand Up @@ -78,7 +74,6 @@ jobs:
dotnet pack src/bunit.core/ -c Release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.web/ -c Release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.template/ -c Release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.generators/ -c release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.web.query/ -c release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true

# Publish the NuGet package as an artifact, so they can be used in the following jobs
Expand Down Expand Up @@ -118,6 +113,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-13, windows-latest]
framework: [net8.0, net9.0]
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -130,10 +126,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
9.0.x

Expand All @@ -143,7 +135,7 @@ jobs:
dotnet tool restore

- name: 🧪 Run unit tests
run: dotnet test -c release --no-restore
run: dotnet test -c release --no-restore -f ${{ matrix.framework }}

- name: 📛 Upload hang- and crash-dumps on test failure
if: success() || failure()
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/docs-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
9.0.x

Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
5.0.x
6.0.x
7.0.x
8.0.x
9.0.x

Expand Down Expand Up @@ -102,7 +98,6 @@ jobs:
dotnet pack src/bunit/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.core/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.web/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.generators/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
dotnet pack src/bunit.web.query/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true

- name: 🛠️ Upload library to NuGet.org repository
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ All notable changes to **bUnit** will be documented in this file. The project ad

## [Unreleased]

## [1.40.0] - 2025-06-14

### Fixed

- Aligned Microsoft packages to their TFM version

## [1.39.5] - 2025-04-04

### Fixed
Expand Down Expand Up @@ -1443,7 +1449,8 @@ The latest version of the library is availble on NuGet:
- **Wrong casing on keyboard event dispatch helpers.**
The helper methods for the keyboard events was not probably cased, so that has been updated. E.g. from `Keypress(...)` to `KeyPress(...)`.

[unreleased]: https://github.com/bUnit-dev/bUnit/compare/v1.39.5...HEAD
[unreleased]: https://github.com/bUnit-dev/bUnit/compare/v1.40.0...HEAD
[1.40.0]: https://github.com/bUnit-dev/bUnit/compare/v1.39.5...v1.40.0
[1.39.5]: https://github.com/bUnit-dev/bUnit/compare/v1.38.5...1.39.5
[1.38.5]: https://github.com/bUnit-dev/bUnit/compare/v1.37.7...v1.38.5
[1.37.7]: https://github.com/bUnit-dev/bUnit/compare/v1.36.0...1.37.7
Expand Down
64 changes: 30 additions & 34 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,81 +6,76 @@
<!-- Shared code analyzers used for all projects in the solution -->
<ItemGroup Condition="!$(MSBuildProjectName.EndsWith('samples'))">
<GlobalPackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.5.0.109200" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Meziantou.Polyfill" Version="1.0.42" />
<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.11.0.117924" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25277.114" />
<PackageVersion Include="Meziantou.Polyfill" Version="1.0.49" />
</ItemGroup>

<ItemGroup Label="Shared">
<PackageVersion Include="Autofac" Version="8.1.0" />
<PackageVersion Include="Autofac" Version="8.3.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />

<PackageVersion Include="Serilog" Version="4.2.0"/>
<PackageVersion Include="Serilog" Version="4.3.0"/>
<PackageVersion Include="Serilog.Expressions" Version="5.0.0"/>
<PackageVersion Include="AngleSharp.Diffing" Version="1.0.0"/>
<PackageVersion Include="AngleSharp" Version="1.2.0"/>
<PackageVersion Include="AngleSharp.Css" Version="1.0.0-beta.144"/>
<PackageVersion Include="AngleSharp.Css" Version="1.0.0-beta.154"/>
</ItemGroup>

<ItemGroup Label="Package Versioning">
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.7.115" />
</ItemGroup>

<ItemGroup Label="System.Text.Json Vulnerability">
<!-- Due to a CVE in System.Text.Json we explicitly reference the latest version of System.Text.Json -->
<PackageVersion Include="System.Text.Json" Version="9.0.1"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.32"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.32"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="3.1.32"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.32"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="3.1.32"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="3.1.32"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.32"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1"/>
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="5.0.17"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.17"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="5.0.17"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="5.0.17"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.17"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.17"/>
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.36"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.36"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="6.0.36"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.3"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="6.0.36"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.36"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.36"/>
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.20"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.20"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.20"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.20"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.20"/>
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
Expand All @@ -94,39 +89,40 @@
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.11"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.11"/>
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.1"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.5"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.5"/>
<PackageVersion Include="System.Text.Json" Version="9.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.5"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.5"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.5"/>
</ItemGroup>

<ItemGroup Label="Test Dependencies">
<PackageVersion Include="AutoFixture" Version="4.18.1"/>
<PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1"/>
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.0" />
<PackageVersion Include="MSTest.TestFramework" Version="3.6.0" />
<PackageVersion Include="MSTest.TestAdapter" Version="3.9.1" />
<PackageVersion Include="MSTest.TestFramework" Version="3.9.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Shouldly" Version="4.2.1"/>
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
<PackageVersion Include="Shouldly" Version="4.3.0"/>
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0"/>
<PackageVersion Include="Verify.Xunit" Version="28.9.0"/>
<PackageVersion Include="Verify.Xunit" Version="30.3.1"/>
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24"/>
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.3" />
<PackageVersion Include="nunit" Version="4.2.2" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="nunit" Version="4.3.2" />
<PackageVersion Include="xunit" Version="2.9.3"/>
<PackageVersion Include="xunit.abstractions" Version="2.0.3"/>
<PackageVersion Include="xunit.assert" Version="2.9.3"/>
Expand Down
14 changes: 0 additions & 14 deletions bunit.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.query.tests", "te
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.generators.internal", "src\bunit.generators.internal\bunit.generators.internal.csproj", "{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.generators.tests", "tests\bunit.generators.tests\bunit.generators.tests.csproj", "{09046981-D9EC-4295-8502-721AC54E1F12}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.generators", "src\bunit.generators\bunit.generators.csproj", "{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -110,14 +106,6 @@ Global
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|Any CPU.Build.0 = Release|Any CPU
{09046981-D9EC-4295-8502-721AC54E1F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{09046981-D9EC-4295-8502-721AC54E1F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
{09046981-D9EC-4295-8502-721AC54E1F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
{09046981-D9EC-4295-8502-721AC54E1F12}.Release|Any CPU.Build.0 = Release|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -133,8 +121,6 @@ Global
{0FF92169-7D8F-46A2-8327-A2F028CB426F} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
{DE975A0C-0672-4248-913E-D267C1001801} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
{09046981-D9EC-4295-8502-721AC54E1F12} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {24106918-1C86-4769-BDA6-9C80E64CD260}
Expand Down
3 changes: 1 addition & 2 deletions tests/bunit.generators.tests/bunit.generators.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<RootNamespace>Bunit</RootNamespace>
<AssemblyName>Bunit.Generator.Tests</AssemblyName>
<ImplicitUsings>true</ImplicitUsings>
Expand All @@ -26,7 +26,6 @@

<ItemGroup>
<ProjectReference Include="..\..\src\bunit.generators.internal\bunit.generators.internal.csproj" />
<ProjectReference Include="..\..\src\bunit.generators\bunit.generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\src\bunit.web\bunit.web.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.40-preview",
"version": "1.41-preview",
Copy link
Preview

Copilot AI Jun 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version in version.json ("1.41-preview") does not match the changelog entry ([1.40.0]). Consider aligning these to avoid confusion.

Suggested change
"version": "1.41-preview",
"version": "1.40.0",

Copilot uses AI. Check for mistakes.

"assemblyVersion": {
"precision": "revision"
},
Expand Down
Loading