From dd0dfac70159e74071605a61c67f2260538af90e Mon Sep 17 00:00:00 2001 From: SirConstance Date: Sun, 31 Aug 2025 08:56:06 +0200 Subject: [PATCH] =?UTF-8?q?Correctif=20d=C3=A9pendance=20et=20update=20lib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MareSynchronosServer/MareSynchronosServer.sln | 54 ++++++++++++++++++- .../MareSynchronosServer.csproj | 4 +- .../MareSynchronosServices.csproj | 2 +- .../MareSynchronosShared.csproj | 2 +- .../Utils/ClientMessage.cs | 9 +++- .../MareSynchronosStaticFilesServer.csproj | 2 +- 6 files changed, 66 insertions(+), 7 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosServer.sln b/MareSynchronosServer/MareSynchronosServer.sln index 84f8d6f..7b4cf7f 100644 --- a/MareSynchronosServer/MareSynchronosServer.sln +++ b/MareSynchronosServer/MareSynchronosServer.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.2.32602.215 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronosServer", "MareSynchronosServer\MareSynchronosServer.csproj", "{029CA97F-E0BA-4172-A191-EA21FB61AD0F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "..\MareAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{326BFB1B-5571-47A6-8513-1FFDB32D53B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronos.API", "..\UmbraAPI\MareSynchronosAPI\MareSynchronos.API.csproj", "{326BFB1B-5571-47A6-8513-1FFDB32D53B0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MareSynchronosShared", "MareSynchronosShared\MareSynchronosShared.csproj", "{67B1461D-E215-4BA8-A64D-E1836724D5E6}" EndProject @@ -23,33 +23,85 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|x64.ActiveCfg = Debug|Any CPU + {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|x64.Build.0 = Debug|Any CPU + {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|x86.ActiveCfg = Debug|Any CPU + {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Debug|x86.Build.0 = Debug|Any CPU {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|Any CPU.ActiveCfg = Release|Any CPU {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|Any CPU.Build.0 = Release|Any CPU + {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|x64.ActiveCfg = Release|Any CPU + {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|x64.Build.0 = Release|Any CPU + {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|x86.ActiveCfg = Release|Any CPU + {029CA97F-E0BA-4172-A191-EA21FB61AD0F}.Release|x86.Build.0 = Release|Any CPU {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|x64.ActiveCfg = Debug|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|x64.Build.0 = Debug|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|x86.ActiveCfg = Debug|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Debug|x86.Build.0 = Debug|Any CPU {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|Any CPU.Build.0 = Release|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|x64.ActiveCfg = Release|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|x64.Build.0 = Release|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|x86.ActiveCfg = Release|Any CPU + {326BFB1B-5571-47A6-8513-1FFDB32D53B0}.Release|x86.Build.0 = Release|Any CPU {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|x64.ActiveCfg = Debug|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|x64.Build.0 = Debug|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|x86.ActiveCfg = Debug|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Debug|x86.Build.0 = Debug|Any CPU {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|Any CPU.ActiveCfg = Release|Any CPU {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|Any CPU.Build.0 = Release|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|x64.ActiveCfg = Release|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|x64.Build.0 = Release|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|x86.ActiveCfg = Release|Any CPU + {67B1461D-E215-4BA8-A64D-E1836724D5E6}.Release|x86.Build.0 = Release|Any CPU {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|x64.ActiveCfg = Debug|Any CPU + {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|x64.Build.0 = Debug|Any CPU + {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|x86.ActiveCfg = Debug|Any CPU + {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Debug|x86.Build.0 = Debug|Any CPU {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|Any CPU.ActiveCfg = Release|Any CPU {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|Any CPU.Build.0 = Release|Any CPU + {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|x64.ActiveCfg = Release|Any CPU + {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|x64.Build.0 = Release|Any CPU + {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|x86.ActiveCfg = Release|Any CPU + {3C7F43BB-FE4C-48BC-BF42-D24E70E8FCB7}.Release|x86.Build.0 = Release|Any CPU {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|x64.ActiveCfg = Debug|Any CPU + {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|x64.Build.0 = Debug|Any CPU + {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|x86.ActiveCfg = Debug|Any CPU + {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Debug|x86.Build.0 = Debug|Any CPU {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|Any CPU.ActiveCfg = Release|Any CPU {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|Any CPU.Build.0 = Release|Any CPU + {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|x64.ActiveCfg = Release|Any CPU + {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|x64.Build.0 = Release|Any CPU + {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|x86.ActiveCfg = Release|Any CPU + {E29C8677-AB44-4950-9EB1-D8E70B710A56}.Release|x86.Build.0 = Release|Any CPU {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|x64.ActiveCfg = Debug|Any CPU + {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|x64.Build.0 = Debug|Any CPU + {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|x86.ActiveCfg = Debug|Any CPU + {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Debug|x86.Build.0 = Debug|Any CPU {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|Any CPU.Build.0 = Release|Any CPU + {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|x64.ActiveCfg = Release|Any CPU + {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|x64.Build.0 = Release|Any CPU + {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|x86.ActiveCfg = Release|Any CPU + {D7D4041C-DCD9-4B7A-B423-0F458DFFF3D6}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj index b662f74..c415308 100644 --- a/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj +++ b/MareSynchronosServer/MareSynchronosServer/MareSynchronosServer.csproj @@ -31,11 +31,11 @@ - + - + diff --git a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj index db6d3b3..c72009c 100644 --- a/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj +++ b/MareSynchronosServer/MareSynchronosServices/MareSynchronosServices.csproj @@ -31,7 +31,7 @@ - + diff --git a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj index f1e1092..b0a3a1c 100644 --- a/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj +++ b/MareSynchronosServer/MareSynchronosShared/MareSynchronosShared.csproj @@ -53,7 +53,7 @@ - + diff --git a/MareSynchronosServer/MareSynchronosShared/Utils/ClientMessage.cs b/MareSynchronosServer/MareSynchronosShared/Utils/ClientMessage.cs index cc7e294..0e2d5af 100644 --- a/MareSynchronosServer/MareSynchronosShared/Utils/ClientMessage.cs +++ b/MareSynchronosServer/MareSynchronosShared/Utils/ClientMessage.cs @@ -1,4 +1,11 @@ using MareSynchronos.API.Data.Enum; namespace MareSynchronosShared.Utils; -public record ClientMessage(MessageSeverity Severity, string Message, string UID); + +public readonly record struct ClientMessage( + MessageSeverity Severity, + string Message, + string Title = "", + int TimeMs = 5000, + string UID = "" +); \ No newline at end of file diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj index b1243f1..29f0f6d 100644 --- a/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj +++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj @@ -31,7 +31,7 @@ - +