From 3d7f071170d1abbad0c8ae3e77c65fcc7092acf8 Mon Sep 17 00:00:00 2001 From: ChiaraBm Date: Thu, 15 May 2025 09:46:38 +0200 Subject: [PATCH] Upgraded to dotnet 9. Fixed smaller issues --- .../Database/ServersDataContext.cs | 1 - .../MoonlightServers.ApiServer.csproj | 12 ++++++++---- MoonlightServers.ApiServer/Program.cs | 16 ---------------- .../MoonlightServers.Daemon.csproj | 12 ++++++------ .../MoonlightServers.DaemonShared.csproj | 13 ++++++++----- .../MoonlightServers.Frontend.csproj | 16 ++++++++++------ .../MoonlightServers.Shared.csproj | 14 +++++++++----- 7 files changed, 41 insertions(+), 43 deletions(-) diff --git a/MoonlightServers.ApiServer/Database/ServersDataContext.cs b/MoonlightServers.ApiServer/Database/ServersDataContext.cs index ad28c7f..6e67b70 100644 --- a/MoonlightServers.ApiServer/Database/ServersDataContext.cs +++ b/MoonlightServers.ApiServer/Database/ServersDataContext.cs @@ -1,7 +1,6 @@ using Microsoft.EntityFrameworkCore; using MoonCore.Extended.SingleDb; using Moonlight.ApiServer.Configuration; -using Moonlight.ApiServer.Helpers; using MoonlightServers.ApiServer.Database.Entities; namespace MoonlightServers.ApiServer.Database; diff --git a/MoonlightServers.ApiServer/MoonlightServers.ApiServer.csproj b/MoonlightServers.ApiServer/MoonlightServers.ApiServer.csproj index 2160d2b..f649112 100644 --- a/MoonlightServers.ApiServer/MoonlightServers.ApiServer.csproj +++ b/MoonlightServers.ApiServer/MoonlightServers.ApiServer.csproj @@ -1,19 +1,23 @@ - net8.0 + net9.0 enable enable Linux - true - 2.1.0 + + + + MoonlightServers.ApiServer MoonlightServers.ApiServer + 2.1.0 apiserver + true - + diff --git a/MoonlightServers.ApiServer/Program.cs b/MoonlightServers.ApiServer/Program.cs index 35990a0..a05be36 100644 --- a/MoonlightServers.ApiServer/Program.cs +++ b/MoonlightServers.ApiServer/Program.cs @@ -13,22 +13,6 @@ using MoonlightServers.ApiServer.Startup; var startup = new Startup(); -#region Creating virtual plugin manifest from plugin.json file - -// Read out content -var pluginManifestJson = await File.ReadAllTextAsync("../plugin.json"); - -// Parse to model -var pluginManifest = JsonSerializer.Deserialize(pluginManifestJson, new JsonSerializerOptions() -{ - PropertyNameCaseInsensitive = true -})!; - -// Clear assemblies as we are loading them using the additional assembly parameter -pluginManifest.Assemblies.Clear(); - -#endregion - await startup.Run(args, [ new PluginStartup() ]); \ No newline at end of file diff --git a/MoonlightServers.Daemon/MoonlightServers.Daemon.csproj b/MoonlightServers.Daemon/MoonlightServers.Daemon.csproj index 944475d..2ddb7f1 100644 --- a/MoonlightServers.Daemon/MoonlightServers.Daemon.csproj +++ b/MoonlightServers.Daemon/MoonlightServers.Daemon.csproj @@ -1,20 +1,20 @@ - net8.0 + net9.0 enable enable - - - - + + + + - + diff --git a/MoonlightServers.DaemonShared/MoonlightServers.DaemonShared.csproj b/MoonlightServers.DaemonShared/MoonlightServers.DaemonShared.csproj index 3549f92..7c70436 100644 --- a/MoonlightServers.DaemonShared/MoonlightServers.DaemonShared.csproj +++ b/MoonlightServers.DaemonShared/MoonlightServers.DaemonShared.csproj @@ -1,19 +1,22 @@  - net8.0 + net9.0 enable enable + + + + MoonlightServers.DaemonShared MoonlightServers.DaemonShared + 2.1.0 shared true - 2.1.0 - MoonlightServers.DaemonShared - - + + diff --git a/MoonlightServers.Frontend/MoonlightServers.Frontend.csproj b/MoonlightServers.Frontend/MoonlightServers.Frontend.csproj index 1ef943f..0c245a1 100644 --- a/MoonlightServers.Frontend/MoonlightServers.Frontend.csproj +++ b/MoonlightServers.Frontend/MoonlightServers.Frontend.csproj @@ -1,19 +1,23 @@ - net8.0 + net9.0 enable enable - true - 2.1.0 + + + + MoonlightServers.Frontend MoonlightServers.Frontend + 2.1.0 frontend + true - - - + + + diff --git a/MoonlightServers.Shared/MoonlightServers.Shared.csproj b/MoonlightServers.Shared/MoonlightServers.Shared.csproj index 7edd6c0..818dc21 100644 --- a/MoonlightServers.Shared/MoonlightServers.Shared.csproj +++ b/MoonlightServers.Shared/MoonlightServers.Shared.csproj @@ -1,13 +1,17 @@  - net8.0 + net9.0 enable enable - true - 2.1.0 - MoonlightServers.Shared - shared + + MoonlightServers.Shared + MoonlightServers.Shared + 2.1.0 + shared + true + +