Skip to content

Commit 1fc2c77

Browse files
linkdotnetlinkdotnet
authored
Merge pull request #1728 from bUnit-dev/release/v1.40
Release of new minor version v1.40
2 parents 1593725 + 8ef00a7 commit 1fc2c77

File tree

8 files changed

+38
-70
lines changed

8 files changed

+38
-70
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ jobs:
4444
uses: actions/setup-dotnet@v4
4545
with:
4646
dotnet-version: |
47-
3.1.x
48-
5.0.x
49-
6.0.x
50-
7.0.x
5147
8.0.x
5248
9.0.x
5349
@@ -78,7 +74,6 @@ jobs:
7874
dotnet pack src/bunit.core/ -c Release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
7975
dotnet pack src/bunit.web/ -c Release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
8076
dotnet pack src/bunit.template/ -c Release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
81-
dotnet pack src/bunit.generators/ -c release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
8277
dotnet pack src/bunit.web.query/ -c release --output ${{ env.NUGET_DIRECTORY }} -p:ContinuousIntegrationBuild=true -p:publicrelease=true
8378
8479
# Publish the NuGet package as an artifact, so they can be used in the following jobs
@@ -118,6 +113,7 @@ jobs:
118113
fail-fast: false
119114
matrix:
120115
os: [ubuntu-latest, macos-13, windows-latest]
116+
framework: [net8.0, net9.0]
121117
runs-on: ${{ matrix.os }}
122118

123119
steps:
@@ -130,10 +126,6 @@ jobs:
130126
uses: actions/setup-dotnet@v4
131127
with:
132128
dotnet-version: |
133-
3.1.x
134-
5.0.x
135-
6.0.x
136-
7.0.x
137129
8.0.x
138130
9.0.x
139131
@@ -143,7 +135,7 @@ jobs:
143135
dotnet tool restore
144136
145137
- name: 🧪 Run unit tests
146-
run: dotnet test -c release --no-restore
138+
run: dotnet test -c release --no-restore -f ${{ matrix.framework }}
147139

148140
- name: 📛 Upload hang- and crash-dumps on test failure
149141
if: success() || failure()

‎.github/workflows/docs-deploy.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ jobs:
7373
uses: actions/setup-dotnet@v4
7474
with:
7575
dotnet-version: |
76-
3.1.x
77-
5.0.x
78-
6.0.x
79-
7.0.x
8076
8.0.x
8177
9.0.x
8278

‎.github/workflows/release.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ jobs:
5858
uses: actions/setup-dotnet@v4
5959
with:
6060
dotnet-version: |
61-
3.1.x
62-
5.0.x
63-
6.0.x
64-
7.0.x
6561
8.0.x
6662
9.0.x
6763
@@ -102,7 +98,6 @@ jobs:
10298
dotnet pack src/bunit/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
10399
dotnet pack src/bunit.core/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
104100
dotnet pack src/bunit.web/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
105-
dotnet pack src/bunit.generators/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
106101
dotnet pack src/bunit.web.query/ -c Release --property:PackageOutputPath=${GITHUB_WORKSPACE}/packages -p:ContinuousIntegrationBuild=true -p:publicrelease=true
107102
108103
- name: 🛠️ Upload library to NuGet.org repository

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ All notable changes to **bUnit** will be documented in this file. The project ad
66

77
## [Unreleased]
88

9+
### Fixed
10+
11+
- Aligned Microsoft packages to their TFM version
12+
913
## [1.39.5] - 2025-04-04
1014

1115
### Fixed

‎Directory.Packages.props

Lines changed: 30 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,81 +6,76 @@
66
<!-- Shared code analyzers used for all projects in the solution -->
77
<ItemGroup Condition="!$(MSBuildProjectName.EndsWith('samples'))">
88
<GlobalPackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
9-
<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.5.0.109200" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
10-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
11-
<PackageVersion Include="Meziantou.Polyfill" Version="1.0.42" />
9+
<GlobalPackageReference Include="SonarAnalyzer.CSharp" Version="10.11.0.117924" PrivateAssets="All" IncludeAssets="Runtime;Build;Native;contentFiles;Analyzers"/>
10+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25277.114" />
11+
<PackageVersion Include="Meziantou.Polyfill" Version="1.0.49" />
1212
</ItemGroup>
1313

