2.1.4

Critical-Impact · Nov 18, 2024 · 037868c · 037868c
1 parent 3172291
commit 037868c
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [2.1.4] - 2024-11-18
+
+### Fixed
+
+- Use dalamud Serilog when possible
+
+
 ## [2.1.3] - 2024-11-18
 
 ### Fixed

diff --git a/DalaMock.Host/DalaMock.Host.csproj b/DalaMock.Host/DalaMock.Host.csproj
@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>12.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.1.3</Version>
+        <Version>2.1.4</Version>
         <PackageProjectUrl>https://github.com/Critical-Impact/DalaMock</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Critical-Impact/DalaMock</RepositoryUrl>
         <Authors>Critical-Impact</Authors>
@@ -49,17 +49,29 @@
             <HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
             <Private>True</Private>
         </Reference>
+        <Reference Include="Serilog">
+            <HintPath>$(DalamudLibPath)Serilog.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.Async.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.Async.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.Console.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.Console.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.File.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.File.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.6.24328.4"/>
-        <PackageReference Include="Serilog" Version="4.0.2" />
-        <PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1"/>
-        <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/DalaMock.Sample/DalaMock.Sample.csproj b/DalaMock.Sample/DalaMock.Sample.csproj
@@ -7,7 +7,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>12.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.1.3</Version>
+        <Version>2.1.4</Version>
         <PackageProjectUrl>https://github.com/Critical-Impact/DalaMock</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Critical-Impact/DalaMock</RepositoryUrl>
         <Authors>Critical-Impact</Authors>
@@ -50,6 +50,22 @@
             <HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
             <Private>True</Private>
         </Reference>
+        <Reference Include="Serilog">
+            <HintPath>$(DalamudLibPath)Serilog.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.Async.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.Async.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.Console.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.Console.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.File.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.File.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
     </ItemGroup>
 
     <ItemGroup>
@@ -61,10 +77,6 @@
         <PackageReference Include="Autofac" Version="8.0.0"/>
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0"/>
         <PackageReference Include="System.Collections.Immutable" Version="7.0.0"/>
-        <PackageReference Include="Serilog" Version="4.0.2" />
-        <PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-        <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
             <PrivateAssets>all</PrivateAssets>

diff --git a/DalaMock.Shared/DalaMock.Shared.csproj b/DalaMock.Shared/DalaMock.Shared.csproj
@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>12.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.1.3</Version>
+        <Version>2.1.4</Version>
         <PackageProjectUrl>https://github.com/Critical-Impact/DalaMock</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Critical-Impact/DalaMock</RepositoryUrl>
         <Authors>Critical-Impact</Authors>
@@ -49,13 +49,16 @@
             <HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
             <Private>True</Private>
         </Reference>
+        <Reference Include="Serilog">
+            <HintPath>$(DalamudLibPath)Serilog.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
-        <PackageReference Include="Serilog" Version="4.0.2" />
         <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/DalaMock/DI/MockContainer.cs b/DalaMock/DI/MockContainer.cs
@@ -1,12 +1,16 @@
 using System;
 using System.IO;
 
+using DalaMock.Core.Extensions;
 using DalaMock.Core.Imgui.Auto;
 
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 using NativeFileDialogSharp;
 
+using Serilog.Extensions.Logging;
+
 namespace DalaMock.Core.DI;
 
 using System.Collections.Generic;

diff --git a/DalaMock/DalaMock.Core.csproj b/DalaMock/DalaMock.Core.csproj
@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>12.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.1.3</Version>
+        <Version>2.1.4</Version>
         <PackageProjectUrl>https://github.com/Critical-Impact/DalaMock</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Critical-Impact/DalaMock</RepositoryUrl>
         <Authors>Critical-Impact</Authors>
@@ -41,6 +41,22 @@
             <HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
             <Private>True</Private>
         </Reference>
+        <Reference Include="Serilog">
+            <HintPath>$(DalamudLibPath)Serilog.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.Async.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.Async.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.Console.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.Console.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
+        <Reference Include="Serilog.Sinks.File.dll">
+            <HintPath>$(DalamudLibPath)Serilog.Sinks.File.dll</HintPath>
+            <Private>True</Private>
+        </Reference>
         <Reference Include="ImGui.NET">
             <HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
             <Private>True</Private>
@@ -88,14 +104,11 @@
         <PackageReference Include="NativeFileDialogSharp" Version="0.5.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Serilog" Version="4.0.0" />
         <PackageReference Include="System.Collections.Immutable" Version="7.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="9.0.0-preview.6.24328.4"/>
-        <PackageReference Include="Serilog" Version="4.0.2" />
-        <PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
-        <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
         <PackageReference Include="Veldrid" Version="4.9.0"/>
         <PackageReference Include="Veldrid.SDL2" Version="4.9.0"/>
         <PackageReference Include="Veldrid.StartupUtilities" Version="4.9.0"/>