Merge branch 'main' into origin_bannerlord

Author: Aragas

src/ArchiveManagement/NexusMods.FileExtractor/IFileExtractorSettings.cs

@@ -24,6 +24,12 @@ public class FileExtractorSettings : IFileExtractorSettings
 {
     // Note: We can't serialize AbsolutePath because it contains more fields than expected. Just hope user sets correct paths and pray for the best.
     private readonly IFileSystem _fileSystem;
+    
+    
+    /// <summary>
+    /// Default constructor for serialization.
+    /// </summary>
+    public FileExtractorSettings() : this(FileSystem.Shared) {}
 
     /// <summary>
     /// Creates a default new instance of <see cref="FileExtractorSettings"/>.

src/NexusMods.App/AppConfig.cs

@@ -90,6 +90,11 @@ public class LoggingSettings : ILoggingSettings
 
     /// <inheritdoc/>
     public int MaxArchivedFiles { get; set; }
+    
+    /// <summary>
+    /// Default constructor for serialization.
+    /// </summary>
+    public LoggingSettings() : this(FileSystem.Shared) {}
 
     /// <summary>
     /// Creates the default logger with logs stored in the entry directory.

src/NexusMods.App/Program.cs

@@ -53,7 +53,7 @@ public static async Task<int> Main(string[] args)
         return 0;
     }
 
-    private static IHost BuildHost()
+    public static IHost BuildHost()
     {
         // I'm not 100% sure how to wire this up to cleanly pass settings
         // to ConfigureLogging; since the DI container isn't built until the host is.
@@ -67,10 +67,9 @@ private static IHost BuildHost()
                 var configJson = File.ReadAllText(appFolder.CombineUnchecked("AppConfig.json").GetFullPath());
 
                 // Note: suppressed because invalid config will throw.
-                // TODO: Fix config serialization and re-add this
-                // config = JsonSerializer.Deserialize<AppConfig>(configJson)!;
-                // config.Sanitize();
-                // services.AddSingleton(config);
+                config = JsonSerializer.Deserialize<AppConfig>(configJson)!;
+                config.Sanitize();
+                services.AddSingleton(config);
                 services.AddApp(new AppConfig()).Validate();
             })
             .ConfigureLogging((_, builder) => AddLogging(builder, config.LoggingSettings))

src/NexusMods.DataModel/IDataModelSettings.cs

@@ -75,6 +75,11 @@ public class DataModelSettings : IDataModelSettings
 
     /// <inheritdoc />
     public long MaxHashingThroughputBytesPerSecond { get; set; } = 0;
+    
+    /// <summary>
+    /// Default constructor for serialization.
+    /// </summary>
+    public DataModelSettings() : this(FileSystem.Shared) { }
 
     /// <summary>
     /// Creates the default datamodel settings with a given base directory.

src/NexusMods.Paths/ConfigurationPath.cs

@@ -81,6 +81,18 @@ public class ConfigurationPathJsonConverter : JsonConverter<ConfigurationPath>
 {
     private readonly IFileSystem _fileSystem;
 
+    /// <summary>
+    /// Default constructor.
+    /// </summary>
+    public ConfigurationPathJsonConverter()
+    {
+        _fileSystem = FileSystem.Shared;
+    }
+    
+    /// <summary>
+    /// DI constructor.
+    /// </summary>
+    /// <param name="fileSystem"></param>
     public ConfigurationPathJsonConverter(IFileSystem fileSystem)
     {
         _fileSystem = fileSystem;

tests/NexusMods.UI.Tests/AppStartupTests.cs

@@ -0,0 +1,14 @@
+using FluentAssertions;
+
+namespace NexusMods.UI.Tests;
+
+public class AppStartupTests
+{
+
+    [Fact]
+    public void CanBuildHost()
+    {
+        var host = App.Program.BuildHost();
+        App.UI.Startup.BuildAvaloniaApp(host.Services).Should().NotBeNull();
+    }
+}