1414
<ItemGroup Label="Shared">
15-
<PackageVersion Include="Autofac" Version="8.1.0" />
15+
<PackageVersion Include="Autofac" Version="8.3.0" />
1616
<PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
1717

18-
<PackageVersion Include="Serilog" Version="4.2.0"/>
18+
<PackageVersion Include="Serilog" Version="4.3.0"/>
1919
<PackageVersion Include="Serilog.Expressions" Version="5.0.0"/>
2020
<PackageVersion Include="AngleSharp.Diffing" Version="1.0.0"/>
2121
<PackageVersion Include="AngleSharp" Version="1.2.0"/>
22-
<PackageVersion Include="AngleSharp.Css" Version="1.0.0-beta.144"/>
22+
<PackageVersion Include="AngleSharp.Css" Version="1.0.0-beta.154"/>
2323
</ItemGroup>
2424

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

29-
<ItemGroup Label="System.Text.Json Vulnerability">
30-
<!-- Due to a CVE in System.Text.Json we explicitly reference the latest version of System.Text.Json -->
31-
<PackageVersion Include="System.Text.Json" Version="9.0.1"/>
32-
</ItemGroup>
33-
3429
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
3530
<PackageVersion Include="Microsoft.Extensions.Logging" Version="3.1.32"/>
3631
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.32"/>
3732
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="3.1.32"/>
38-
3933
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.32"/>
4034
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="3.1.32"/>
4135
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="3.1.32"/>
4236
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="3.1.32"/>
4337
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1"/>
4438
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1"/>
39+
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
4540
</ItemGroup>
4641

4742
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
4843
<PackageVersion Include="Microsoft.Extensions.Logging" Version="5.0.0"/>
4944
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0"/>
5045
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="5.0.17"/>
51-
5246
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.17"/>
5347
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="5.0.17"/>
5448
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="5.0.17"/>
5549
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0"/>
5650
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.17"/>
5751
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.17"/>
52+
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
5853
</ItemGroup>
5954

6055
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
6156
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.1"/>
6257
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4"/>
6358
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.36"/>
64-
6559
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.36"/>
6660
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="6.0.36"/>
6761
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.3"/>
6862
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="6.0.36"/>
6963
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.36"/>
7064
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.36"/>
65+
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
7166
</ItemGroup>
7267

7368
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
7469
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0"/>
7570
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1"/>
7671
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.20"/>
77-
7872
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="7.0.20"/>
7973
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.20"/>
8074
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0"/>
8175
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.20"/>
8276
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.20"/>
8377
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.20"/>
78+
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
8479
</ItemGroup>
8580

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

9995
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
100-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1"/>
101-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1"/>
102-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.1"/>
103-
104-
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.1"/>
105-
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.1"/>
106-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1"/>
107-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.1"/>
108-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.1"/>
109-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.1"/>
96+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.5"/>
97+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5"/>
98+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="9.0.5"/>
99+
<PackageVersion Include="System.Text.Json" Version="9.0.5"/>
100+
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.5"/>
101+
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.5"/>
102+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.5"/>
103+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.5"/>
104+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.5"/>
105+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.5"/>
110106
</ItemGroup>
111107

