Skip to content

Merge main v2 #1729

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.

Sign up for GitHub

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

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

Merge main v2 #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 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
9895f3a
Merge remote-tracking branch 'origin/main' into v2
linkdotnet Jun 14, 2025
7ea2c9c
chore: Upgrades
linkdotnet 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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
- run: |
dotnet pack src/bunit/ -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 @@ -114,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 @@ -136,7 +136,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
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 @@ -1447,7 +1453,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
204 changes: 95 additions & 109 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,110 +1,96 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<!-- 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.6.0.109712" 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" />
</ItemGroup>

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

<PackageVersion Include="Serilog" Version="4.2.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"/>
</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.5"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.13"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.13"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.13"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.13"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.13"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.13"/>
</ItemGroup>

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

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.2"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.2"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.2"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.2"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.2"/>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.4.25258.110"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-preview.4.25258.110"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.0-preview.4.25258.110"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.0-preview.4.25258.110"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.0-preview.4.25258.110"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.4.25258.110"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-preview.4.25258.110"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-preview.4.25258.110"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.0-preview.4.25258.110"/>
</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="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Shouldly" Version="4.3.0"/>
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0"/>
<PackageVersion Include="Verify.Xunit" Version="28.11.0"/>
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24"/>
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="nunit" Version="4.2.2" />
<PackageVersion Include="xunit" Version="2.9.3"/>
<PackageVersion Include="xunit.abstractions" Version="2.0.3"/>
<PackageVersion Include="xunit.assert" Version="2.9.3"/>
<PackageVersion Include="xunit.extensibility.execution" Version="2.9.3"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2"/>
</ItemGroup>

<ItemGroup Label="Test Dependencies - Legacy" Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'net5.0'">
<PackageVersion Update="xunit.runner.visualstudio" Version="2.4.5"/>
</ItemGroup>

<ItemGroup Label="Source Code Generators">
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0"/>
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
</ItemGroup>
</Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<!-- 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.11.0.117924" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" />
<PackageVersion Include="Meziantou.Polyfill" Version="1.0.49">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
</ItemGroup>
<ItemGroup Label="Shared">
<PackageVersion Include="Autofac" Version="8.3.0" />
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.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.3.0" />
<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.6" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.17" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.17" />
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.17" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.17" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.17" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.17" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.6" />
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.6" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.6" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.5.25277.114" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-preview.5.25277.114" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.0-preview.5.25277.114" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.0-preview.5.25277.114" />
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.0-preview.5.25277.114" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.5.25277.114" />
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-preview.5.25277.114" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-preview.5.25277.114" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.0-preview.5.25277.114" />
</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="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
<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="30.4.0" />
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
<PackageVersion Include="nunit" Version="4.2.2" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.abstractions" Version="2.0.3" />
<PackageVersion Include="xunit.assert" Version="2.9.3" />
<PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
</ItemGroup>
<ItemGroup Label="Source Code Generators">
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion 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 Down
Loading