From c98c296aba0a4bc9621918e591223ea026fcd0d6 Mon Sep 17 00:00:00 2001 From: Leath Cooper Date: Fri, 29 Nov 2024 13:02:18 -0500 Subject: [PATCH 1/4] move logger to a separate assembly for reuse --- ModernUO.sln | 8 ++++++++ .../{Server/Logging => Logger}/ILogger.cs | 0 .../{Server/Logging => Logger}/LogFactory.cs | 0 Projects/Logger/Logger.csproj | 20 +++++++++++++++++++ .../Logging => Logger}/SerilogLogger.cs | 0 Projects/Server/Server.csproj | 1 + Projects/UOContent/UOContent.csproj | 1 + 7 files changed, 30 insertions(+) rename Projects/{Server/Logging => Logger}/ILogger.cs (100%) rename Projects/{Server/Logging => Logger}/LogFactory.cs (100%) create mode 100644 Projects/Logger/Logger.csproj rename Projects/{Server/Logging => Logger}/SerilogLogger.cs (100%) diff --git a/ModernUO.sln b/ModernUO.sln index 779005fbe5..6a43a203af 100644 --- a/ModernUO.sln +++ b/ModernUO.sln @@ -12,6 +12,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UOContent.Tests", "Projects EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application", "Projects\Application\Application.csproj", "{E9849FA1-D4F5-4D68-A36B-249F4CB4E374}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logger", "Projects\Logger\Logger.csproj", "{ECAD3793-A7C5-4546-AA88-77DD24574410}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Analyze|Any CPU = Analyze|Any CPU @@ -49,6 +51,12 @@ Global {E9849FA1-D4F5-4D68-A36B-249F4CB4E374}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9849FA1-D4F5-4D68-A36B-249F4CB4E374}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9849FA1-D4F5-4D68-A36B-249F4CB4E374}.Release|Any CPU.Build.0 = Release|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Analyze|Any CPU.ActiveCfg = Analyze|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Analyze|Any CPU.Build.0 = Analyze|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ECAD3793-A7C5-4546-AA88-77DD24574410}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Projects/Server/Logging/ILogger.cs b/Projects/Logger/ILogger.cs similarity index 100% rename from Projects/Server/Logging/ILogger.cs rename to Projects/Logger/ILogger.cs diff --git a/Projects/Server/Logging/LogFactory.cs b/Projects/Logger/LogFactory.cs similarity index 100% rename from Projects/Server/Logging/LogFactory.cs rename to Projects/Logger/LogFactory.cs diff --git a/Projects/Logger/Logger.csproj b/Projects/Logger/Logger.csproj new file mode 100644 index 0000000000..e94ae59a8e --- /dev/null +++ b/Projects/Logger/Logger.csproj @@ -0,0 +1,20 @@ + + + Server + Logger + ModernUO Logger + ..\..\Distribution\Assemblies + ..\..\Distribution\Assemblies + Debug;Release;Analyze + + + + + + + + + + + + diff --git a/Projects/Server/Logging/SerilogLogger.cs b/Projects/Logger/SerilogLogger.cs similarity index 100% rename from Projects/Server/Logging/SerilogLogger.cs rename to Projects/Logger/SerilogLogger.cs diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj index a47b3fb1a6..e5237aa795 100644 --- a/Projects/Server/Server.csproj +++ b/Projects/Server/Server.csproj @@ -33,6 +33,7 @@ + diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj index 5f07339eb2..61aad84194 100644 --- a/Projects/UOContent/UOContent.csproj +++ b/Projects/UOContent/UOContent.csproj @@ -34,6 +34,7 @@ + false From aa2d7c8b5e31121b6dc74ad50059fa8dd787e816 Mon Sep 17 00:00:00 2001 From: Leath Cooper Date: Fri, 29 Nov 2024 15:05:46 -0500 Subject: [PATCH 2/4] include Migrations folder in Logger project --- Projects/Logger/Logger.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Projects/Logger/Logger.csproj b/Projects/Logger/Logger.csproj index e94ae59a8e..5c9fff512c 100644 --- a/Projects/Logger/Logger.csproj +++ b/Projects/Logger/Logger.csproj @@ -17,4 +17,7 @@ + + + From a947a8b009a4f2a87be236886a563b49e5c8774a Mon Sep 17 00:00:00 2001 From: Leath Cooper Date: Sun, 1 Dec 2024 12:27:16 -0500 Subject: [PATCH 3/4] gitkeep Migrations folder, even though it's empty --- Projects/Logger/Migrations/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Projects/Logger/Migrations/.gitkeep diff --git a/Projects/Logger/Migrations/.gitkeep b/Projects/Logger/Migrations/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 From 673e14c214acf82dcacf62285b72b3bb09f86daa Mon Sep 17 00:00:00 2001 From: Leath Cooper Date: Sun, 1 Dec 2024 12:40:44 -0500 Subject: [PATCH 4/4] I'm not a fan of this CI, Kam --- Projects/Logger/Migrations/{.gitkeep => please-pass-ci} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Projects/Logger/Migrations/{.gitkeep => please-pass-ci} (100%) diff --git a/Projects/Logger/Migrations/.gitkeep b/Projects/Logger/Migrations/please-pass-ci similarity index 100% rename from Projects/Logger/Migrations/.gitkeep rename to Projects/Logger/Migrations/please-pass-ci