112108
<ItemGroup Label="Test Dependencies">
113109
<PackageVersion Include="AutoFixture" Version="4.18.1"/>
114110
<PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1"/>
115-
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.0" />
116-
<PackageVersion Include="MSTest.TestFramework" Version="3.6.0" />
111+
<PackageVersion Include="MSTest.TestAdapter" Version="3.9.1" />
112+
<PackageVersion Include="MSTest.TestFramework" Version="3.9.1" />
117113
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
118114
<PackageVersion Include="Moq" Version="4.20.72" />
119115
<PackageVersion Include="NSubstitute" Version="5.3.0" />
120-
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
116+
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
121117
<PackageVersion Include="RichardSzalay.MockHttp" Version="7.0.0" />
122-
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
123-
<PackageVersion Include="Shouldly" Version="4.2.1"/>
118+
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.2" />
119+
<PackageVersion Include="Shouldly" Version="4.3.0"/>
124120
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0"/>
125-
<PackageVersion Include="Verify.Xunit" Version="28.9.0"/>
121+
<PackageVersion Include="Verify.Xunit" Version="30.3.1"/>
126122
<PackageVersion Include="Xunit.Combinatorial" Version="1.6.24"/>
127-
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
128-
<PackageVersion Include="coverlet.msbuild" Version="6.0.3" />
129-
<PackageVersion Include="nunit" Version="4.2.2" />
123+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
124+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
125+
<PackageVersion Include="nunit" Version="4.3.2" />
130126
<PackageVersion Include="xunit" Version="2.9.3"/>
131127
<PackageVersion Include="xunit.abstractions" Version="2.0.3"/>
132128
<PackageVersion Include="xunit.assert" Version="2.9.3"/>

‎bunit.sln

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.web.query.tests", "te
6464
EndProject
6565
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.generators.internal", "src\bunit.generators.internal\bunit.generators.internal.csproj", "{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}"
6666
EndProject
67-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.generators.tests", "tests\bunit.generators.tests\bunit.generators.tests.csproj", "{09046981-D9EC-4295-8502-721AC54E1F12}"
68-
EndProject
69-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "bunit.generators", "src\bunit.generators\bunit.generators.csproj", "{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}"
70-
EndProject
7167
Global
7268
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7369
Debug|Any CPU = Debug|Any CPU
@@ -110,14 +106,6 @@ Global
110106
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Debug|Any CPU.Build.0 = Debug|Any CPU
111107
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|Any CPU.ActiveCfg = Release|Any CPU
112108
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F}.Release|Any CPU.Build.0 = Release|Any CPU
113-
{09046981-D9EC-4295-8502-721AC54E1F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114-
{09046981-D9EC-4295-8502-721AC54E1F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
115-
{09046981-D9EC-4295-8502-721AC54E1F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
116-
{09046981-D9EC-4295-8502-721AC54E1F12}.Release|Any CPU.Build.0 = Release|Any CPU
117-
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
118-
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Debug|Any CPU.Build.0 = Debug|Any CPU
119-
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|Any CPU.ActiveCfg = Release|Any CPU
120-
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059}.Release|Any CPU.Build.0 = Release|Any CPU
121109
EndGlobalSection
122110
GlobalSection(SolutionProperties) = preSolution
123111
HideSolutionNode = FALSE
@@ -133,8 +121,6 @@ Global
133121
{0FF92169-7D8F-46A2-8327-A2F028CB426F} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
134122
{DE975A0C-0672-4248-913E-D267C1001801} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
135123
{AE3DFB52-2BF4-4806-AD82-7FB7B38AC17F} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
136-
{09046981-D9EC-4295-8502-721AC54E1F12} = {6EA09ED4-B714-4E6F-B0E1-4D987F8AE520}
137-
{A7C6A2AA-FF8F-4ED1-8590-5324FC566059} = {9A2B3B34-D41C-43E8-BC7D-246BEBE48D59}
138124
EndGlobalSection
139125
GlobalSection(ExtensibilityGlobals) = postSolution
140126
SolutionGuid = {24106918-1C86-4769-BDA6-9C80E64CD260}

‎tests/bunit.generators.tests/bunit.generators.tests.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
55
<RootNamespace>Bunit</RootNamespace>
66
<AssemblyName>Bunit.Generator.Tests</AssemblyName>
77
<ImplicitUsings>true</ImplicitUsings>
@@ -26,7 +26,6 @@
2626

2727
<ItemGroup>
2828
<ProjectReference Include="..\..\src\bunit.generators.internal\bunit.generators.internal.csproj" />
29-
<ProjectReference Include="..\..\src\bunit.generators\bunit.generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
3029
<ProjectReference Include="..\..\src\bunit.web\bunit.web.csproj" />
3130
</ItemGroup>
3231

‎version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.39",
3+
"version": "1.40",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)