From a3f57a5fffff080cebe286171907b726994d52b1 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 28 Apr 2024 00:55:22 +0200 Subject: [PATCH] update server to net 8 --- Docker/build/Dockerfile-MareSynchronosServer | 4 +- .../build/Dockerfile-MareSynchronosServer-git | 4 +- .../build/Dockerfile-MareSynchronosServices | 4 +- .../Dockerfile-MareSynchronosServices-git | 4 +- ...Dockerfile-MareSynchronosStaticFilesServer | 4 +- ...erfile-MareSynchronosStaticFilesServer-git | 4 +- .../MareSynchronosServer/Hubs/MareHub.User.cs | 2 + .../Hubs/SignalRLimitFilter.cs | 4 +- .../MareSynchronosServer.csproj | 14 +++---- .../MareSynchronosServices.csproj | 12 +++--- .../MareSynchronosShared.csproj | 38 +++++++++---------- .../MareSynchronosStaticFilesServer.csproj | 6 +-- 12 files changed, 51 insertions(+), 49 deletions(-) diff --git a/Docker/build/Dockerfile-MareSynchronosServer b/Docker/build/Dockerfile-MareSynchronosServer index 9a33d5c..ea802c4 100644 --- a/Docker/build/Dockerfile-MareSynchronosServer +++ b/Docker/build/Dockerfile-MareSynchronosServer @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD COPY MareAPI /server/MareAPI COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared @@ -12,7 +12,7 @@ RUN dotnet publish \ --output=/build \ MareSynchronosServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosServer-git b/Docker/build/Dockerfile-MareSynchronosServer-git index 1f643da..fec5c0b 100644 --- a/Docker/build/Dockerfile-MareSynchronosServer-git +++ b/Docker/build/Dockerfile-MareSynchronosServer-git @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server @@ -10,7 +10,7 @@ RUN dotnet publish \ --output=/MareSynchronosServer \ MareSynchronosServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosServices b/Docker/build/Dockerfile-MareSynchronosServices index 5c6f385..4f67c45 100644 --- a/Docker/build/Dockerfile-MareSynchronosServices +++ b/Docker/build/Dockerfile-MareSynchronosServices @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD COPY MareAPI /server/MareAPI COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared @@ -12,7 +12,7 @@ RUN dotnet publish \ --output=/build \ MareSynchronosServices.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosServices-git b/Docker/build/Dockerfile-MareSynchronosServices-git index 1e47631..964d0ac 100644 --- a/Docker/build/Dockerfile-MareSynchronosServices-git +++ b/Docker/build/Dockerfile-MareSynchronosServices-git @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server @@ -10,7 +10,7 @@ RUN dotnet publish \ --output=/MareSynchronosServices \ MareSynchronosServices.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer index ad5499a..ff2adb2 100644 --- a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer +++ b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD COPY MareAPI /server/MareAPI COPY MareSynchronosServer/MareSynchronosShared /server/MareSynchronosServer/MareSynchronosShared @@ -12,7 +12,7 @@ RUN dotnet publish \ --output=/build \ MareSynchronosStaticFilesServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git index 2270ed2..579c38b 100644 --- a/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git +++ b/Docker/build/Dockerfile-MareSynchronosStaticFilesServer-git @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 as BUILD +FROM mcr.microsoft.com/dotnet/sdk:8.0 as BUILD RUN git clone --recurse-submodules https://github.com/Penumbra-Sync/server @@ -10,7 +10,7 @@ RUN dotnet publish \ --output=/MareSynchronosStaticFilesServer \ MareSynchronosStaticFilesServer.csproj -FROM mcr.microsoft.com/dotnet/aspnet:7.0 +FROM mcr.microsoft.com/dotnet/aspnet:8.0 RUN adduser \ --disabled-password \ diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs index af101fa..91bc64d 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs @@ -12,6 +12,8 @@ using MareSynchronosShared.Models; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; namespace MareSynchronosServer.Hubs; diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs index 100a706..12245ea 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/SignalRLimitFilter.cs @@ -10,8 +10,8 @@ public class SignalRLimitFilter : IHubFilter private readonly IRateLimitProcessor _processor; private readonly IHttpContextAccessor accessor; private readonly ILogger logger; - private static readonly SemaphoreSlim ConnectionLimiterSemaphore = new(10); - private static readonly SemaphoreSlim DisconnectLimiterSemaphore = new(10); + private static readonly SemaphoreSlim ConnectionLimiterSemaphore = new(20); + private static readonly SemaphoreSlim DisconnectLimiterSemaphore = new(20); public SignalRLimitFilter( IOptions options, IProcessingStrategy processing, IIpPolicyStore policyStore, IHttpContextAccessor accessor, ILogger logger) diff --git a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj index 4cd4019..c13e964 100644 --- a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj +++ b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 aspnet-MareSynchronosServer-BA82A12A-0B30-463C-801D-B7E81318CD50 1.1.0.0 enable @@ -21,21 +21,21 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + diff --git a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj index 321995b..1de88d1 100644 --- a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj +++ b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable @@ -21,14 +21,14 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj index b2269bc..12c33cf 100644 --- a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj +++ b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable @@ -18,15 +18,15 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -35,25 +35,25 @@ - - - - - - + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + - - - - - + + + + + diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj index ea363e9..4d28c00 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable @@ -23,11 +23,11 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - +