Skip to content

Commit

Permalink
Merge pull request #1452 from bUnit-dev/release/v1.28
Browse files Browse the repository at this point in the history
Release of new minor version v1.28
  • Loading branch information
egil authored Apr 19, 2024
2 parents 2aaf01d + afadabd commit dd1dce5
Show file tree
Hide file tree
Showing 49 changed files with 1,115 additions and 311 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"isRoot": true,
"tools": {
"dotnet-serve": {
"version": "1.10.172",
"version": "1.10.175",
"commands": [
"dotnet-serve"
]
},
"docfx": {
"version": "2.75.3",
"version": "2.76.0",
"commands": [
"docfx"
]
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ jobs:
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
- uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -235,9 +236,9 @@ jobs:
- name: 📄 Build docs
working-directory: ./docs/site
run: |
dotnet tool install --global docfx --version 2.74.1
docfx metadata --logLevel error
docfx build --logLevel warning --warningsAsErrors
dotnet tool restore
dotnet docfx metadata --logLevel error
dotnet docfx build --logLevel warning --warningsAsErrors
dependency-review:
runs-on: ubuntu-latest
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/rebase-v2-on-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: rebase-v2-on-main

on:
push:
branches:
- main

workflow_dispatch:

env:
TERM: xterm

jobs:
rebase:
name: 🎁 Rebase V2 on Main
runs-on: ubuntu-latest
steps:

- name: 🛒 Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.BUNIT_BOT_TOKEN }}

- name: ⚙️ Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.BUNIT_BOT_GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.BUNIT_BOT_GPG_KEY_PASSPHRASE }}

- name: ⚙️ Setup CI GIT
run: |
git config user.name "${{ steps.import_gpg.outputs.name }}"
git config user.email ${{ steps.import_gpg.outputs.email }}
git config --global user.signingkey ${{ steps.import_gpg.outputs.keyid }}
git config --global commit.gpgsign true
- name: ⏩ Rebase v2 on main, push to origin
id: rebaseV2
continue-on-error: true
run: |
git fetch --all
git checkout v2
git rebase -S main
git push --force-with-lease
- name: ⏭ Create pull request
if: steps.rebaseV2.outcome == 'failure'
uses: thomaseizinger/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
with:
head: main
base: v2
title: Rebase v2 on main
body: |
This PR is created automatically by the bUnit bot.
When completing this PR, it's important to use **Rebase and merge** to keep the commit history clean.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
9.0.x
- name: 🛠️ Update changelog
uses: thomaseizinger/keep-a-changelog-new-release@2.0.0
uses: thomaseizinger/keep-a-changelog-new-release@3.0.0
with:
version: ${{ env.NBGV_SemVer2 }}

Expand Down
437 changes: 223 additions & 214 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<!-- Shared code analyzers used for all projects in the solution -->
<ItemGroup Label="Code Analyzers">
<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.20.0.85982" PrivateAssets="All" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.23.1.88495" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Label="Implicit usings"
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ bUnit is available on NuGet in various incarnations. Most should just pick the [
| [bUnit.web](https://www.nuget.org/packages/bunit.web/) | Adds support for testing Blazor components for the web. This includes bUnit.core. | [![Nuget](https://img.shields.io/nuget/dt/bunit.web?logo=nuget&style=flat-square)](https://www.nuget.org/packages/bunit.web/) |
| [bUnit.template](https://www.nuget.org/packages/bunit.template/) | Template, which currently creates xUnit-based bUnit test projects only. | [![Nuget](https://img.shields.io/nuget/dt/bunit.template?logo=nuget&style=flat-square)](https://www.nuget.org/packages/bunit.template/) |
| [bUnit.generators](https://www.nuget.org/packages/bunit.generators/)|Source code generators to minimize code setup in various situations.|[![Nuget](https://img.shields.io/nuget/dt/bunit.generators?logo=nuget&style=flat-square)](https://www.nuget.org/packages/bunit.generators/)|
| [bUnit.web.query](https://www.nuget.org/packages/bunit.web.query/)|bUnit implementation of testing-library.com's query APIs.|[![Nuget](https://img.shields.io/nuget/dt/bunit.web.query?logo=nuget&style=flat-square)](https://www.nuget.org/packages/bunit.web.query/)|

To get started, head to the [getting started documentation](https://bunit.dev/docs/getting-started) to learn more.

Expand Down
1 change: 1 addition & 0 deletions bunit.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".items", ".items", "{A5D7B6
.gitattributes = .gitattributes
.gitignore = .gitignore
Directory.Build.props = Directory.Build.props
.config\dotnet-tools.json = .config\dotnet-tools.json
global.json = global.json
version.json = version.json
EndProjectSection
Expand Down
4 changes: 3 additions & 1 deletion docs/samples/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ tab_size = 2
indent_style = space
indent_size = 2
indent_width = 2

dotnet_diagnostic.BL0001.severity = none
dotnet_diagnostic.BL0002.severity = none
dotnet_diagnostic.BL0003.severity = none
dotnet_diagnostic.BL0004.severity = none
dotnet_diagnostic.BL0005.severity = none
dotnet_diagnostic.BL0006.severity = none
dotnet_diagnostic.BL0006.severity = none
dotnet_diagnostic.BL0007.severity = none
12 changes: 10 additions & 2 deletions docs/samples/components/bunit.docs.samples.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<LangVersion>10.0</LangVersion>
<TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<RazorLangVersion>3.0</RazorLangVersion>
<RootNamespace>Bunit.Docs.Samples</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down Expand Up @@ -50,4 +50,12 @@
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0-*" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-*" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="9.0.0-*" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0-*" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="9.0.0-*" />
</ItemGroup>

</Project>
6 changes: 5 additions & 1 deletion docs/samples/tests/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<SonarQubeTestProject>true</SonarQubeTestProject>
<IsPackable>false</IsPackable>
Expand All @@ -16,6 +16,10 @@
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageReference Include="System.Text.Json" Version="9.0.0-*" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0'">
<PackageReference Include="System.Text.Json" Version="6.0.9" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion docs/site/Program.cs

This file was deleted.

Loading

0 comments on commit dd1dce5

Please sign in to comment.