Merge branch 'master' into allow-public-access-to-system-files

timiimit · Apr 26, 2024 · af84eb5 · af84eb5
2 parents bf92e33 + 929c99b
commit af84eb5
Show file tree

Hide file tree

Showing 16 changed files with 788 additions and 2,991 deletions.
diff --git a/.Tests/XUnit.Tests/XUnit.Tests.csproj b/.Tests/XUnit.Tests/XUnit.Tests.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: check if PRs are dirty
-        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        uses: eps1lon/actions-label-merge-conflict@v3
         with:
           dirtyLabel: "Conflicts"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"

diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -3,20 +3,20 @@ name: Build Server Docker Image
 on:
   pull_request:
     paths-ignore:
-      - '*.md'
-      - 'OldReferenceCode/**'
-      - 'XMPP-ejabberd/**'
-      - 'OldReferenceCode/**'
-      - 'Files/Engine.ini'
-      - 'UT4MasterServer.Web/**'
+      - "*.md"
+      - "OldReferenceCode/**"
+      - "XMPP-ejabberd/**"
+      - "OldReferenceCode/**"
+      - "Files/Engine.ini"
+      - "UT4MasterServer.Web/**"
   push:
     paths-ignore:
-      - '*.md'
-      - 'OldReferenceCode/**'
-      - 'XMPP-ejabberd/**'
-      - 'OldReferenceCode/**'
-      - 'Files/Engine.ini'
-      - 'UT4MasterServer.Web/**'
+      - "*.md"
+      - "OldReferenceCode/**"
+      - "XMPP-ejabberd/**"
+      - "OldReferenceCode/**"
+      - "Files/Engine.ini"
+      - "UT4MasterServer.Web/**"
 
 env:
   IMAGE_NAME: ut4masterserver
@@ -25,7 +25,7 @@ jobs:
   build-server:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build Docker Image
         run: docker build --pull -t ${{ env.IMAGE_NAME }} -f ./UT4MasterServer/Dockerfile .
       - name: Clean Up

diff --git a/.github/workflows/docker_build_frontend.yml b/.github/workflows/docker_build_frontend.yml
@@ -3,16 +3,16 @@ name: Build Frontend Docker Image
 on:
   pull_request:
     paths:
-      - 'UT4MasterServer.Web/**'
-      - '.github/workflows/docker_build_frontend.yml'
+      - "UT4MasterServer.Web/**"
+      - ".github/workflows/docker_build_frontend.yml"
       # ignored paths
-      - '!*.md'
+      - "!*.md"
   push:
     paths:
-      - 'UT4MasterServer.Web/**'
-      - '.github/workflows/docker_build_frontend.yml'
+      - "UT4MasterServer.Web/**"
+      - ".github/workflows/docker_build_frontend.yml"
       # ignored paths
-      - '!*.md'
+      - "!*.md"
 
 env:
   IMAGE_NAME: ut4masterserver-web
@@ -21,7 +21,7 @@ jobs:
   build-frontend:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build Frontend Docker Image
         run: docker build --pull -t ${{ env.IMAGE_NAME }} -f ./UT4MasterServer.Web/.docker/Development.Dockerfile ./UT4MasterServer.Web/
       - name: Clean Up

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -21,8 +21,8 @@ jobs:
   linters:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: lts/*
       - run: npm install --ignore-scripts

diff --git a/UT4MasterServer.Authentication/UT4MasterServer.Authentication.csproj b/UT4MasterServer.Authentication/UT4MasterServer.Authentication.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.13" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.29" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.29" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/UT4MasterServer.Common/UT4MasterServer.Common.csproj b/UT4MasterServer.Common/UT4MasterServer.Common.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.25.0" />
   </ItemGroup>
 
 </Project>
diff --git a/UT4MasterServer.Services/UT4MasterServer.Services.csproj b/UT4MasterServer.Services/UT4MasterServer.Services.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>