Merge pull request #300 from MrDave1999/dev

9.5.3 Release
MrDave1999 · Jan 17, 2025 · 2efdfc5 · 2efdfc5
2 parents bfec754 + e2a9792
commit 2efdfc5
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,12 +15,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Setup .NET Core
+    - name: Setup .NET ${{ env.DOTNET_VERSION }}
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
+    - name: Setup .NET 6.x
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '6.x'
     - name: Execute unit tests
-      run: dotnet test ./tests/Application.Tests/CTF.Application.Tests.csproj -c Release --framework=net8.0
+      run: dotnet test ./tests/Application.Tests/CTF.Application.Tests.csproj -c Release
 
   integration_testing:
     runs-on: ubuntu-latest
@@ -40,10 +44,14 @@ jobs:
           --health-retries=3
     steps:
     - uses: actions/checkout@v4
-    - name: Setup .NET Core
+    - name: Setup .NET ${{ env.DOTNET_VERSION }}
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
+    - name: Setup .NET 6.x
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '6.x'
     - name: Check MariaDB version
       run: docker exec mariadb mariadb --version
     - name: Check SQLite version
@@ -55,4 +63,4 @@ jobs:
     - name: Create .env.test file
       run: cp ./tests/Persistence.Tests/.env.test.example ./tests/Persistence.Tests/.env.test
     - name: Execute integration tests
-      run: dotnet test ./tests/Persistence.Tests/Persistence.Tests.csproj -c Release --framework=net8.0
+      run: dotnet test ./tests/Persistence.Tests/Persistence.Tests.csproj -c Release
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,39 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [dev]
+    paths:
+    - '**.cs'
+    - '**.csproj'
+  pull_request:
+    branches: [dev]
+    paths:
+    - '**.cs'
+    - '**.csproj'
+  schedule:
+    - cron: '0 8 * * 4'
+
+jobs:
+  analyze:
+    name: analyze
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['csharp']
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/artifacts.yml → ...ub/workflows/upload-release-artifacts.yml b/.github/workflows/artifacts.yml → ...ub/workflows/upload-release-artifacts.yml
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -15,19 +15,19 @@
     <PackageVersion Include="SampSharp.Streamer.Entities" Version="0.10.0" />
     <PackageVersion Include="SampSharp.CTF.Entities" Version="0.10.11" />
     <PackageVersion Include="SampSharp.CTF.Streamer.Entities" Version="0.10.1" />
-    <PackageVersion Include="SmartFormat" Version="3.5.1" />
-    <PackageVersion Include="MySqlConnector" Version="2.3.7" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.7" />
+    <PackageVersion Include="SmartFormat" Version="3.5.2" />
+    <PackageVersion Include="MySqlConnector" Version="2.4.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.1" />
     <PackageVersion Include="BCrypt.Net-Next" Version="4.0.3" />
     <PackageVersion Include="DotEnv.Core" Version="3.1.0" />
     <PackageVersion Include="Dotenv.Extensions.Microsoft.Configuration" Version="3.1.0" />
     <PackageVersion Include="YeSql.Net" Version="2.0.0" />
     <PackageVersion Include="CopySqlFilesToOutputDirectory" Version="1.0.0" />
     <PackageVersion Include="seztion-parser" Version="3.0.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="NUnit" Version="4.1.0" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.2.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="FluentAssertions" Version="[7.0.0,8.0.0)" />
+    <PackageVersion Include="NUnit" Version="4.3.2" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 </Project>