From 62c3092c766ceb3103ae51acafe33e7f9a185b8e Mon Sep 17 00:00:00 2001 From: sven-n Date: Fri, 22 Nov 2024 21:07:35 +0100 Subject: [PATCH] Changed all project targets and dockerfiles to .net 9 --- src/AttributeSystem/MUnique.OpenMU.AttributeSystem.csproj | 2 +- .../MUnique.OpenMU.ChatServer.ExDbConnector.csproj | 2 +- src/ChatServer/MUnique.OpenMU.ChatServer.csproj | 2 +- .../MUnique.OpenMU.ClientErrorLogDecryptor.csproj | 2 +- src/ClientLauncher/HostConfigurationDialog.cs | 4 +++- src/ClientLauncher/MUnique.OpenMU.ClientLauncher.csproj | 2 +- src/ConnectServer/MUnique.OpenMU.ConnectServer.csproj | 2 +- src/Dapr/AdminPanel.Host/Dockerfile | 5 +++-- .../AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj | 2 +- src/Dapr/ChatServer.Host/Dockerfile | 5 +++-- .../ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj | 2 +- src/Dapr/Common/MUnique.OpenMU.Dapr.Common.csproj | 2 +- src/Dapr/ConnectServer.Host/Dockerfile | 5 +++-- .../MUnique.OpenMU.ConnectServer.Host.csproj | 2 +- src/Dapr/FriendServer.Host/Dockerfile | 5 +++-- .../MUnique.OpenMU.FriendServer.Host.csproj | 2 +- src/Dapr/GameServer.Host/Dockerfile | 5 +++-- .../GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj | 2 +- src/Dapr/GuildServer.Host/Dockerfile | 5 +++-- .../GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj | 2 +- src/Dapr/LoginServer.Host/Dockerfile | 5 +++-- .../LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj | 2 +- src/Dapr/ServerClients/MUnique.OpenMU.ServerClients.csproj | 2 +- src/DataModel/MUnique.OpenMU.DataModel.csproj | 2 +- src/FriendServer/MUnique.OpenMU.FriendServer.csproj | 2 +- src/GameLogic/MUnique.OpenMU.GameLogic.csproj | 2 +- src/GameServer/MUnique.OpenMU.GameServer.csproj | 2 +- src/GuildServer/MUnique.OpenMU.GuildServer.csproj | 2 +- src/Interfaces/MUnique.OpenMU.Interfaces.csproj | 2 +- src/LoginServer/MUnique.OpenMU.LoginServer.csproj | 2 +- src/Network/Analyzer/MUnique.OpenMU.Network.Analyzer.csproj | 2 +- src/Network/Analyzer/MainForm.cs | 2 +- src/Network/MUnique.OpenMU.Network.csproj | 2 +- src/Network/Packets/MUnique.OpenMU.Network.Packets.csproj | 2 +- src/Pathfinding/MUnique.OpenMU.Pathfinding.csproj | 2 +- .../MUnique.OpenMU.Persistence.EntityFramework.csproj | 2 +- .../InMemory/MUnique.OpenMU.Persistence.InMemory.csproj | 2 +- .../MUnique.OpenMU.Persistence.Initialization.csproj | 2 +- src/Persistence/MUnique.OpenMU.Persistence.csproj | 2 +- .../MUnique.OpenMU.Persistence.SourceGenerator.csproj | 2 +- src/PlugIns/MUnique.OpenMU.PlugIns.csproj | 2 +- .../MUnique.OpenMU.SimpleModulusKeyGenerator.csproj | 2 +- src/Startup/Dockerfile | 5 +++-- src/Startup/MUnique.OpenMU.Startup.csproj | 4 +--- src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj | 2 +- src/Web/ItemEditor/MUnique.OpenMU.Web.ItemEditor.csproj | 2 +- src/Web/Map/MUnique.OpenMU.Web.Map.csproj | 2 +- .../MUnique.OpenMU.AttributeSystem.Tests.csproj | 2 +- .../MUnique.OpenMU.ChatServer.Tests.csproj | 2 +- .../MUnique.OpenMU.Network.Benchmarks.csproj | 2 +- .../MUnique.OpenMU.Network.Tests.csproj | 2 +- .../MUnique.OpenMU.Pathfinding.Tests.csproj | 2 +- .../MUnique.OpenMU.Persistence.Initialization.Tests.csproj | 2 +- .../MUnique.OpenMU.PlugIns.Tests.csproj | 2 +- tests/MUnique.OpenMU.Tests/MUnique.OpenMU.Tests.csproj | 2 +- 55 files changed, 73 insertions(+), 65 deletions(-) diff --git a/src/AttributeSystem/MUnique.OpenMU.AttributeSystem.csproj b/src/AttributeSystem/MUnique.OpenMU.AttributeSystem.csproj index 01000f45e..6edb0dd60 100644 --- a/src/AttributeSystem/MUnique.OpenMU.AttributeSystem.csproj +++ b/src/AttributeSystem/MUnique.OpenMU.AttributeSystem.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/ChatServer/ExDbConnector/MUnique.OpenMU.ChatServer.ExDbConnector.csproj b/src/ChatServer/ExDbConnector/MUnique.OpenMU.ChatServer.ExDbConnector.csproj index a0e9ed3af..698f5b6bc 100644 --- a/src/ChatServer/ExDbConnector/MUnique.OpenMU.ChatServer.ExDbConnector.csproj +++ b/src/ChatServer/ExDbConnector/MUnique.OpenMU.ChatServer.ExDbConnector.csproj @@ -1,7 +1,7 @@  Exe - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/ChatServer/MUnique.OpenMU.ChatServer.csproj b/src/ChatServer/MUnique.OpenMU.ChatServer.csproj index a745961fd..9e818ea25 100644 --- a/src/ChatServer/MUnique.OpenMU.ChatServer.csproj +++ b/src/ChatServer/MUnique.OpenMU.ChatServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/ClientErrorLogDecryptor/MUnique.OpenMU.ClientErrorLogDecryptor.csproj b/src/ClientErrorLogDecryptor/MUnique.OpenMU.ClientErrorLogDecryptor.csproj index d7d7d4ff0..ca669f15a 100644 --- a/src/ClientErrorLogDecryptor/MUnique.OpenMU.ClientErrorLogDecryptor.csproj +++ b/src/ClientErrorLogDecryptor/MUnique.OpenMU.ClientErrorLogDecryptor.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/ClientLauncher/HostConfigurationDialog.cs b/src/ClientLauncher/HostConfigurationDialog.cs index 5fe3ae3c4..fa70b0305 100644 --- a/src/ClientLauncher/HostConfigurationDialog.cs +++ b/src/ClientLauncher/HostConfigurationDialog.cs @@ -1,4 +1,5 @@ -// +using System.ComponentModel; +// // Licensed under the MIT License. See LICENSE file in the project root for full license information. // @@ -22,6 +23,7 @@ public HostConfigurationDialog() /// /// Gets or sets the settings. /// + [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public ServerHostSettings Settings { get diff --git a/src/ClientLauncher/MUnique.OpenMU.ClientLauncher.csproj b/src/ClientLauncher/MUnique.OpenMU.ClientLauncher.csproj index 8f1658442..1af5872e7 100644 --- a/src/ClientLauncher/MUnique.OpenMU.ClientLauncher.csproj +++ b/src/ClientLauncher/MUnique.OpenMU.ClientLauncher.csproj @@ -1,7 +1,7 @@ WinExe - net8.0-windows + net9.0-windows true enable nullable;CS4014;VSTHRD110;VSTHRD100 diff --git a/src/ConnectServer/MUnique.OpenMU.ConnectServer.csproj b/src/ConnectServer/MUnique.OpenMU.ConnectServer.csproj index f4e8de12f..1daa24022 100644 --- a/src/ConnectServer/MUnique.OpenMU.ConnectServer.csproj +++ b/src/ConnectServer/MUnique.OpenMU.ConnectServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Dapr/AdminPanel.Host/Dockerfile b/src/Dapr/AdminPanel.Host/Dockerfile index c4ecc7130..2a624c765 100644 --- a/src/Dapr/AdminPanel.Host/Dockerfile +++ b/src/Dapr/AdminPanel.Host/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app EXPOSE 8080 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj", "Dapr/AdminPanel.Host/"] RUN dotnet restore "Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj" @@ -16,4 +16,5 @@ RUN dotnet publish "MUnique.OpenMU.AdminPanel.Host.csproj" -c Release -o /app/pu FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +USER $APP_UID ENTRYPOINT ["dotnet", "MUnique.OpenMU.AdminPanel.Host.dll"] diff --git a/src/Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj b/src/Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj index f5d134afe..c3ecd80bb 100644 --- a/src/Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj +++ b/src/Dapr/AdminPanel.Host/MUnique.OpenMU.AdminPanel.Host.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Dapr/ChatServer.Host/Dockerfile b/src/Dapr/ChatServer.Host/Dockerfile index 8a9163b4c..8f7253cc6 100644 --- a/src/Dapr/ChatServer.Host/Dockerfile +++ b/src/Dapr/ChatServer.Host/Dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app EXPOSE 8080 EXPOSE 55980 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj", "Dapr/ChatServer.Host/"] RUN dotnet restore "Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj" @@ -17,4 +17,5 @@ RUN dotnet publish "MUnique.OpenMU.ChatServer.Host.csproj" -c Release -o /app/pu FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +USER $APP_UID ENTRYPOINT ["dotnet", "MUnique.OpenMU.ChatServer.Host.dll"] diff --git a/src/Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj b/src/Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj index 46fa8d1be..6ccac2d33 100644 --- a/src/Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj +++ b/src/Dapr/ChatServer.Host/MUnique.OpenMU.ChatServer.Host.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Dapr/Common/MUnique.OpenMU.Dapr.Common.csproj b/src/Dapr/Common/MUnique.OpenMU.Dapr.Common.csproj index fb09ceaa8..4bdc5f5a7 100644 --- a/src/Dapr/Common/MUnique.OpenMU.Dapr.Common.csproj +++ b/src/Dapr/Common/MUnique.OpenMU.Dapr.Common.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Dapr/ConnectServer.Host/Dockerfile b/src/Dapr/ConnectServer.Host/Dockerfile index 8d1ae5379..bdef59e65 100644 --- a/src/Dapr/ConnectServer.Host/Dockerfile +++ b/src/Dapr/ConnectServer.Host/Dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app EXPOSE 8080 EXPOSE 44405 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj", "Dapr/ConnectServer.Host/"] RUN dotnet restore "Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj" @@ -17,4 +17,5 @@ RUN dotnet publish "MUnique.OpenMU.ConnectServer.Host.csproj" -c Release -o /app FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +USER $APP_UID ENTRYPOINT ["dotnet", "MUnique.OpenMU.ConnectServer.Host.dll"] diff --git a/src/Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj b/src/Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj index 54dbee9a5..3c4722a8d 100644 --- a/src/Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj +++ b/src/Dapr/ConnectServer.Host/MUnique.OpenMU.ConnectServer.Host.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Dapr/FriendServer.Host/Dockerfile b/src/Dapr/FriendServer.Host/Dockerfile index df7a5cc08..2f51e1a14 100644 --- a/src/Dapr/FriendServer.Host/Dockerfile +++ b/src/Dapr/FriendServer.Host/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app EXPOSE 8080 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj", "Dapr/FriendServer.Host/"] RUN dotnet restore "Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj" @@ -16,4 +16,5 @@ RUN dotnet publish "MUnique.OpenMU.FriendServer.Host.csproj" -c Release -o /app/ FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +USER $APP_UID ENTRYPOINT ["dotnet", "MUnique.OpenMU.FriendServer.Host.dll"] diff --git a/src/Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj b/src/Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj index b2c6de399..e2e5b9563 100644 --- a/src/Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj +++ b/src/Dapr/FriendServer.Host/MUnique.OpenMU.FriendServer.Host.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Dapr/GameServer.Host/Dockerfile b/src/Dapr/GameServer.Host/Dockerfile index 01a4af068..2b4fdfc83 100644 --- a/src/Dapr/GameServer.Host/Dockerfile +++ b/src/Dapr/GameServer.Host/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app EXPOSE 8080 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj", "Dapr/GameServer.Host/"] RUN dotnet restore "Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj" @@ -17,4 +17,5 @@ FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +USER $APP_UID ENTRYPOINT ["dotnet", "MUnique.OpenMU.GameServer.Host.dll"] diff --git a/src/Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj b/src/Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj index 73520483b..9bd0c5106 100644 --- a/src/Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj +++ b/src/Dapr/GameServer.Host/MUnique.OpenMU.GameServer.Host.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Dapr/GuildServer.Host/Dockerfile b/src/Dapr/GuildServer.Host/Dockerfile index fe245c1ea..4be61d606 100644 --- a/src/Dapr/GuildServer.Host/Dockerfile +++ b/src/Dapr/GuildServer.Host/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app EXPOSE 8080 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj", "Dapr/GuildServer.Host/"] RUN dotnet restore "Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj" @@ -16,4 +16,5 @@ RUN dotnet publish "MUnique.OpenMU.GuildServer.Host.csproj" -c Release -o /app/p FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +USER $APP_UID ENTRYPOINT ["dotnet", "MUnique.OpenMU.GuildServer.Host.dll"] diff --git a/src/Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj b/src/Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj index 40b70062a..37eec4e1f 100644 --- a/src/Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj +++ b/src/Dapr/GuildServer.Host/MUnique.OpenMU.GuildServer.Host.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Dapr/LoginServer.Host/Dockerfile b/src/Dapr/LoginServer.Host/Dockerfile index db8fe410b..b9b3ef005 100644 --- a/src/Dapr/LoginServer.Host/Dockerfile +++ b/src/Dapr/LoginServer.Host/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app EXPOSE 8080 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj", "Dapr/LoginServer.Host/"] RUN dotnet restore "Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj" @@ -16,4 +16,5 @@ RUN dotnet publish "MUnique.OpenMU.LoginServer.Host.csproj" -c Release -o /app/p FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +USER $APP_UID ENTRYPOINT ["dotnet", "MUnique.OpenMU.LoginServer.Host.dll"] diff --git a/src/Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj b/src/Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj index f19a0b21f..50720433b 100644 --- a/src/Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj +++ b/src/Dapr/LoginServer.Host/MUnique.OpenMU.LoginServer.Host.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Dapr/ServerClients/MUnique.OpenMU.ServerClients.csproj b/src/Dapr/ServerClients/MUnique.OpenMU.ServerClients.csproj index 4739eac64..92be73d72 100644 --- a/src/Dapr/ServerClients/MUnique.OpenMU.ServerClients.csproj +++ b/src/Dapr/ServerClients/MUnique.OpenMU.ServerClients.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable false false diff --git a/src/DataModel/MUnique.OpenMU.DataModel.csproj b/src/DataModel/MUnique.OpenMU.DataModel.csproj index f3ac71160..c90352bd8 100644 --- a/src/DataModel/MUnique.OpenMU.DataModel.csproj +++ b/src/DataModel/MUnique.OpenMU.DataModel.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/FriendServer/MUnique.OpenMU.FriendServer.csproj b/src/FriendServer/MUnique.OpenMU.FriendServer.csproj index 04c056fd1..f905869a5 100644 --- a/src/FriendServer/MUnique.OpenMU.FriendServer.csproj +++ b/src/FriendServer/MUnique.OpenMU.FriendServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/GameLogic/MUnique.OpenMU.GameLogic.csproj b/src/GameLogic/MUnique.OpenMU.GameLogic.csproj index 8bd691ccd..0b5e72c62 100644 --- a/src/GameLogic/MUnique.OpenMU.GameLogic.csproj +++ b/src/GameLogic/MUnique.OpenMU.GameLogic.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/GameServer/MUnique.OpenMU.GameServer.csproj b/src/GameServer/MUnique.OpenMU.GameServer.csproj index d026f56f5..13edd6fba 100644 --- a/src/GameServer/MUnique.OpenMU.GameServer.csproj +++ b/src/GameServer/MUnique.OpenMU.GameServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/GuildServer/MUnique.OpenMU.GuildServer.csproj b/src/GuildServer/MUnique.OpenMU.GuildServer.csproj index 58eb336fa..eeb31f6e7 100644 --- a/src/GuildServer/MUnique.OpenMU.GuildServer.csproj +++ b/src/GuildServer/MUnique.OpenMU.GuildServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Interfaces/MUnique.OpenMU.Interfaces.csproj b/src/Interfaces/MUnique.OpenMU.Interfaces.csproj index af7c25851..29de4812b 100644 --- a/src/Interfaces/MUnique.OpenMU.Interfaces.csproj +++ b/src/Interfaces/MUnique.OpenMU.Interfaces.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/LoginServer/MUnique.OpenMU.LoginServer.csproj b/src/LoginServer/MUnique.OpenMU.LoginServer.csproj index 16e3ff866..ec5687721 100644 --- a/src/LoginServer/MUnique.OpenMU.LoginServer.csproj +++ b/src/LoginServer/MUnique.OpenMU.LoginServer.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Network/Analyzer/MUnique.OpenMU.Network.Analyzer.csproj b/src/Network/Analyzer/MUnique.OpenMU.Network.Analyzer.csproj index 3a5ba83d3..737af35d8 100644 --- a/src/Network/Analyzer/MUnique.OpenMU.Network.Analyzer.csproj +++ b/src/Network/Analyzer/MUnique.OpenMU.Network.Analyzer.csproj @@ -1,7 +1,7 @@ WinExe - net8.0-windows + net9.0-windows true enable nullable;CS4014;VSTHRD110;VSTHRD100 diff --git a/src/Network/Analyzer/MainForm.cs b/src/Network/Analyzer/MainForm.cs index b4d4bb5f4..800a0584f 100644 --- a/src/Network/Analyzer/MainForm.cs +++ b/src/Network/Analyzer/MainForm.cs @@ -60,7 +60,7 @@ public MainForm() this.Disposed += (_, _) => this._analyzer.Dispose(); this.clientVersionComboBox.SelectedIndexChanged += OnSelectedClientVersionChanged; - this.clientVersionComboBox.DataSource = new BindingSource(this._clientVersions, null); + this.clientVersionComboBox.DataSource = new BindingSource(this._clientVersions, string.Empty); this.clientVersionComboBox.DisplayMember = "Value"; this.clientVersionComboBox.ValueMember = "Key"; diff --git a/src/Network/MUnique.OpenMU.Network.csproj b/src/Network/MUnique.OpenMU.Network.csproj index 7ddf63328..01c484986 100644 --- a/src/Network/MUnique.OpenMU.Network.csproj +++ b/src/Network/MUnique.OpenMU.Network.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Network/Packets/MUnique.OpenMU.Network.Packets.csproj b/src/Network/Packets/MUnique.OpenMU.Network.Packets.csproj index 0018479d4..ccea7f0df 100644 --- a/src/Network/Packets/MUnique.OpenMU.Network.Packets.csproj +++ b/src/Network/Packets/MUnique.OpenMU.Network.Packets.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false false diff --git a/src/Pathfinding/MUnique.OpenMU.Pathfinding.csproj b/src/Pathfinding/MUnique.OpenMU.Pathfinding.csproj index 57dabd87e..c288ac1c6 100644 --- a/src/Pathfinding/MUnique.OpenMU.Pathfinding.csproj +++ b/src/Pathfinding/MUnique.OpenMU.Pathfinding.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Persistence/EntityFramework/MUnique.OpenMU.Persistence.EntityFramework.csproj b/src/Persistence/EntityFramework/MUnique.OpenMU.Persistence.EntityFramework.csproj index abada395a..40109650b 100644 --- a/src/Persistence/EntityFramework/MUnique.OpenMU.Persistence.EntityFramework.csproj +++ b/src/Persistence/EntityFramework/MUnique.OpenMU.Persistence.EntityFramework.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Persistence/InMemory/MUnique.OpenMU.Persistence.InMemory.csproj b/src/Persistence/InMemory/MUnique.OpenMU.Persistence.InMemory.csproj index 887025c71..d4141d89e 100644 --- a/src/Persistence/InMemory/MUnique.OpenMU.Persistence.InMemory.csproj +++ b/src/Persistence/InMemory/MUnique.OpenMU.Persistence.InMemory.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Persistence/Initialization/MUnique.OpenMU.Persistence.Initialization.csproj b/src/Persistence/Initialization/MUnique.OpenMU.Persistence.Initialization.csproj index 9fc44ac97..14b558aea 100644 --- a/src/Persistence/Initialization/MUnique.OpenMU.Persistence.Initialization.csproj +++ b/src/Persistence/Initialization/MUnique.OpenMU.Persistence.Initialization.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Persistence/MUnique.OpenMU.Persistence.csproj b/src/Persistence/MUnique.OpenMU.Persistence.csproj index 0488c6954..a99274946 100644 --- a/src/Persistence/MUnique.OpenMU.Persistence.csproj +++ b/src/Persistence/MUnique.OpenMU.Persistence.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 false false enable diff --git a/src/Persistence/SourceGenerator/MUnique.OpenMU.Persistence.SourceGenerator.csproj b/src/Persistence/SourceGenerator/MUnique.OpenMU.Persistence.SourceGenerator.csproj index cb7d8e371..76a054962 100644 --- a/src/Persistence/SourceGenerator/MUnique.OpenMU.Persistence.SourceGenerator.csproj +++ b/src/Persistence/SourceGenerator/MUnique.OpenMU.Persistence.SourceGenerator.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 false false warnings diff --git a/src/PlugIns/MUnique.OpenMU.PlugIns.csproj b/src/PlugIns/MUnique.OpenMU.PlugIns.csproj index 6be7f1c65..6c8c32616 100644 --- a/src/PlugIns/MUnique.OpenMU.PlugIns.csproj +++ b/src/PlugIns/MUnique.OpenMU.PlugIns.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/SimpleModulusKeyGenerator/MUnique.OpenMU.SimpleModulusKeyGenerator.csproj b/src/SimpleModulusKeyGenerator/MUnique.OpenMU.SimpleModulusKeyGenerator.csproj index 309135ff8..729bee119 100644 --- a/src/SimpleModulusKeyGenerator/MUnique.OpenMU.SimpleModulusKeyGenerator.csproj +++ b/src/SimpleModulusKeyGenerator/MUnique.OpenMU.SimpleModulusKeyGenerator.csproj @@ -3,7 +3,7 @@ Exe - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Startup/Dockerfile b/src/Startup/Dockerfile index e994fe138..252076579 100644 --- a/src/Startup/Dockerfile +++ b/src/Startup/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine AS base +FROM mcr.microsoft.com/dotnet/aspnet:9.0-alpine AS base WORKDIR /app EXPOSE 8080 EXPOSE 55901 @@ -10,7 +10,7 @@ EXPOSE 55906 EXPOSE 44405 EXPOSE 55980 -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0-alpine AS build WORKDIR /src COPY ["Startup/MUnique.OpenMU.Startup.csproj", "Startup/"] RUN dotnet restore "Startup/MUnique.OpenMU.Startup.csproj" @@ -24,4 +24,5 @@ RUN dotnet publish "MUnique.OpenMU.Startup.csproj" -c Release -o /app/publish -p FROM base AS final WORKDIR /app COPY --from=publish /app/publish . +USER $APP_UID ENTRYPOINT ["dotnet", "MUnique.OpenMU.Startup.dll", "-autostart"] diff --git a/src/Startup/MUnique.OpenMU.Startup.csproj b/src/Startup/MUnique.OpenMU.Startup.csproj index 9c89299e7..c468a46c3 100644 --- a/src/Startup/MUnique.OpenMU.Startup.csproj +++ b/src/Startup/MUnique.OpenMU.Startup.csproj @@ -2,10 +2,8 @@ - net8.0 + net9.0 false - true - false false enable nullable;CS4014;VSTHRD110;VSTHRD100 diff --git a/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj b/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj index c95e0ccb1..d56bd8d40 100644 --- a/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj +++ b/src/Web/AdminPanel/MUnique.OpenMU.Web.AdminPanel.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Web/ItemEditor/MUnique.OpenMU.Web.ItemEditor.csproj b/src/Web/ItemEditor/MUnique.OpenMU.Web.ItemEditor.csproj index 366e687c7..ac471cde3 100644 --- a/src/Web/ItemEditor/MUnique.OpenMU.Web.ItemEditor.csproj +++ b/src/Web/ItemEditor/MUnique.OpenMU.Web.ItemEditor.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/src/Web/Map/MUnique.OpenMU.Web.Map.csproj b/src/Web/Map/MUnique.OpenMU.Web.Map.csproj index fc197350c..eca0c9332 100644 --- a/src/Web/Map/MUnique.OpenMU.Web.Map.csproj +++ b/src/Web/Map/MUnique.OpenMU.Web.Map.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable nullable;CS4014;VSTHRD110;VSTHRD100 diff --git a/tests/MUnique.OpenMU.AttributeSystem.Tests/MUnique.OpenMU.AttributeSystem.Tests.csproj b/tests/MUnique.OpenMU.AttributeSystem.Tests/MUnique.OpenMU.AttributeSystem.Tests.csproj index 7e159c2f9..12c99193f 100644 --- a/tests/MUnique.OpenMU.AttributeSystem.Tests/MUnique.OpenMU.AttributeSystem.Tests.csproj +++ b/tests/MUnique.OpenMU.AttributeSystem.Tests/MUnique.OpenMU.AttributeSystem.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/tests/MUnique.OpenMU.ChatServer.Tests/MUnique.OpenMU.ChatServer.Tests.csproj b/tests/MUnique.OpenMU.ChatServer.Tests/MUnique.OpenMU.ChatServer.Tests.csproj index 1a3361860..2737519b8 100644 --- a/tests/MUnique.OpenMU.ChatServer.Tests/MUnique.OpenMU.ChatServer.Tests.csproj +++ b/tests/MUnique.OpenMU.ChatServer.Tests/MUnique.OpenMU.ChatServer.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/tests/MUnique.OpenMU.Network.Benchmarks/MUnique.OpenMU.Network.Benchmarks.csproj b/tests/MUnique.OpenMU.Network.Benchmarks/MUnique.OpenMU.Network.Benchmarks.csproj index 9a7c3105d..cc7a655a9 100644 --- a/tests/MUnique.OpenMU.Network.Benchmarks/MUnique.OpenMU.Network.Benchmarks.csproj +++ b/tests/MUnique.OpenMU.Network.Benchmarks/MUnique.OpenMU.Network.Benchmarks.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/tests/MUnique.OpenMU.Network.Tests/MUnique.OpenMU.Network.Tests.csproj b/tests/MUnique.OpenMU.Network.Tests/MUnique.OpenMU.Network.Tests.csproj index ad2a1aa5b..8a6ae3a44 100644 --- a/tests/MUnique.OpenMU.Network.Tests/MUnique.OpenMU.Network.Tests.csproj +++ b/tests/MUnique.OpenMU.Network.Tests/MUnique.OpenMU.Network.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/tests/MUnique.OpenMU.Pathfinding.Tests/MUnique.OpenMU.Pathfinding.Tests.csproj b/tests/MUnique.OpenMU.Pathfinding.Tests/MUnique.OpenMU.Pathfinding.Tests.csproj index 73095edf9..79b580d4f 100644 --- a/tests/MUnique.OpenMU.Pathfinding.Tests/MUnique.OpenMU.Pathfinding.Tests.csproj +++ b/tests/MUnique.OpenMU.Pathfinding.Tests/MUnique.OpenMU.Pathfinding.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/tests/MUnique.OpenMU.Persistence.Initialization.Tests/MUnique.OpenMU.Persistence.Initialization.Tests.csproj b/tests/MUnique.OpenMU.Persistence.Initialization.Tests/MUnique.OpenMU.Persistence.Initialization.Tests.csproj index 074eba241..a82fa7286 100644 --- a/tests/MUnique.OpenMU.Persistence.Initialization.Tests/MUnique.OpenMU.Persistence.Initialization.Tests.csproj +++ b/tests/MUnique.OpenMU.Persistence.Initialization.Tests/MUnique.OpenMU.Persistence.Initialization.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/tests/MUnique.OpenMU.PlugIns.Tests/MUnique.OpenMU.PlugIns.Tests.csproj b/tests/MUnique.OpenMU.PlugIns.Tests/MUnique.OpenMU.PlugIns.Tests.csproj index 3f708e4f2..0f099e833 100644 --- a/tests/MUnique.OpenMU.PlugIns.Tests/MUnique.OpenMU.PlugIns.Tests.csproj +++ b/tests/MUnique.OpenMU.PlugIns.Tests/MUnique.OpenMU.PlugIns.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false diff --git a/tests/MUnique.OpenMU.Tests/MUnique.OpenMU.Tests.csproj b/tests/MUnique.OpenMU.Tests/MUnique.OpenMU.Tests.csproj index bef5e8ec0..7d22b0d82 100644 --- a/tests/MUnique.OpenMU.Tests/MUnique.OpenMU.Tests.csproj +++ b/tests/MUnique.OpenMU.Tests/MUnique.OpenMU.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable nullable;CS4014;VSTHRD110;VSTHRD100 false