Skip to content

Commit 34925f3

Browse files
marthijnmarthijn
committed
Merge branch 'main' into feature/hybrid-cache
# Conflicts: # src/Sidio.Web.Security.Examples.AspNetCore.Tests/Sidio.Web.Security.Examples.AspNetCore.Tests.csproj # src/Sidio.Web.Security/Sidio.Web.Security.csproj
2 parents fc21c88 + 926e9ee commit 34925f3

13 files changed

Lines changed: 92 additions & 33 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ updates:
1313
tests:
1414
patterns:
1515
- "AutoFixture"
16-
- "FluentAssertions"
16+
- "AwesomeAssertions"
1717
- "Moq"
1818
- "xunit*"
1919
- "*Test*"
2020
- "coverlet*"
2121
- "Microsoft.AspNetCore.Mvc.Testing"
22+
- "RichardSzalay.MockHttp"
2223
microsoft:
2324
patterns:
2425
- "Microsoft.*"
2526
- "System.*"
2627
- package-ecosystem: "github-actions" # See documentation for possible values
2728
directory: "/" # Location of package manifests
2829
schedule:
29-
interval: "weekly"
30+
interval: "monthly"

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
runs-on: ubuntu-22.04
2424

2525
steps:
26-
- uses: actions/checkout@v4
27-
- uses: actions/setup-java@v4 #sonar scanner requires jdk
26+
- uses: actions/checkout@v5
27+
- uses: actions/setup-java@v5 #sonar scanner requires jdk
2828
with:
2929
distribution: 'microsoft'
3030
java-version: '17'

‎.github/workflows/dependabot-autoapprove.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Dependabot auto-approve and auto-merge
2+
on: pull_request
3+
4+
permissions:
5+
contents: write
6+
pull-requests: write
7+
8+
jobs:
9+
dependabot:
10+
runs-on: ubuntu-latest
11+
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'marthijn/Sidio.Web.Security' && contains(github.event.pull_request.title, 'tests group')
12+
steps:
13+
- name: Dependabot metadata
14+
id: metadata
15+
uses: dependabot/fetch-metadata@08eff52bf64351f401fb50d4972fa95b9f2c2d1b
16+
with:
17+
github-token: "${{ secrets.GITHUB_TOKEN }}"
18+
- name: Approve a PR
19+
run: gh pr review --approve "$PR_URL"
20+
env:
21+
PR_URL: ${{github.event.pull_request.html_url}}
22+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
23+
- name: Enable auto-merge for Dependabot PRs
24+
run: gh pr merge --auto --merge "$PR_URL"
25+
env:
26+
PR_URL: ${{github.event.pull_request.html_url}}
27+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
timeout-minutes: 15
2323

2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v5
2626
- name: Setup dotnet 8.x
2727
uses: actions/setup-dotnet@v4
2828
with:

