Skip to content

Commit bcd2e6d

Browse files
egilegil
authored
Merge pull request #942 from bUnit-dev/release/v1.13
Release of new minor version v1.13
2 parents 1c916ba + e3f5261 commit bcd2e6d

File tree

47 files changed

+196
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+196
-162
lines changed

‎.github/dependabot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "daily"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"

‎.github/workflows/docs-deploy.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ jobs:
2323
steps:
2424

2525
- name: 🛒 Checkout repository
26-
uses: actions/checkout@v2
26+
uses: actions/checkout@v3
2727
with:
2828
fetch-depth: 0
2929
token: ${{ secrets.BUNIT_BOT_TOKEN }}
3030

3131
- name: ⚙️ Import GPG key
3232
id: import_gpg
33-
uses: crazy-max/ghaction-import-gpg@v3
33+
uses: crazy-max/ghaction-import-gpg@v5
3434
with:
35-
gpg-private-key: ${{ secrets.BUNIT_BOT_GPG_PRIVATE_KEY }}
35+
gpg_private_key: ${{ secrets.BUNIT_BOT_GPG_PRIVATE_KEY }}
3636
passphrase: ${{ secrets.BUNIT_BOT_GPG_KEY_PASSPHRASE }}
3737

3838
- name: ⚙️ Setup CI GIT
@@ -68,7 +68,6 @@ jobs:
6868
5.0.x
6969
6.0.x
7070
7.0.x
71-
include-prerelease: true
7271
7372
- name: 🎨 Setup color
7473
run: |
@@ -88,7 +87,7 @@ jobs:
8887

8988
- name: 🛠️ Deploy to GitHub Pages
9089
if: success()
91-
uses: crazy-max/ghaction-github-pages@v2
90+
uses: crazy-max/ghaction-github-pages@v3
9291
with:
9392
build_dir: docs/site/_site
9493
fqdn: bunit.dev
@@ -111,7 +110,7 @@ jobs:
111110
112111
- name: ⏭ Create pull request from stable to main when direct merge fails
113112
if: steps.mergeMainline.outcome == 'failure'
114-
uses: thomaseizinger/create-pull-request@1.0.0
113+
uses: thomaseizinger/create-pull-request@1.3.0
115114
env:
116115
GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
117116
with:

‎.github/workflows/prepare-release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: github.ref == 'refs/heads/main' && contains(fromJson('["major","minor"]'), github.event.inputs.versionIncrement)
1717
steps:
1818
- name: 🛒 Checkout repository
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020
with:
2121
fetch-depth: 0
2222
token: ${{ secrets.BUNIT_BOT_TOKEN }}
@@ -35,9 +35,9 @@ jobs:
3535
exit 1
3636
- name: ⚙️ Import GPG key
3737
id: import_gpg
38-
uses: crazy-max/ghaction-import-gpg@v3
38+
uses: crazy-max/ghaction-import-gpg@v5
3939
with:
40-
gpg-private-key: ${{ secrets.BUNIT_BOT_GPG_PRIVATE_KEY }}
40+
gpg_private_key: ${{ secrets.BUNIT_BOT_GPG_PRIVATE_KEY }}
4141
passphrase: ${{ secrets.BUNIT_BOT_GPG_KEY_PASSPHRASE }}
4242

4343
- name: ⚙️ Setup CI GIT
@@ -56,9 +56,9 @@ jobs:
5656
id: versions
5757
run: |
5858
nbgv prepare-release --versionIncrement ${{ github.event.inputs.versionIncrement }}
59-
echo "::set-output name=MAIN_VERSION_COMMIT_MESSAGE::$(git log --format=%B -n 1 --skip 1)"
59+
echo "MAIN_VERSION_COMMIT_MESSAGE=$(git log --format=%B -n 1 --skip 1)" >> $GITHUB_OUTPUT
6060
git checkout release/v$NBGV_MajorMinorVersion
61-
echo "::set-output name=RELEASE_VERSION_COMMIT_MESSAGE::$(git log --format=%B -n 1)"
61+
echo "RELEASE_VERSION_COMMIT_MESSAGE=$(git log --format=%B -n 1)" >> $GITHUB_OUTPUT
6262
6363
# Workaround since nbgv prepare-release does not sign commits.
6464
# This undo's the commits, keeps the version changes, and commits again with signing
@@ -83,7 +83,7 @@ jobs:
8383
run: git push origin release/v$NBGV_MajorMinorVersion
8484

8585
- name: ⏭ Create pull request for release branch
86-
uses: thomaseizinger/create-pull-request@1.0.0
86+
uses: thomaseizinger/create-pull-request@1.3.0
8787
env:
8888
GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
8989
with:

‎.github/workflows/release-preview.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
steps:
2222

2323
- name: 🛒 Checkout repository
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v3
2525
with:
2626
fetch-depth: 0
2727

@@ -36,7 +36,6 @@ jobs:
3636
5.0.x
3737
6.0.x
3838
7.0.x
39-
include-prerelease: true
4039
4140
- name: 🎨 Setup color
4241
run: |

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ jobs:
4242
4343
- name: ⚙️ Import GPG key
4444
id: import_gpg
45-
uses: crazy-max/ghaction-import-gpg@v3
45+
uses: crazy-max/ghaction-import-gpg@v5
4646
with:
47-
gpg-private-key: ${{ secrets.BUNIT_BOT_GPG_PRIVATE_KEY }}
47+
gpg_private_key: ${{ secrets.BUNIT_BOT_GPG_PRIVATE_KEY }}
4848
passphrase: ${{ secrets.BUNIT_BOT_GPG_KEY_PASSPHRASE }}
4949

