Skip to content

Commit 2efdfc5

Browse files
authored
Merge pull request #300 from MrDave1999/dev
9.5.3 Release
2 parents bfec754 + e2a9792 commit 2efdfc5

File tree

4 files changed

+58
-11
lines changed

4 files changed

+58
-11
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v4
18-
- name: Setup .NET Core
18+
- name: Setup .NET ${{ env.DOTNET_VERSION }}
1919
uses: actions/setup-dotnet@v4
2020
with:
2121
dotnet-version: ${{ env.DOTNET_VERSION }}
22+
- name: Setup .NET 6.x
23+
uses: actions/setup-dotnet@v4
24+
with:
25+
dotnet-version: '6.x'
2226
- name: Execute unit tests
23-
run: dotnet test ./tests/Application.Tests/CTF.Application.Tests.csproj -c Release --framework=net8.0
27+
run: dotnet test ./tests/Application.Tests/CTF.Application.Tests.csproj -c Release
2428

2529
integration_testing:
2630
runs-on: ubuntu-latest
@@ -40,10 +44,14 @@ jobs:
4044
--health-retries=3
4145
steps:
4246
- uses: actions/checkout@v4
43-
- name: Setup .NET Core
47+
- name: Setup .NET ${{ env.DOTNET_VERSION }}
4448
uses: actions/setup-dotnet@v4
4549
with:
4650
dotnet-version: ${{ env.DOTNET_VERSION }}
51+
- name: Setup .NET 6.x
52+
uses: actions/setup-dotnet@v4
53+
with:
54+
dotnet-version: '6.x'
4755
- name: Check MariaDB version
4856
run: docker exec mariadb mariadb --version
4957
- name: Check SQLite version
@@ -55,4 +63,4 @@ jobs:
5563
- name: Create .env.test file
5664
run: cp ./tests/Persistence.Tests/.env.test.example ./tests/Persistence.Tests/.env.test
5765
- name: Execute integration tests
58-
run: dotnet test ./tests/Persistence.Tests/Persistence.Tests.csproj -c Release --framework=net8.0
66+
run: dotnet test ./tests/Persistence.Tests/Persistence.Tests.csproj -c Release
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: CodeQL
2+
3+
on:
4+
push:
5+
branches: [dev]
6+
paths:
7+
- '**.cs'
8+
- '**.csproj'
9+
pull_request:
10+
branches: [dev]
11+
paths:
12+
- '**.cs'
13+
- '**.csproj'
14+
schedule:
15+
- cron: '0 8 * * 4'
16+
17+
jobs:
18+
analyze:
19+
name: analyze
20+
runs-on: ubuntu-latest
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
language: ['csharp']
25+
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v4
29+
30+
- name: Initialize CodeQL
31+
uses: github/codeql-action/init@v3
32+
with:
33+
languages: ${{ matrix.language }}
34+
35+
- name: Autobuild
36+
uses: github/codeql-action/autobuild@v3
37+
38+
- name: Perform CodeQL Analysis
39+
uses: github/codeql-action/analyze@v3
File renamed without changes.

Directory.Packages.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
<PackageVersion Include="SampSharp.Streamer.Entities" Version="0.10.0" />
1616
<PackageVersion Include="SampSharp.CTF.Entities" Version="0.10.11" />
1717
<PackageVersion Include="SampSharp.CTF.Streamer.Entities" Version="0.10.1" />
18-
<PackageVersion Include="SmartFormat" Version="3.5.1" />
19-
<PackageVersion Include="MySqlConnector" Version="2.3.7" />
20-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.7" />
18+
<PackageVersion Include="SmartFormat" Version="3.5.2" />
19+
<PackageVersion Include="MySqlConnector" Version="2.4.0" />
20+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.1" />
2121
<PackageVersion Include="BCrypt.Net-Next" Version="4.0.3" />
2222
<PackageVersion Include="DotEnv.Core" Version="3.1.0" />
2323
<PackageVersion Include="Dotenv.Extensions.Microsoft.Configuration" Version="3.1.0" />
2424
<PackageVersion Include="YeSql.Net" Version="2.0.0" />
2525
<PackageVersion Include="CopySqlFilesToOutputDirectory" Version="1.0.0" />
2626
<PackageVersion Include="seztion-parser" Version="3.0.0" />
27-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
28-
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
29-
<PackageVersion Include="NUnit" Version="4.1.0" />
30-
<PackageVersion Include="NUnit.Analyzers" Version="4.2.0" />
27+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
28+
<PackageVersion Include="FluentAssertions" Version="[7.0.0,8.0.0)" />
29+
<PackageVersion Include="NUnit" Version="4.3.2" />
30+
<PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
3131
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
3232
</ItemGroup>
3333
</Project>

0 commit comments

Comments
 (0)