‎Sidio.Web.Security.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{
3535
.github\dependabot.yml = .github\dependabot.yml
3636
.github\workflows\build.yml = .github\workflows\build.yml
3737
.github\workflows\release.yml = .github\workflows\release.yml
38+
.github\workflows\dependabot-autoapprove.yml = .github\workflows\dependabot-autoapprove.yml
3839
EndProjectSection
3940
EndProject
4041
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sidio.Web.Security.Testing.Tests", "src\Sidio.Web.Security.Testing.Tests\Sidio.Web.Security.Testing.Tests.csproj", "{6E674EC2-7F36-4051-829A-F31DFE93D3A3}"

‎src/Sidio.Web.Security.AspNetCore.Tests/Sidio.Web.Security.AspNetCore.Tests.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="AutoFixture" Version="4.18.1" />
14+
<PackageReference Include="AwesomeAssertions" Version="9.1.0" />
15+
<PackageReference Include="AwesomeAssertions.Analyzers" Version="9.0.0">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
1419
<PackageReference Include="coverlet.collector" Version="6.0.4">
1520
<PrivateAssets>all</PrivateAssets>
1621
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1722
</PackageReference>
18-
<PackageReference Include="FluentAssertions" Version="8.3.0" />
1923
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2024
<PackageReference Include="Moq" Version="4.20.72" />
2125
<PackageReference Include="xunit" Version="2.9.3" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
26+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
2327
<PrivateAssets>all</PrivateAssets>
2428
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2529
</PackageReference>
@@ -30,10 +34,10 @@
3034
</ItemGroup>
3135

3236
<ItemGroup>
33-
<Using Include="Xunit"/>
34-
<Using Include="AutoFixture"/>
35-
<Using Include="FluentAssertions"/>
36-
<Using Include="Moq"/>
37+
<Using Include="Xunit" />
38+
<Using Include="AutoFixture" />
39+
<Using Include="AwesomeAssertions" />
40+
<Using Include="Moq" />
3741
</ItemGroup>
3842

3943
<ItemGroup>

‎src/Sidio.Web.Security.AspNetCore/Html/SubresourceIntegrityTagHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public override async Task ProcessAsync(TagHelperContext context, TagHelperOutpu
8787
return;
8888
}
8989

90-
var integrityHash = await _subresourceIntegrityHashService.GetIntegrityHashFromUrlAsync(uri);
90+
var integrityHash = await _subresourceIntegrityHashService.GetIntegrityHashFromUrlAsync(uri).ConfigureAwait(false);
9191
if (!integrityHash.Success)
9292
{
9393
return;

‎src/Sidio.Web.Security.AspNetCore/Reporting/Report.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Sidio.Web.Security.AspNetCore.Reporting;
77
/// Report that is sent by the browser when a violation occurs.
88
/// See: https://www.w3.org/TR/reporting/
99
/// </summary>
10-
public sealed record Report
10+
public sealed class Report
1111
{
1212
/// <summary>
1313
/// Gets the report type.

‎src/Sidio.Web.Security.Examples.AspNetCore.Tests/Sidio.Web.Security.Examples.AspNetCore.Tests.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,28 @@
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="FluentAssertions" Version="8.3.0" />
17+
<PackageReference Include="AwesomeAssertions" Version="9.1.0" />
18+
<PackageReference Include="AwesomeAssertions.Analyzers" Version="9.0.0">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
1822
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1923
<PackageReference Include="xunit" Version="2.9.3" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
24+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
2125
<PrivateAssets>all</PrivateAssets>
2226
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2327
</PackageReference>
2428
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
2529
<PrivateAssets>all</PrivateAssets>
2630
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2731
</PackageReference>
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.6" />
32+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9" />
2933
</ItemGroup>
3034

3135
<ItemGroup>
32-
<Using Include="Xunit"/>
33-
<Using Include="FluentAssertions"/>
34-
<using Include="Microsoft.AspNetCore.Mvc.Testing"/>
36+
<Using Include="Xunit" />
37+
<Using Include="AwesomeAssertions" />
38+
<using Include="Microsoft.AspNetCore.Mvc.Testing" />
3539
</ItemGroup>
3640

3741
<ItemGroup>

‎src/Sidio.Web.Security.Testing.Tests/Sidio.Web.Security.Testing.Tests.csproj‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="AutoFixture" Version="4.18.1" />
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1616
<PackageReference Include="xunit" Version="2.9.3" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>
@@ -26,13 +26,17 @@
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
29-
<PackageReference Include="FluentAssertions" Version="8.3.0" />
29+
<PackageReference Include="AwesomeAssertions" Version="9.1.0" />
30+
<PackageReference Include="AwesomeAssertions.Analyzers" Version="9.0.0">
31+
<PrivateAssets>all</PrivateAssets>
32+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
33+
</PackageReference>
3034
</ItemGroup>
3135

3236
<ItemGroup>
33-
<Using Include="AutoFixture"/>
34-
<Using Include="Xunit"/>
35-
<Using Include="FluentAssertions"/>
37+
<Using Include="AutoFixture" />
38+
<Using Include="Xunit" />
39+
<Using Include="AwesomeAssertions" />
3640
</ItemGroup>
3741

3842
<ItemGroup>

0 commit comments

Comments
 (0)