5050
- name: ⚙️ Setup CI GIT
@@ -67,10 +67,9 @@ jobs:
6767
5.0.x
6868
6.0.x
6969
7.0.x
70-
include-prerelease: true
7170
7271
- name: 🛠️ Update changelog
73-
uses: thomaseizinger/keep-a-changelog-new-release@1.2.1
72+
uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
7473
with:
7574
version: ${{ env.NBGV_SemVer2 }}
7675

@@ -126,7 +125,7 @@ jobs:
126125
127126
- name: ⏭ Create pull request from stable to main when direct merge fails
128127
if: steps.mergeMainline.outcome == 'failure'
129-
uses: thomaseizinger/create-pull-request@1.0.0
128+
uses: thomaseizinger/create-pull-request@1.3.0
130129
env:
131130
GITHUB_TOKEN: ${{ secrets.BUNIT_BOT_TOKEN }}
132131
with:

‎.github/workflows/verification.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: 🛒 Checkout repository
35-
uses: actions/checkout@v2
35+
uses: actions/checkout@v3
3636
with:
3737
fetch-depth: 0
3838

@@ -44,7 +44,6 @@ jobs:
4444
5.0.x
4545
6.0.x
4646
7.0.x
47-
include-prerelease: true
4847
4948
- name: 🎨 Setup color
5049
if: matrix.os != 'windows-latest'
@@ -64,10 +63,10 @@ jobs:
6463

6564
- name: 🧪 Run unit tests (async)
6665
run: |
67-
dotnet test --filter Category!=sync -c release --blame-hang-timeout 15s --blame-hang-dump-type full --blame-crash-dump-type full
66+
dotnet test --filter Category!=sync -c release
6867
- name: 🧪 Run unit tests (sync)
6968
run: |
70-
dotnet test --filter Category!=async -c release --blame-hang-timeout 15s --blame-hang-dump-type full --blame-crash-dump-type full
69+
dotnet test --filter Category!=async -c release
7170
- name: 📛 Upload hang- and crash-dumps on test failure
7271
if: failure()
7372
uses: actions/upload-artifact@v3

‎CHANGELOG.md‎

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

77
## [Unreleased]
88

9+
This release contains a bunch of small tweaks and fixes.
10+
911
## [1.12.6] - 2022-11-08
1012

1113
### Fixed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<!-- Shared code analyzers used for all projects in the solution -->
4949
<ItemGroup Label="Code Analyzers">
5050
<PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" />
51-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.47.0.55603" PrivateAssets="All" />
51+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.50.0.58025" PrivateAssets="All" />
5252
</ItemGroup>
5353

5454
<ItemGroup Label="Implicit usings"

‎src/bunit.core/Extensions/WaitForHelpers/RenderedFragmentWaitForHelperExtensions.cs‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,9 @@ public static void WaitForState(this IRenderedFragmentBase renderedFragment, Fun
2828
{
2929
waiter.WaitTask.GetAwaiter().GetResult();
3030
}
31-
catch (Exception e)
31+
catch (AggregateException e) when (e.InnerExceptions.Count == 1)
3232
{
33-
if (e is AggregateException aggregateException && aggregateException.InnerExceptions.Count == 1)
34-
{
35-
ExceptionDispatchInfo.Capture(aggregateException.InnerExceptions[0]).Throw();
36-
}
37-
38-
throw;
33+
ExceptionDispatchInfo.Capture(e.InnerExceptions[0]).Throw();
3934
}
4035
}
4136

@@ -76,14 +71,9 @@ public static void WaitForAssertion(this IRenderedFragmentBase renderedFragment,
7671
{
7772
waiter.WaitTask.GetAwaiter().GetResult();
7873
}
79-
catch (Exception e)
74+
catch (AggregateException e) when (e.InnerExceptions.Count == 1)
8075
{
81-
if (e is AggregateException aggregateException && aggregateException.InnerExceptions.Count == 1)
82-
{
83-
ExceptionDispatchInfo.Capture(aggregateException.InnerExceptions[0]).Throw();
84-
}
85-
86-
throw;
76+
ExceptionDispatchInfo.Capture(e.InnerExceptions[0]).Throw();
8777
}
8878
}
8979

‎src/bunit.core/Extensions/WaitForHelpers/WaitForFailedException.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System.ComponentModel;
2+
13
namespace Bunit.Extensions.WaitForHelpers;
24

35
/// <summary>
@@ -14,6 +16,11 @@ public WaitForFailedException(string? errorMessage, Exception? innerException =
1416
{
1517
}
1618

19+
internal WaitForFailedException(string errorMessage, int checkCount, int componentRenderCount, int totalRenderCount, Exception? innerException = null)
20+
: base(errorMessage + $" Check count: {checkCount}. Component render count: {componentRenderCount}. Total render count: {totalRenderCount}.", innerException)
21+
{
22+
}
23+
1724
private WaitForFailedException(SerializationInfo info, StreamingContext context)
1825
: base(info, context) { }
1926
}

0 commit comments

Comments
 (0)