From 805b190cfb38d945b538e1ab9192ad7865d0c4cf Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sun, 24 Dec 2023 19:38:46 +0100 Subject: [PATCH 1/7] Invalid docker format --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 919adae..1de6eb1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - ./files:/app/data - ./build:/app/build ports: - - '5218':'80' #Replace 5218 with the port you need + - 5218:80 #Replace 5218 with the port you need map_database: image: postgres:latest environment: From b9175df15b772ea0f837ffc8ae8d5067e0393771 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sun, 24 Dec 2023 19:38:57 +0100 Subject: [PATCH 2/7] Bump dockerfile to .net 8 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6ef7bf..1532811 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS base +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS base WORKDIR /app EXPOSE 80 -FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build WORKDIR /src COPY ["SS14.MapServer/SS14.MapServer.csproj", "SS14.MapServer/"] RUN dotnet restore "SS14.MapServer/SS14.MapServer.csproj" From a447cf59fc5c46780d8c3d1e9f5375bc72adbe90 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sun, 24 Dec 2023 19:39:54 +0100 Subject: [PATCH 3/7] Update Mapserver.Tests to .net 8 --- SS14.MapServer.Tests/SS14.MapServer.Tests.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj b/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj index 93a14a2..d36539c 100644 --- a/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj +++ b/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable @@ -10,10 +10,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive From db27efc3653d094215a536fd8d2cca1c3253c09c Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sun, 24 Dec 2023 19:40:02 +0100 Subject: [PATCH 4/7] Update MapServer to .net 8 --- SS14.MapServer/SS14.MapServer.csproj | 32 ++++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/SS14.MapServer/SS14.MapServer.csproj b/SS14.MapServer/SS14.MapServer.csproj index 6256682..194989c 100644 --- a/SS14.MapServer/SS14.MapServer.csproj +++ b/SS14.MapServer/SS14.MapServer.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable Linux @@ -10,29 +10,29 @@ - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - + + + + - - - - - - - - + + + + + + + + - + From 8360c7c6399c089e53a6b7032765875d453a9341 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sun, 24 Dec 2023 19:40:37 +0100 Subject: [PATCH 5/7] Import missing references --- .../MapProcessing/Services/ImageProcessingService.cs | 4 +++- SS14.MapServer/Program.cs | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs b/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs index e5d67b9..b1e6fed 100644 --- a/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs +++ b/SS14.MapServer/MapProcessing/Services/ImageProcessingService.cs @@ -1,4 +1,6 @@ -using SixLabors.ImageSharp.Advanced; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.Advanced; +using SixLabors.ImageSharp.Processing; using SS14.MapServer.Models.Entities; namespace SS14.MapServer.MapProcessing.Services; diff --git a/SS14.MapServer/Program.cs b/SS14.MapServer/Program.cs index 9e83eae..9c31e84 100644 --- a/SS14.MapServer/Program.cs +++ b/SS14.MapServer/Program.cs @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.OpenApi.Models; using Quartz; +using Quartz.AspNetCore; using Serilog; using SS14.GithubApiHelper.Extensions; using SS14.GithubApiHelper.Services; From d97eb0d260e66a05b947b31f9db91241d4352119 Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sun, 24 Dec 2023 20:21:49 +0100 Subject: [PATCH 6/7] Downgrade database and bump version --- SS14.MapServer/SS14.MapServer.csproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SS14.MapServer/SS14.MapServer.csproj b/SS14.MapServer/SS14.MapServer.csproj index 194989c..e0c12fc 100644 --- a/SS14.MapServer/SS14.MapServer.csproj +++ b/SS14.MapServer/SS14.MapServer.csproj @@ -5,25 +5,25 @@ enable enable Linux - 1.1.3 + 1.1.4 - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + - - + + From f74c17e87d7d3265a85b41b152ba47be85caa5da Mon Sep 17 00:00:00 2001 From: Debug <49997488+DebugOk@users.noreply.github.com> Date: Sun, 24 Dec 2023 20:24:05 +0100 Subject: [PATCH 7/7] Dont use beta verions --- SS14.MapServer.Tests/SS14.MapServer.Tests.csproj | 2 +- SS14.MapServer/SS14.MapServer.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj b/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj index d36539c..6804679 100644 --- a/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj +++ b/SS14.MapServer.Tests/SS14.MapServer.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/SS14.MapServer/SS14.MapServer.csproj b/SS14.MapServer/SS14.MapServer.csproj index e0c12fc..dc0eaa9 100644 --- a/SS14.MapServer/SS14.MapServer.csproj +++ b/SS14.MapServer/SS14.MapServer.csproj @@ -26,8 +26,8 @@ - - + +