Skip to content

Commit 92ce4c5

Browse files
ZapritZaprit
authored
Update dependencies (#1093)
* Update dependencies of lighthouse * Fix race condition in test * Stop using async void in tests. * Hopefully fix qodana issues * Disable qodana PR-mode * Suppress license issue in qodana as not a problem * Exclude svg files from qodana scans
1 parent 9258469 commit 92ce4c5

File tree

9 files changed

+52
-45
lines changed

9 files changed

+52
-45
lines changed

‎.github/workflows/qodana_code_quality.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,9 @@ jobs:
2525
fetch-depth: 0 # a full history is required for pull request analysis
2626
- name: 'Qodana Scan'
2727
uses: JetBrains/qodana-action@v2024.3
28-
with:
29-
pr-mode: false
3028
env:
3129
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_1488465344 }}
32-
QODANA_ENDPOINT: 'https://qodana.cloud'
30+
QODANA_ENDPOINT: 'https://api.qodana.cloud'
3331
- uses: github/codeql-action/upload-sarif@v3
3432
with:
3533
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json

‎ProjectLighthouse.Servers.Website/ProjectLighthouse.Servers.Website.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
<ItemGroup>
1212
<ProjectReference Include="..\ProjectLighthouse.Localization\ProjectLighthouse.Localization.csproj" />
1313
<ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj" />
14-
<PackageReference Include="QRCoder" Version="1.5.1" />
14+
<PackageReference Include="QRCoder" Version="1.6.0" />
1515
</ItemGroup>
1616
</Project>

‎ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
11+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.18" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.18">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
18-
<PackageReference Include="xunit" Version="2.8.1" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
18+
<PackageReference Include="xunit" Version="2.9.3" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>
23-
<PackageReference Include="coverlet.collector" Version="6.0.2">
23+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
<PrivateAssets>all</PrivateAssets>
2626
</PackageReference>

‎ProjectLighthouse.Tests.WebsiteTests/Integration/AuthenticationTests.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ public async Task ShouldLoginWithPassword()
2626
string password = CryptoHelper.Sha256Hash(CryptoHelper.GenerateRandomBytes(64).ToArray());
2727
UserEntity user = await database.CreateUser($"unitTestUser{CryptoHelper.GenerateRandomInt32()}", CryptoHelper.BCryptHash(CryptoHelper.Sha256Hash(password)));
2828

29-
this.Driver.Navigate().GoToUrl(this.BaseAddress + "/login");
29+
// Sometimes not having this causes a race condition
30+
// ReSharper disable once MethodHasAsyncOverload
31+
database.SaveChanges();
32+
33+
await this.Driver.Navigate().GoToUrlAsync(this.BaseAddress + "/login");
3034

3135
this.Driver.FindElement(By.Id("text")).SendKeys(user.Username);
3236
this.Driver.FindElement(By.Id("password")).SendKeys(password);

‎ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
12-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
11+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.18" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.18">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
18-
<PackageReference Include="Selenium.WebDriver" Version="4.21.0" />
19-
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="125.0.6422.14100" />
20-
<PackageReference Include="xunit" Version="2.8.1" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
18+
<PackageReference Include="Selenium.WebDriver" Version="4.34.0" />
19+
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="138.0.7204.9400" />
20+
<PackageReference Include="xunit" Version="2.9.3" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>
25-
<PackageReference Include="coverlet.collector" Version="6.0.2">
25+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
<PrivateAssets>all</PrivateAssets>
2828
</PackageReference>

‎ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
17-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
18-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
16+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.18" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.18">
1919
<PrivateAssets>all</PrivateAssets>
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
</PackageReference>
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
23-
<PackageReference Include="xunit" Version="2.8.1" />
24-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
23+
<PackageReference Include="xunit" Version="2.9.3" />
24+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
<PrivateAssets>all</PrivateAssets>
2727
</PackageReference>
28-
<PackageReference Include="coverlet.collector" Version="6.0.2">
28+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
<PrivateAssets>all</PrivateAssets>
3131
</PackageReference>
32-
<PackageReference Include="Moq" Version="4.20.70" />
32+
<PackageReference Include="Moq" Version="4.20.72" />
3333
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
3434
</ItemGroup>
3535

‎ProjectLighthouse.Tests/Unit/ModerationTests.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Threading.Tasks;
23
using LBPUnion.ProjectLighthouse.Administration.Maintenance.RepeatingTasks;
34
using LBPUnion.ProjectLighthouse.Database;
45
using LBPUnion.ProjectLighthouse.Tests.Helpers;
@@ -12,7 +13,7 @@ namespace LBPUnion.ProjectLighthouse.Tests.Unit;
1213
public class ModerationTests
1314
{
1415
[Fact]
15-
public async void DismissExpiredCases_ShouldDismissExpiredCase()
16+
public async Task DismissExpiredCases_ShouldDismissExpiredCase()
1617
{
1718
await using DatabaseContext database = await MockHelper.GetTestDatabase();
1819

@@ -35,7 +36,7 @@ public async void DismissExpiredCases_ShouldDismissExpiredCase()
3536
}
3637

3738
[Fact]
38-
public async void DismissExpiredCases_ShouldNotDismissActiveCase()
39+
public async Task DismissExpiredCases_ShouldNotDismissActiveCase()
3940
{
4041
await using DatabaseContext database = await MockHelper.GetTestDatabase();
4142

@@ -58,7 +59,7 @@ public async void DismissExpiredCases_ShouldNotDismissActiveCase()
5859
}
5960

6061
[Fact]
61-
public async void DismissExpiredCases_ShouldNotDismissAlreadyDismissedCase()
62+
public async Task DismissExpiredCases_ShouldNotDismissAlreadyDismissedCase()
6263
{
6364
await using DatabaseContext database = await MockHelper.GetTestDatabase();
6465

‎ProjectLighthouse/ProjectLighthouse.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
13-
<PackageReference Include="GitInfo" Version="3.3.5">
13+
<PackageReference Include="GitInfo" Version="3.5.0">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Pfim" Version="0.11.2" />
18-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
19-
<PackageReference Include="Discord.Net.Webhook" Version="3.15.0" />
20-
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.6" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
17+
<PackageReference Include="Pfim" Version="0.11.3" />
18+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
19+
<PackageReference Include="Discord.Net.Webhook" Version="3.17.4" />
20+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
21+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.18" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.18" />
23+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.18">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
2727
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
28-
<PackageReference Include="Redis.OM" Version="0.7.1" />
28+
<PackageReference Include="Redis.OM" Version="1.0.1" />
2929
<PackageReference Include="SharpZipLib" Version="1.4.2" />
30-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
31-
<PackageReference Include="YamlDotNet" Version="15.1.6" />
32-
<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
30+
<PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
31+
<PackageReference Include="YamlDotNet" Version="16.3.0" />
32+
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
3333
<PackageReference Include="DistributedLock.MySql" Version="1.0.2" />
3434
</ItemGroup>
3535

‎qodana.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version: "1.0"
2-
linter: jetbrains/qodana-dotnet:2024.1
2+
linter: jetbrains/qodana-dotnet:2024.3
33
profile:
44
name: qodana.recommended
55
include:
@@ -9,3 +9,7 @@ exclude:
99
paths:
1010
- ProjectLighthouse.Localization
1111
- ProjectLighthouse/Migrations
12+
- ProjectLighthouse/StaticFiles/css/themes
13+
- ProjectLighthouse/StaticFiles/safari-pinned-tab.svg
14+
dependencyIgnores:
15+
- name: "SixLabors.ImageSharp" # We're open source, so we come under the Apache License

0 commit comments

Comments
 (0)