feat: Moves logger to a separate assembly for reuse (#2001)

modernuo · Dec 31, 2024 · 9d0d454 · 9d0d454
1 parent 333b408
commit 9d0d454
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 # Distribution Files
+/Distribution/Logger
+/Distribution/Logger.*
 /Distribution/ModernUO
 /Distribution/ModernUO.*
 /Distribution/Server

diff --git 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 → Projects/Logger/ILogger.cs b/Projects/Server/Logging/ILogger.cs → Projects/Logger/ILogger.cs
diff --git a/Projects/Server/Logging/LogFactory.cs → Projects/Logger/LogFactory.cs b/Projects/Server/Logging/LogFactory.cs → Projects/Logger/LogFactory.cs
diff --git a/Projects/Logger/Logger.csproj b/Projects/Logger/Logger.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <RootNamespace>Server</RootNamespace>
+        <AssemblyName>Logger</AssemblyName>
+        <Product>ModernUO Logger</Product>
+        <OutDir>..\..\Distribution\Assemblies</OutDir>
+        <PublishDir>..\..\Distribution\Assemblies</PublishDir>
+        <Configurations>Debug;Release;Analyze</Configurations>
+    </PropertyGroup>
+    <Target Name="CleanPub" AfterTargets="Clean">
+        <Message Text="Application: Removing distribution files..."/>
+        <Delete Files="..\..\Distribution\$(AssemblyName)" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).deps.json" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).dll" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).dll.config" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).pdb" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.dev.json" ContinueOnError="true"/>
+        <Delete Files="..\..\Distribution\$(AssemblyName).runtimeconfig.json" ContinueOnError="true"/>
+    </Target>
+</Project>
diff --git a/Projects/Server/Logging/SerilogLogger.cs → Projects/Logger/SerilogLogger.cs b/Projects/Server/Logging/SerilogLogger.cs → Projects/Logger/SerilogLogger.cs
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
@@ -33,6 +33,7 @@
         <Delete Files="..\..\Distribution\System.IO.Hashing.dll" ContinueOnError="true" />
     </Target>
     <ItemGroup>
+        <ProjectReference Include="..\Logger\Logger.csproj" />
         <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.4.0" />
         <PackageReference Include="LibDeflate.Bindings" Version="1.0.2.120" />
         <PackageReference Include="PollGroup" Version="1.6.1" />

diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj
@@ -34,6 +34,7 @@
         <Delete Files="..\..\Distribution\Assemblies\ModernUO.Serialization.Annotations.dll" ContinueOnError="true" />
     </Target>
     <ItemGroup>
+        <ProjectReference Include="..\Logger\Logger.csproj" />
         <ProjectReference Include="..\Server\Server.csproj" Private="false" PrivateAssets="All" IncludeAssets="None">
             <IncludeInPackage>false</IncludeInPackage>
         </ProjectReference>