2.0.27

CHANGELOG.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [2.0.27] - 2024-09-26
+
+### Added
+
+- Use MS logging for mocks
+
 ## [2.0.26] - 2024-08-20
 
 ### Added

DalaMock.Host/DalaMock.Host.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>12.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.0.26</Version>
+        <Version>2.0.27</Version>
         <PackageProjectUrl>https://github.com/Critical-Impact/DalaMock</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Critical-Impact/DalaMock</RepositoryUrl>
         <Authors>Critical-Impact</Authors>

DalaMock.Sample/DalaMock.Sample.csproj

@@ -7,7 +7,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>12.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.0.26</Version>
+        <Version>2.0.27</Version>
         <PackageProjectUrl>https://github.com/Critical-Impact/DalaMock</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Critical-Impact/DalaMock</RepositoryUrl>
         <Authors>Critical-Impact</Authors>

DalaMock.Shared/DalaMock.Shared.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>12.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.0.26</Version>
+        <Version>2.0.27</Version>
         <PackageProjectUrl>https://github.com/Critical-Impact/DalaMock</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Critical-Impact/DalaMock</RepositoryUrl>
         <Authors>Critical-Impact</Authors>

DalaMock/DalaMock.Core.csproj

@@ -6,7 +6,7 @@
         <Nullable>enable</Nullable>
         <LangVersion>12.0</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <Version>2.0.26</Version>
+        <Version>2.0.27</Version>
         <PackageProjectUrl>https://github.com/Critical-Impact/DalaMock</PackageProjectUrl>
         <RepositoryUrl>https://github.com/Critical-Impact/DalaMock</RepositoryUrl>
         <Authors>Critical-Impact</Authors>

DalaMock/Mocks/MockDalamudPluginInterface.cs

@@ -1,3 +1,5 @@
+using Microsoft.Extensions.Logging;
+
 namespace DalaMock.Core.Mocks;
 
 using System;
@@ -22,7 +24,6 @@ namespace DalaMock.Core.Mocks;
 using Dalamud.Plugin.Ipc;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json;
-using Serilog;
 
 public class MockDalamudPluginInterface : IDalamudPluginInterface, IDisposable
 {
@@ -286,7 +287,7 @@ public void RemoveChatLinkHandler()
     /// <inheritdoc/>
     public T? Create<T>(params object[] scopedObjects) where T : class
     {
-        var logger = this.componentContext.Resolve<ILogger>();
+        var logger = this.componentContext.Resolve<ILogger<T>>();
         var mockServices = this.componentContext.Resolve<IEnumerable<IMockService>>();
         Dictionary<Type, object> mockServicesDict = new();
         foreach (var mockService in mockServices)
@@ -349,7 +350,7 @@ public void RemoveChatLinkHandler()
         if (newInstance == null)
         {
             // If no suitable constructor is found, return null
-            logger.Error($"No suitable constructor found for type '{typeToCreate.FullName}' that can be resolved with the provided mock services.");
+            logger.LogError($"No suitable constructor found for type '{typeToCreate.FullName}' that can be resolved with the provided mock services.");
             return null;
         }
 
@@ -366,7 +367,7 @@ public void RemoveChatLinkHandler()
             }
             else
             {
-                logger.Error($"No matching mock service found for property '{property.Name}' of type '{propertyType.FullName}' in object of type '{newInstance.GetType().FullName}'.");
+                logger.LogError($"No matching mock service found for property '{property.Name}' of type '{propertyType.FullName}' in object of type '{newInstance.GetType().FullName}'.");
             }
         }
 
@@ -414,7 +415,7 @@ public bool Inject(object instance, params object[] scopedObjects)
             }
             else
             {
-                logger.Error($"No matching mock service found for property '{property.Name}' of type '{propertyType.FullName}' in object of type '{instance.GetType().FullName}'.");
+                logger.LogError($"No matching mock service found for property '{property.Name}' of type '{propertyType.FullName}' in object of type '{instance.GetType().FullName}'.");
             }
         }
 

DalaMock/Mocks/MockPluginLog.cs

@@ -4,7 +4,6 @@ namespace DalaMock.Core.Mocks;
 
 using System;
 using Dalamud.Plugin.Services;
-using Serilog;
 using Serilog.Events;
 
 public class MockPluginLog : IPluginLog, IMockService

DalaMock/Plugin/PluginLoader.cs

@@ -23,6 +23,7 @@ public class PluginLoader : IPluginLoader
     private readonly MockContainer mockContainer;
     private readonly MockDalamudConfiguration mockDalamudConfiguration;
     private readonly ILogger<PluginLoader> logger;
+    private readonly ILoggerFactory loggerFactory;
 
     /// <summary>
     /// Has the plugin's state changed, has it started or stopped?
@@ -50,11 +51,12 @@ public class PluginLoader : IPluginLoader
     /// </summary>
     /// <param name="mockContainer">The global DI container.</param>
     /// <param name="logger">The serilog logger.</param>
-    public PluginLoader(MockContainer mockContainer, MockDalamudConfiguration mockDalamudConfiguration, ILogger<PluginLoader> logger)
+    public PluginLoader(MockContainer mockContainer, MockDalamudConfiguration mockDalamudConfiguration, ILogger<PluginLoader> logger, ILoggerFactory loggerFactory)
     {
         this.mockContainer = mockContainer;
         this.mockDalamudConfiguration = mockDalamudConfiguration;
         this.logger = logger;
+        this.loggerFactory = loggerFactory;
         this.loadedPlugins = new Dictionary<Type, MockPlugin>();
     }
 
@@ -96,7 +98,7 @@ public bool StartPlugin(MockPlugin mockPlugin)
     public bool StartPlugin(MockPlugin plugin, PluginLoadSettings pluginLoadSettings)
     {
         var assemblyName = plugin.PluginType.BaseType?.Assembly.GetName().Name ?? plugin.PluginType.Assembly.GetName().Name ?? plugin.PluginType.Name;
-        
+
         if (plugin.IsLoaded)
         {
             this.logger.LogInformation(
@@ -142,6 +144,10 @@ public bool StartPlugin(MockPlugin plugin, PluginLoadSettings pluginLoadSettings
         var uiBuilder = new MockUiBuilder(scene);
         builder.RegisterInstance(uiBuilder);
         builder.RegisterInstance(pluginLoadSettings);
+        builder.RegisterInstance(this.loggerFactory).ExternallyOwned();
+        builder.RegisterGeneric(typeof(Logger<>))
+               .As(typeof(ILogger<>))
+               .SingleInstance();
         builder.RegisterInstance(this);
         builder.Register<MockDalamudPluginInterface>(c =>
             new MockDalamudPluginInterface(

DalaMock/Windows/MockMockWindow.cs

@@ -14,7 +14,7 @@ public MockMockWindow(IEnumerable<IMockWindow> mockWindows)
         : base("Service Mocks")
     {
         this.mockWindows = mockWindows;
-        this.IsOpen = false;
+        this.IsOpen = true;
     }
 
     public override void Draw()
@@ -34,4 +34,4 @@ public override void Draw()
             }
         }
     }
-}
+}