update dependencies

add support for some basic game parameters to be set via custom config

Torch.API/ITorchBase.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using Torch.API.Managers;
 using Torch.API.Session;
 using VRage.Game.ModAPI;
@@ -25,6 +26,11 @@ namespace Torch.API
         /// Configuration for the current instance.
         /// </summary>
         ITorchConfig Config { get; }
+        
+        /// <summary>
+        /// Extended Configuration for the current instance.
+        /// </summary>
+        IConfiguration Configuration { get; }
 
         /// <inheritdoc cref="IPluginManager"/>
         [Obsolete]

Torch.API/Managers/IPluginManager.cs

@@ -14,6 +14,9 @@ namespace Torch.API.Managers
         /// <summary>
         /// Fired when plugins are loaded.
         /// </summary>
+        /// <remarks>
+        /// Fired when plugins are loaded and immediately if subscribed after the plugins are loaded.
+        /// </remarks>
         event Action<IReadOnlyCollection<ITorchPlugin>> PluginsLoaded;
 
         /// <summary>

Torch.API/Torch.API.csproj

@@ -17,11 +17,12 @@
   
   <ItemGroup>
     <PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
-    <PackageReference Include="NLog" Version="5.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageReference Include="NuGet.Commands" Version="6.4.0" />
+    <PackageReference Include="NLog" Version="5.2.4" />
-    <PackageReference Include="NuGet.DependencyResolver.Core" Version="6.4.0" />
+    <PackageReference Include="NuGet.Commands" Version="6.7.0" />
+    <PackageReference Include="NuGet.DependencyResolver.Core" Version="6.7.0" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch.API/packages.lock.json

@@ -8,31 +8,42 @@
         "resolved": "0.9.0",
         "contentHash": "xCqODS+wzpUXNtg4bMMvXG5PLbP0iTwRzRn2R+zWHKm83E6tbV2bCagawXp1EnZeNpd5OXpMxehulZWns8efzQ=="
       },
+      "Microsoft.Extensions.Configuration.Binder": {
+        "type": "Direct",
+        "requested": "[7.0.4, )",
+        "resolved": "7.0.4",
+        "contentHash": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
+        }
+      },
       "NLog": {
         "type": "Direct",
-        "requested": "[5.1.0, )",
+        "requested": "[5.2.4, )",
-        "resolved": "5.1.0",
+        "resolved": "5.2.4",
-        "contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ=="
+        "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ=="
       },
       "NuGet.Commands": {
         "type": "Direct",
-        "requested": "[6.4.0, )",
+        "requested": "[6.7.0, )",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "j3ma45boGZADsHpJcu3Y2yq+n2luicC6ezd61TXTTzbOzA452oAPaSsFGUB1stIsuP/DVoqkTzjHXjaCHuJKPQ==",
+        "contentHash": "qRqOvLbnUBpyYwRaV2jxckv9LWeQDoNHRQIY1Tii91mNrpnfHwV9AcsBMfzY76NQji6/5oI5Wmp1rAQOSIROMg==",
         "dependencies": {
-          "NuGet.Credentials": "6.4.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
-          "NuGet.ProjectModel": "6.4.0"
+          "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
+          "NuGet.Credentials": "6.7.0",
+          "NuGet.ProjectModel": "6.7.0"
         }
       },
       "NuGet.DependencyResolver.Core": {
         "type": "Direct",
-        "requested": "[6.4.0, )",
+        "requested": "[6.7.0, )",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "AKomZEKuhQlshujuiHbKvwl2cZNGq3SHsXFbpjCfCjMFMLwwA8saJGQQZp1lzsqQWcQWa6hLOcPtm7T3rd0SVg==",
+        "contentHash": "kNLYj3VBxFNe99vV7qk7VdknGsrUSHIByRbwIhjUTBrxoJzikmOXsjdya/PiFwEhPm9R+u89DfnMmqfAbsPcTA==",
         "dependencies": {
-          "NuGet.Configuration": "6.4.0",
+          "NuGet.Configuration": "6.7.0",
-          "NuGet.LibraryModel": "6.4.0",
+          "NuGet.LibraryModel": "6.7.0",
-          "NuGet.Protocol": "6.4.0"
+          "NuGet.Protocol": "6.7.0"
         }
       },
       "SemanticVersioning": {
@@ -43,9 +54,9 @@
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.202.120, )",
+        "requested": "[1.203.22.3, )",
-        "resolved": "1.202.120",
+        "resolved": "1.203.22.3",
-        "contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
+        "contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }
@@ -64,6 +75,32 @@
         "resolved": "6.0.0",
         "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg=="
       },
+      "Microsoft.Extensions.Configuration.Abstractions": {
+        "type": "Transitive",
+        "resolved": "7.0.0",
+        "contentHash": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "7.0.0"
+        }
+      },
+      "Microsoft.Extensions.FileProviders.Abstractions": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "6.0.0"
+        }
+      },
+      "Microsoft.Extensions.FileSystemGlobbing": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw=="
+      },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "7.0.0",
+        "contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
+      },
       "Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.1",
@@ -71,75 +108,74 @@
       },
       "NuGet.Common": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "srECugLk+LB1bXelDCDhHoi6do/EYTXzuntKhjHraS4roVB3NfWohEdCSiAPdpSV9M40Q6jo6MV2Srml9e+jHQ==",
+        "contentHash": "o3hdvub38qN4UuPWISIvdhM36liEno2o58LRnIrSucZ6+SNv4jc+Cqh/y7BfmQ+UvpqLY19yEc4123rMpp6Edg==",
         "dependencies": {
-          "NuGet.Frameworks": "6.4.0"
+          "NuGet.Frameworks": "6.7.0"
         }
       },
       "NuGet.Configuration": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "vPjauG9AoacEjiZWGIs+d11FCRVmseqAw78FIApfLvZrYMEbbwc9vc0LdC3PpoW5FxYkktyZSiiXVKXGLu+gXw==",
+        "contentHash": "M1ttuwgjCNIEcgjFj3Fh/SZ/CaZY11SpxDOEOgPFUxB24K9JMGnB5BGBMOV8joleNcbwzEEY6WCVwHPYg3bb9A==",
         "dependencies": {
-          "NuGet.Common": "6.4.0",
+          "NuGet.Common": "6.7.0",
           "System.Security.Cryptography.ProtectedData": "4.4.0"
         }
       },
       "NuGet.Credentials": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "tebsxclknVz3D4FrvE2MzVcsOyf6PffjGNQ77X9Yvbj9x5YpVWfumVPetqETcdsNEgiN0bBzfMre33lhrY7Itw==",
+        "contentHash": "q4ewbEg/ocZZFY8X56WwV274uRzsE0ibXiLKCsJww5y0CRLPXxsk4GhIgA13N32zm91COjaeyZrDxf62yDTU4w==",
         "dependencies": {
-          "NuGet.Protocol": "6.4.0"
+          "NuGet.Protocol": "6.7.0"
         }
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "qcufbjJIDtyY/Hah7JJfcRVpRYM3scgPqYBnukjO9kfADCFGr2azvVBozuwzljA6w/cR3w8bXLq6vW5xGrsmHw=="
+        "contentHash": "mTKaTSINpCjMHTNdaPMD/0nfHvWGetG67KzWtDJklnAp9nNwqA+t65G0v8XA/Ve35ipmPRdklxFIl3O55iTgnQ=="
       },
       "NuGet.LibraryModel": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "K6ROQpWr34Aje81G0HfipiznLTB8vD4BO8sF6FEwx1KjJVdFkSmGZPmAhc6L1vZPs8TKY5BqoH72zG13zVzW2w==",
+        "contentHash": "JSRdDUgnjny9kFaOiU/58b1KMB8hzc/9J+SZsrqtWXCeo+MrMohqUx9yLTjIdPqEyYCmWC7kX4Y9lSXufx0bZQ==",
         "dependencies": {
-          "NuGet.Common": "6.4.0",
+          "NuGet.Common": "6.7.0",
-          "NuGet.Versioning": "6.4.0"
+          "NuGet.Versioning": "6.7.0"
         }
       },
       "NuGet.Packaging": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "aR10aYqcUMGC2mwMGH5rls/MGaz3EVH8DKTTHQ/EC91hXNtrCTTAQonaRR+v1EItcoxtQeZ/WQOorv4z270Tgg==",
+        "contentHash": "uDhdZXzW8MLXhloPla/7j8jBWduNhDvY5UC1Dg1z8zJEvkGSj+WAcXKvymDf9UpbyiklWmonlb2hkX02ToJ1yQ==",
         "dependencies": {
           "Newtonsoft.Json": "13.0.1",
-          "NuGet.Configuration": "6.4.0",
+          "NuGet.Configuration": "6.7.0",
-          "NuGet.Versioning": "6.4.0",
+          "NuGet.Versioning": "6.7.0",
-          "System.Security.Cryptography.Cng": "5.0.0",
+          "System.Security.Cryptography.Pkcs": "6.0.4"
-          "System.Security.Cryptography.Pkcs": "5.0.0"
         }
       },
       "NuGet.ProjectModel": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "eW9Q7vPk8cpXDd5b+vtIPkl8dSDCPkPJPrjXPTfZGxhstldnhJrj1XPaonsDZLQ24YY7LrYCzC0BiHh3iO5zUA==",
+        "contentHash": "SnT/0ni+2GoAVY4VsiRvBYOv5E6FpRqY24vVm38rS5Gfq4iQGjxPl7ZZsXGg5Iy2q3kED20DO+x+/yXCRUqswg==",
         "dependencies": {
-          "NuGet.DependencyResolver.Core": "6.4.0"
+          "NuGet.DependencyResolver.Core": "6.7.0"
         }
       },
       "NuGet.Protocol": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "KIPjsWP0P3EMsDsXaa6YBCTvYKur/zI0luS1kO5G37ci8mHs2kJFsuG5qaMhGvgyHASu54sxlic1n1oza2Pcbw==",
+        "contentHash": "CZvnf3n0A1wtGNHAViLtZbtqZ5KXnI/fDe0CE+rphoIYJP91D8ImYQG2eM/Y4aQ1n4pcqebg/XVnSr37qjXoeQ==",
         "dependencies": {
-          "NuGet.Packaging": "6.4.0"
+          "NuGet.Packaging": "6.7.0"
         }
       },
       "NuGet.Versioning": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "YE8p3TpX4jIw+Gb24maE8YRDoqWA4imLmCbdOj5IvslLrZJXQ8akeFOGOplxICNVevON1g1SFYT2+cq4yy0nQQ=="
+        "contentHash": "3sKMpt6btwpv6TKbbpUisT7a9qZoqoAGvHC0lUiqMl9V1oArqXP0DRhlNq7alFynA1HqKOFeRje5kPYkbqFJ/Q=="
       },
       "protobuf-net": {
         "type": "Transitive",
@@ -148,24 +184,15 @@
       },
       "System.Formats.Asn1": {
         "type": "Transitive",
-        "resolved": "5.0.0",
+        "resolved": "6.0.0",
-        "contentHash": "MTvUIktmemNB+El0Fgw9egyqT9AYSIk6DTJeoDSpc3GIHxHCMo8COqkWT1mptX5tZ1SlQ6HJZ0OsSvMth1c12w=="
+        "contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA=="
-      },
-      "System.Security.Cryptography.Cng": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
-        "dependencies": {
-          "System.Formats.Asn1": "5.0.0"
-        }
       },
       "System.Security.Cryptography.Pkcs": {
         "type": "Transitive",
-        "resolved": "5.0.0",
+        "resolved": "6.0.4",
-        "contentHash": "9TPLGjBCGKmNvG8pjwPeuYy0SMVmGZRwlTZvyPHDbYv/DRkoeumJdfumaaDNQzVGMEmbWtg07zUpSW9q70IlDQ==",
+        "contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==",
         "dependencies": {
-          "System.Formats.Asn1": "5.0.0",
+          "System.Formats.Asn1": "6.0.0"
-          "System.Security.Cryptography.Cng": "5.0.0"
         }
       },
       "System.Security.Cryptography.ProtectedData": {

Torch.Server.ReferenceAssemblies.net7.nuspec

@@ -11,7 +11,7 @@
         <repository type="git" url="https://github.com/PveTeam/Torch" />
         <dependencies>
             <group targetFramework="net7.0-windows7.0">
-                <dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.202.120" />
+                <dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.203.22.3" />
                 <dependency id="Torch.Server" version="torchVersion" />
             </group>
         </dependencies>

Torch.Server.Tests/Torch.Server.Tests.csproj

@@ -17,9 +17,9 @@
   </PropertyGroup>
 <!--   <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NLog" Version="5.1.0" />
+    <PackageReference Include="NLog" Version="5.2.4" />
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

Torch.Server/Initializer.cs

@@ -30,9 +30,8 @@ namespace Torch.Server
         private bool _init;
         private const string TOOL_DIR = "tool";
         private const string TOOL_ZIP = "temp.zip";
-        private static readonly string TOOL_EXE = "DepotDownloader.exe";
+        private static readonly string TOOL_EXE = "steamcmd.exe";
-        private const string TOOL_ARGS = "-app 298740 -depot {1} -dir \"{0}\" -manifest {2}";
+        private const string TOOL_ARGS = "+force_install_dir \"{0}\" +login anonymous +app_update 298740 +quit";
-        private static readonly int[] Depots = { 298741, 1004 }; 
         private TorchServer _server;
 
         internal Persistent<TorchConfig> ConfigPersistent { get; }
@@ -85,9 +84,9 @@ namespace Torch.Server
             return true;
         }
 
-        public void Run()
+        public void Run(IConfiguration configuration)
         {
-            _server = new TorchServer(Config, ApplicationContext.Current.InstanceDirectory.FullName, ApplicationContext.Current.InstanceName);
+            _server = new TorchServer(Config, ApplicationContext.Current.InstanceDirectory.FullName, ApplicationContext.Current.InstanceName, configuration);
 
             if (ApplicationContext.Current.IsService || Config.NoGui)
             {
@@ -104,8 +103,8 @@ namespace Torch.Server
                 }
 #endif
                 
-                SpaceEngineersGame.SetupBasicGameInfo();
+                _server.Init();
-                SpaceEngineersGame.SetupPerGameSettings();
+                
                 var uiThread = new Thread(() =>
                 {
                     var ui = new TorchUI(_server);
@@ -118,9 +117,7 @@ namespace Torch.Server
                 
                 uiThread.SetApartmentState(ApartmentState.STA);
                 uiThread.Start();
-                _server.Init();
                 
-
                 if (Config.Autostart || Config.TempAutostart)
                 {
                     Config.TempAutostart = false;
@@ -133,59 +130,51 @@ namespace Torch.Server
         
         public static async Task RunSteamCmdAsync(IConfiguration configuration)
         {
-            var log = LogManager.GetLogger("SteamTool");
+            var log = LogManager.GetLogger("SteamCMD");
-
+            
             var path = configuration.GetValue<string>("steamToolPath") ?? ApplicationContext.Current.TorchDirectory
                 .CreateSubdirectory(TOOL_DIR).FullName;
-            
+
             if (!Directory.Exists(path))
             {
                 Directory.CreateDirectory(path);
             }
-
+            
-            var steamCmdExePath = Path.Combine(path, TOOL_EXE);
+            var toolExe = Path.Combine(path, TOOL_EXE);
-            if (!File.Exists(steamCmdExePath))
+            if (!File.Exists(toolExe))
             {
                 try
                 {
-                    log.Info("Downloading Steam Tool.");
+                    log.Info("Downloading SteamCMD.");
                     using (var client = new HttpClient())
                     await using (var file = File.Create(TOOL_ZIP))
-                    await using (var stream = await client.GetStreamAsync("https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.4.7/depotdownloader-2.4.7.zip"))
+                    await using (var stream = await client.GetStreamAsync("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip"))
                         await stream.CopyToAsync(file);
 
                     ZipFile.ExtractToDirectory(TOOL_ZIP, path);
                     File.Delete(TOOL_ZIP);
-                    log.Info("Steam Tool downloaded successfully!");
+                    log.Info("SteamCMD downloaded successfully!");
                 }
                 catch (Exception e)
                 {
-                    log.Error(e, "Failed to download Steam Tool, unable to update the DS.");
+                    log.Error(e, "Failed to download SteamCMD, unable to update the DS.");
                     return;
                 }
             }
 
             log.Info("Checking for DS updates.");
-            foreach (var depot in Depots)
+            var steamCmdProc = new ProcessStartInfo(toolExe)
             {
-                await DownloadDepot(depot);
+                Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../")),
-            }
+                WorkingDirectory = path,
-
+                RedirectStandardOutput = true
-            async Task DownloadDepot(int depotId)
+            };
-            {
+            var cmd = Process.Start(steamCmdProc)!;
-                var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
-                {
-                    Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../"), depotId, "3111493184861426002"),
-                    WorkingDirectory = path,
-                    RedirectStandardOutput = true
-                };
-                var cmd = Process.Start(steamCmdProc)!;
             
-                while (!cmd.HasExited)
+            while (!cmd.HasExited)
-                {
+            {
-                    if (await cmd.StandardOutput.ReadLineAsync() is { } line)
+                if (await cmd.StandardOutput.ReadLineAsync() is { } line)
-                        log.Info(line);
+                    log.Info(line);
-                }
             }
         }
     }

Torch.Server/Managers/InstanceManager.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.Serialization;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Havok;
 using NLog;
@@ -27,6 +28,7 @@ using VRage.FileSystem;
 using VRage.Game;
 using VRage.Game.ObjectBuilder;
 using VRage.ObjectBuilders;
+using VRage.ObjectBuilders.Private;
 using VRage.Plugins;
 
 namespace Torch.Server.Managers
@@ -34,8 +36,46 @@ namespace Torch.Server.Managers
     public class InstanceManager : Manager, IInstanceManager
     {
         private const string CONFIG_NAME = "SpaceEngineers-Dedicated.cfg";
+        
+        private Action<ConfigDedicatedViewModel> _instanceLoaded;
+
+        /// <summary>
+        /// Gets or sets the instance loaded event.
+        /// </summary>
+        /// <remarks>
+        /// Called when the instance is loaded and immediately if subscribed after the instance is loaded.
+        /// </remarks>
+        public event Action<ConfigDedicatedViewModel> InstanceLoaded
+        {
+            add
+            {
+                var action = _instanceLoaded;
+                Action<ConfigDedicatedViewModel> action2;
+                do
+                {
+                    action2 = action;
+                    var action3 = (Action<ConfigDedicatedViewModel>)Delegate.Combine(action2, value);
+                    action = Interlocked.CompareExchange(ref _instanceLoaded, action3, action2);
+                }
+                while (action != action2);
+
+                if (DedicatedConfig is not null)
+                    value(DedicatedConfig);
+            }
+            remove
+            {
+                var action = _instanceLoaded;
+                Action<ConfigDedicatedViewModel> action2;
+                do
+                {
+                    action2 = action;
+                    var action3 = (Action<ConfigDedicatedViewModel>)Delegate.Remove(action2, value);
+                    action = Interlocked.CompareExchange(ref _instanceLoaded, action3, action2);
+                }
+                while (action != action2);
+            }
+        }
 
-        public event Action<ConfigDedicatedViewModel> InstanceLoaded;
         public ConfigDedicatedViewModel DedicatedConfig { get; set; }
         private static readonly Logger Log = LogManager.GetLogger(nameof(InstanceManager));
         [Dependency]
@@ -102,7 +142,7 @@ namespace Torch.Server.Managers
 
             SelectWorld(DedicatedConfig.LoadWorld ?? DedicatedConfig.Worlds.First().WorldPath, false);
 
-            InstanceLoaded?.Invoke(DedicatedConfig);
+            _instanceLoaded?.Invoke(DedicatedConfig);
         }
 
         public void SelectCreatedWorld(string worldPath)
@@ -324,10 +364,10 @@ namespace Torch.Server.Managers
         public void SaveSandbox()
         {
             using (var f = File.Open(_checkpointPath, FileMode.Create))
-                MyObjectBuilderSerializer.SerializeXML(f, Checkpoint);
+                MyObjectBuilderSerializerKeen.SerializeXML(f, Checkpoint);
 
             using (var f = File.Open(_worldConfigPath, FileMode.Create))
-                MyObjectBuilderSerializer.SerializeXML(f, WorldConfiguration);
+                MyObjectBuilderSerializerKeen.SerializeXML(f, WorldConfiguration);
         }
 
         public void LoadSandbox()

Torch.Server/Program.cs

@@ -39,7 +39,7 @@ namespace Torch.Server
                 context.GameBinariesDirectory.FullName);
 #endif
 
-            initializer.Run();
+            initializer.Run(configuration);
         }
 
         private static void SetupLogging(IApplicationContext context, IConfiguration configuration)

Torch.Server/Torch.Server.csproj

@@ -34,24 +34,23 @@
   <ItemGroup>
     <PackageReference Include="AutoCompleteTextBox" Version="1.6.0" />
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
-    <PackageReference Include="ControlzEx" Version="5.0.2" />
+    <PackageReference Include="ControlzEx" Version="6.0.0" />
-    <PackageReference Include="MahApps.Metro" Version="2.4.9" />
+    <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-    <PackageReference Include="MdXaml" Version="1.16.2" />
+    <PackageReference Include="MdXaml" Version="1.21.0" />
-    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.2.343001" />
+    <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.0.442202" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="7.0.0" />
-    <PackageReference Include="NLog" Version="5.1.0" />
+    <PackageReference Include="NLog" Version="5.2.4" />
-    <PackageReference Include="PropertyChanged.Fody" Version="4.0.3" PrivateAssets="all" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
     <PackageReference Include="Steamworks.NET" Version="20.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Management" Version="7.0.0" />
+    <PackageReference Include="System.Management" Version="7.0.2" />
-    <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.3" />
+    <PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch.Server/TorchServer.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using Microsoft.Diagnostics.Runtime;
+using Microsoft.Extensions.Configuration;
 using NLog;
 using PropertyChanged;
 using Sandbox;
@@ -46,8 +47,9 @@ namespace Torch.Server
 
         //Here to trigger rebuild
         /// <inheritdoc />
-        public TorchServer(ITorchConfig config, string instancePath, string instanceName) : base(config)
+        public TorchServer(ITorchConfig config, string instancePath, string instanceName, IConfiguration configuration) : base(config)
         {
+            Configuration = configuration;
             InstancePath = instancePath;
             InstanceName = instanceName;
             DedicatedInstance = new InstanceManager(this);
@@ -56,7 +58,9 @@ namespace Torch.Server
                 AddManager(new EntityControlManager(this));
             AddManager(new RemoteAPIManager(this));
 
-            
+            var sessionManager = Managers.GetManager<ITorchSessionManager>();
+            sessionManager.AddFactory(_ => new MultiplayerManagerDedicated(this));
+            sessionManager.SessionStateChanged += OnSessionStateChanged;
             
             // Needs to be done at some point after MyVRageWindows.Init
             // where the debug listeners are registered
@@ -65,6 +69,14 @@ namespace Torch.Server
             
             _simUpdateTimer.Elapsed += SimUpdateElapsed;
             _simUpdateTimer.Start();
+
+            Console.CancelKeyPress += (_, _) =>
+            {
+                if (State == ServerState.Running)
+                    Stop();
+                
+                Environment.Exit(0);
+            };
         }
 
         private void SimUpdateElapsed(object sender, System.Timers.ElapsedEventArgs e)
@@ -117,7 +129,38 @@ namespace Torch.Server
         /// <inheritdoc />
         public ServerState State { get; private set; }
 
-        public event Action<ITorchServer> Initialized;
+        private Action<ITorchServer> _initializedEvent;
+
+        public event Action<ITorchServer> Initialized
+        {
+            add
+            {
+                var action = _initializedEvent;
+                Action<ITorchServer> action2;
+                do
+                {
+                    action2 = action;
+                    var action3 = (Action<ITorchServer>)Delegate.Combine(action2, value);
+                    action = Interlocked.CompareExchange(ref _initializedEvent, action3, action2);
+                }
+                while (action != action2);
+
+                if (GetManager<InstanceManager>().DedicatedConfig != null)
+                    value(this); //if already initialized
+            }
+            remove
+            {
+                var action = _initializedEvent;
+                Action<ITorchServer> action2;
+                do
+                {
+                    action2 = action;
+                    var action3 = (Action<ITorchServer>)Delegate.Remove(action2, value);
+                    action = Interlocked.CompareExchange(ref _initializedEvent, action3, action2);
+                }
+                while (action != action2);
+            }
+        }
 
         public int OnlinePlayers { get; private set; }
 
@@ -126,16 +169,14 @@ namespace Torch.Server
         {
             Log.Info("Initializing server");
             base.Init();
-            var sessionManager = Managers.GetManager<ITorchSessionManager>();
-            sessionManager.AddFactory(x => new MultiplayerManagerDedicated(this));
-            sessionManager.SessionStateChanged += OnSessionStateChanged;
-            
             GetManager<InstanceManager>().LoadInstance(InstancePath);
             CanRun = true;
-            Initialized?.Invoke(this);
+            _initializedEvent?.Invoke(this);
             Log.Info($"Initialized server '{InstanceName}' at '{InstancePath}'");
         }
 
+        public override IConfiguration Configuration { get; }
+
         /// <inheritdoc />
         public override void Start()
         {
@@ -206,9 +247,14 @@ namespace Torch.Server
                 StopInternal();
                 LogManager.Flush();
                 
+                if (
 #if DEBUG
-                Environment.Exit(0);
+                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                    true ||
 #endif
+                    ApplicationContext.Current.IsService
+                    )
+                    Environment.Exit(0);
 
                 var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
 

Torch.Server/Views/TorchUI.xaml.cs

@@ -116,7 +116,7 @@ namespace Torch.Server
             if (_server?.State == ServerState.Running)
                 _server.Stop();
 
-            Process.GetCurrentProcess().Kill();
+            Environment.Exit(0);
         }
     }
 }

Torch.Server/packages.lock.json

@@ -19,51 +19,42 @@
       },
       "ControlzEx": {
         "type": "Direct",
-        "requested": "[5.0.2, )",
+        "requested": "[6.0.0, )",
-        "resolved": "5.0.2",
+        "resolved": "6.0.0",
-        "contentHash": "f724LoDJ36LxaLR62G4ek9ZAJI8BiiYRJJ04furC/qjXSeIwU0qmHFIe19xB1/FwxyZjevdFguEr9ZUjf3dZgw==",
+        "contentHash": "MEaqj6ienvKR4E7QJ3vwzo2vrdy2Kqw9Z3CudY5iUixR5iMYeLoMlks7EiABsz4WqDsgVLd9u7fixmCOGU+4ow==",
         "dependencies": {
-          "Microsoft.Xaml.Behaviors.Wpf": "1.1.31",
+          "Microsoft.Xaml.Behaviors.Wpf": "1.1.39",
-          "System.Text.Json": "5.0.1"
+          "System.Text.Json": "5.0.2"
         }
       },
       "MahApps.Metro": {
         "type": "Direct",
-        "requested": "[2.4.9, )",
+        "requested": "[2.4.10, )",
-        "resolved": "2.4.9",
+        "resolved": "2.4.10",
-        "contentHash": "eMTkg6TBnCwHzszw7CP+pxsBeB4ZMsJFiTJJoifUVBysRyEenzzR+TKQJuMvvKK6KzvLxwHmJsFhi9o5p4vxhQ==",
+        "contentHash": "45exHKJCVYaD1/rNr3ekZPECEBM4uHOt6aYp6yNaJbliFMUo+d3z8Gi1xG+qEkbiHKITX+dlz+BW1FOsjAbl/w==",
         "dependencies": {
           "ControlzEx": "[4.4.0, 6.0.0)"
         }
       },
       "MdXaml": {
         "type": "Direct",
-        "requested": "[1.16.2, )",
+        "requested": "[1.21.0, )",
-        "resolved": "1.16.2",
+        "resolved": "1.21.0",
-        "contentHash": "UxYWJaXugQ+v4txS7K8sw26bxS6xvjSW+f79U/oMBtm+cVvZSmBGRZkB77rzaoXAyrbixX0Vk0U+1f22TT2uWg==",
+        "contentHash": "S1aqVD27rif73/KqG52UGZMUqCcCBvOmno8dgivBQQC8IU9TMRX/fdKdxJvWZqYuDE8QTzdxDy377garPiBs3w==",
         "dependencies": {
           "AvalonEdit": "6.0.0",
-          "MdXaml.Plugins": "1.16.2"
+          "MdXaml.Plugins": "1.21.0"
         }
       },
       "Microsoft.Diagnostics.Runtime": {
         "type": "Direct",
-        "requested": "[2.2.343001, )",
+        "requested": "[3.0.442202, )",
-        "resolved": "2.2.343001",
+        "resolved": "3.0.442202",
-        "contentHash": "nVwXLEJiXbnnNkQPcWy64DMWNBvMg9XKWpfBBNMVs1gbEJ9HUVTcAA862mOjgyKryAtvGVKkeQ/9cW6pK8YAiA==",
+        "contentHash": "lLKVmm5EsxtEYuPivwMNsS+EtNqWPO9kPs99kFGeGN/XH3brzrmyoN5YX8Adwcpzom4OUk5AifKn1K3Eo2EGWQ==",
         "dependencies": {
-          "Microsoft.Diagnostics.NETCore.Client": "0.2.251802",
+          "Microsoft.Diagnostics.NETCore.Client": "0.2.410101",
-          "System.Collections.Immutable": "5.0.0",
+          "System.Collections.Immutable": "6.0.0",
-          "System.Runtime.CompilerServices.Unsafe": "5.0.0"
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
-      },
-      "Microsoft.Extensions.Configuration.Binder": {
-        "type": "Direct",
-        "requested": "[7.0.0, )",
-        "resolved": "7.0.0",
-        "contentHash": "tgU4u7bZsoS9MKVRiotVMAwHtbREHr5/5zSEV+JPhg46+ox47Au84E3D2IacAaB0bk5ePNaNieTlPrfjbbRJkg==",
-        "dependencies": {
-          "Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
         }
       },
       "Microsoft.Extensions.Configuration.CommandLine": {
@@ -101,30 +92,30 @@
       },
       "NLog": {
         "type": "Direct",
-        "requested": "[5.1.0, )",
+        "requested": "[5.2.4, )",
-        "resolved": "5.1.0",
+        "resolved": "5.2.4",
-        "contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ=="
+        "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ=="
       },
       "nulastudio.NetCoreBeauty": {
         "type": "Direct",
-        "requested": "[1.2.9.3, )",
+        "requested": "[1.2.9.5, )",
-        "resolved": "1.2.9.3",
+        "resolved": "1.2.9.5",
-        "contentHash": "ToUOoX/sNCg6oeMcSrHYBBRPjKp1gDS7I5WNnY+59t7iNFPcAojpc2lYmgCm3hxwXW/xCxyQIV4k5agegqc3fg=="
+        "contentHash": "0w2QtE3ir6z9J4fZpW1s3/V93dnceUmVm/E1ADhbt0WJ8z1Q3UhYe0Z7rXCy7Pl3y+zRQwERSV9N0aBuGABLjw=="
       },
       "PropertyChanged.Fody": {
         "type": "Direct",
-        "requested": "[4.0.3, )",
+        "requested": "[4.1.0, )",
-        "resolved": "4.0.3",
+        "resolved": "4.1.0",
-        "contentHash": "vRxEDydahhcetswKaoUug7mQywgpZpHoeHZWa7Opb+H+eWPUQo+f+v37Jy+rrG1RVOCkyziTgCkNetXzNlUXJw==",
+        "contentHash": "6v+f9cI8YjnZH2WBHuOqWEAo8DFFNGFIdU8xD3AsL6fhV6Y8oAmVWd7XKk49t8DpeUBwhR/X+97+6Epvek0Y3A==",
         "dependencies": {
-          "Fody": "6.6.3"
+          "Fody": "6.6.4"
         }
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.202.120, )",
+        "requested": "[1.203.22.3, )",
-        "resolved": "1.202.120",
+        "resolved": "1.203.22.3",
-        "contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
+        "contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }
@@ -143,9 +134,9 @@
       },
       "System.Management": {
         "type": "Direct",
-        "requested": "[7.0.0, )",
+        "requested": "[7.0.2, )",
-        "resolved": "7.0.0",
+        "resolved": "7.0.2",
-        "contentHash": "A4jed4QUviDOm7fJNKAJObEAEkEUXmkGL/w0iyCYTzrl1rezTj8LGFHfsVst4Vb9JwFcTpboiDrvdST48avBpw==",
+        "contentHash": "/qEUN91mP/MUQmJnM5y5BdT7ZoPuVrtxnFlbJ8a3kBJGhe2wCzBfnPFtK2wTtEEcf3DMGR9J00GZZfg6HRI6yA==",
         "dependencies": {
           "System.CodeDom": "7.0.0"
         }
@@ -157,15 +148,15 @@
       },
       "Fody": {
         "type": "Transitive",
-        "resolved": "6.6.3",
+        "resolved": "6.6.4",
-        "contentHash": "X1WKKgSNYVtLzdO8dK3YWmfmljA4L0soePcWNouq9X6WbVF4bmivuJdlhTZx/2L3ml6tMvhFe8skIbVQ24PAYA=="
+        "contentHash": "vLZS+oa+ndUHYPlx/8n9bBTT3dHkCF0riml4paKq4D663+cZd47x1uagQo32D/gKFZ/sfmV1oqKaLmH0elxq4A=="
       },
       "HarmonyX": {
         "type": "Transitive",
-        "resolved": "2.10.2-prerelease.4",
+        "resolved": "2.10.2-prerelease.6",
-        "contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
+        "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==",
         "dependencies": {
-          "MonoModReorg.RuntimeDetour": "23.3.22.1"
+          "MonoMod.RuntimeDetour": "25.0.0"
         }
       },
       "JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
@@ -175,8 +166,8 @@
       },
       "MdXaml.Plugins": {
         "type": "Transitive",
-        "resolved": "1.16.2",
+        "resolved": "1.21.0",
-        "contentHash": "EOMENHbLkpRk7+UItuutDuETiJpSCZgBATBRk7WSuxO16NUfzrS39ja4RhIQ0Ax8u0RH1wCAS0VINYPZqxfJeg=="
+        "contentHash": "jP1NEfsFLZPzjmtSsebeNC2hLo01O4fP5q5c+pqEBMxIxIn1gg6FHj2eL47PqxALKtyTbCiNb+Zm6Ra3Um55hA=="
       },
       "Microsoft.Bcl.AsyncInterfaces": {
         "type": "Transitive",
@@ -185,35 +176,32 @@
       },
       "Microsoft.CodeAnalysis.Analyzers": {
         "type": "Transitive",
-        "resolved": "3.3.3",
+        "resolved": "3.3.4",
-        "contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ=="
+        "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g=="
       },
       "Microsoft.CodeAnalysis.Common": {
         "type": "Transitive",
-        "resolved": "4.4.0",
+        "resolved": "4.7.0",
-        "contentHash": "JfHupS/B7Jb5MZoYkFFABn3mux0wQgxi2D8F/rJYZeRBK2ZOyk7TjQ2Kq9rh6W/DCh0KNbbSbn5qoFar+ueHqw==",
+        "contentHash": "pD5S14xMUebSGYe75kt0q/aaS/ftvktSo/pEv7aX7hNPHfdZS+SZeXvkvcffGxWkunYOyRF9m1oN7zzSdYj9dQ==",
         "dependencies": {
-          "Microsoft.CodeAnalysis.Analyzers": "3.3.3",
+          "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "System.Collections.Immutable": "6.0.0",
+          "System.Collections.Immutable": "7.0.0",
-          "System.Memory": "4.5.5",
+          "System.Reflection.Metadata": "7.0.0",
-          "System.Reflection.Metadata": "5.0.0",
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0",
-          "System.Text.Encoding.CodePages": "6.0.0",
-          "System.Threading.Tasks.Extensions": "4.5.4"
         }
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Transitive",
-        "resolved": "4.4.0",
+        "resolved": "4.7.0",
-        "contentHash": "eD2w0xHRoaqK07hjlOKGR9eLNy3nimiGNeCClNax1NDgS/+DBtBqCjXelOa+TNy99kIB3nHhUqDmr46nDXy/RQ==",
+        "contentHash": "JHCP2L6lB0oJ3tQoHkC67SFZxW+KbJVOnAo+6L01K5r/NlBlSUhTk5nUAldWhTVwGdzqNeHqGtnEqpsCmGSwQA==",
         "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "[4.4.0]"
+          "Microsoft.CodeAnalysis.Common": "[4.7.0]"
         }
       },
       "Microsoft.Diagnostics.NETCore.Client": {
         "type": "Transitive",
-        "resolved": "0.2.251802",
+        "resolved": "0.2.410101",
-        "contentHash": "bqnYl6AdSeboeN4v25hSukK6Odm6/54E3Y2B8rBvgqvAW0mF8fo7XNRVE2DMOG7Rk0fiuA079QIH28+V+W1Zdg==",
+        "contentHash": "I4hMjlbPcM5R+M4ThD2Zt1z58M8uZnWkDbFLXHntOOAajajEucrw4XYNSaoi5rgoqksgxQ3g388Vof4QzUNwdQ==",
         "dependencies": {
           "Microsoft.Bcl.AsyncInterfaces": "1.1.0",
           "Microsoft.Extensions.Logging": "2.1.1"
@@ -236,6 +224,14 @@
           "Microsoft.Extensions.Primitives": "7.0.0"
         }
       },
+      "Microsoft.Extensions.Configuration.Binder": {
+        "type": "Transitive",
+        "resolved": "7.0.4",
+        "contentHash": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
+        }
+      },
       "Microsoft.Extensions.Configuration.FileExtensions": {
         "type": "Transitive",
         "resolved": "7.0.0",
@@ -308,58 +304,58 @@
       },
       "Microsoft.Xaml.Behaviors.Wpf": {
         "type": "Transitive",
-        "resolved": "1.1.31",
+        "resolved": "1.1.39",
-        "contentHash": "LZpuf82ACZWldmfMuv3CTUMDh3o0xo0uHUaybR5HgqVLDBJJ9RZLykplQ/bTJd0/VDt3EhD4iDgUgbdIUAM+Kg=="
+        "contentHash": "8PZKqw9QOcu42xk8puY4P1+EXHL9YGOR9b7qhaYx5cILHul456H073tj99vyPcCt0W0781T9RwHqkx507ZyUpQ=="
       },
       "Mono.Cecil": {
         "type": "Transitive",
         "resolved": "0.11.4",
         "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
       },
-      "MonoModReorg.Backports": {
+      "MonoMod.Backports": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "1.0.1",
-        "contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
+        "contentHash": "LWIzLvkkmXlucCWL9gg17WBHhmw9hBpMjiFFBfVKJ4Cova6BLoLqjT+yjZM7RW70ezXJ/ry7zsicvvTV67Hxnw==",
         "dependencies": {
-          "MonoModReorg.ILHelpers": "23.3.22.1"
+          "MonoMod.ILHelpers": "1.0.0"
         }
       },
-      "MonoModReorg.Core": {
+      "MonoMod.Core": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "1.0.1",
-        "contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
+        "contentHash": "VL7d4L+/JU9LR1eXe+Wo2NquCzPExeMorBe23S/7Rn8cydb4Ex+wMpFhnlUfwT9jbLV/TiNbaVGJtR73fBwVCw==",
         "dependencies": {
           "Mono.Cecil": "0.11.4",
-          "MonoModReorg.Backports": "23.3.22.1",
+          "MonoMod.Backports": "1.0.1",
-          "MonoModReorg.ILHelpers": "23.3.22.1",
+          "MonoMod.ILHelpers": "1.0.0",
-          "MonoModReorg.Utils": "23.3.22.1"
+          "MonoMod.Utils": "25.0.3"
         }
       },
-      "MonoModReorg.ILHelpers": {
+      "MonoMod.ILHelpers": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "1.0.0",
-        "contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
+        "contentHash": "dTjGA+dYl7W5yQ0oG/Wr57tsa+ueoFUrwPtz9MZF9iheun4n70u7lge52F8UJi9i0zMHRfS2mAY6+nPuRZHQyQ=="
       },
-      "MonoModReorg.RuntimeDetour": {
+      "MonoMod.RuntimeDetour": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "25.0.2",
-        "contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
+        "contentHash": "7HuQGIMMtu9q0PEnJYl7xztT14TmGSP56B4unBYWuZvPgWCZWX9hGOmTm7zDYhwMsjUQcCTl9iiqOlI1+NHVLg==",
         "dependencies": {
           "Mono.Cecil": "0.11.4",
-          "MonoModReorg.Backports": "23.3.22.1",
+          "MonoMod.Backports": "1.0.1",
-          "MonoModReorg.Core": "23.3.22.1",
+          "MonoMod.Core": "1.0.1",
-          "MonoModReorg.ILHelpers": "23.3.22.1",
+          "MonoMod.ILHelpers": "1.0.0",
-          "MonoModReorg.Utils": "23.3.22.1"
+          "MonoMod.Utils": "25.0.3"
         }
       },
-      "MonoModReorg.Utils": {
+      "MonoMod.Utils": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "25.0.3",
-        "contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
+        "contentHash": "+/lFnYwNB728wnqAzkzCny88Ik++dueJiDAE+mRuMQf8NYHvWhNgLyZQ1VTN4x8iTelQGL1SzaY0I2bBPNNAog==",
         "dependencies": {
           "Mono.Cecil": "0.11.4",
-          "MonoModReorg.Backports": "23.3.22.1",
+          "MonoMod.Backports": "1.0.1",
-          "MonoModReorg.ILHelpers": "23.3.22.1"
+          "MonoMod.ILHelpers": "1.0.0"
         }
       },
       "Newtonsoft.Json": {
@@ -369,107 +365,111 @@
       },
       "NuGet.Commands": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "j3ma45boGZADsHpJcu3Y2yq+n2luicC6ezd61TXTTzbOzA452oAPaSsFGUB1stIsuP/DVoqkTzjHXjaCHuJKPQ==",
+        "contentHash": "qRqOvLbnUBpyYwRaV2jxckv9LWeQDoNHRQIY1Tii91mNrpnfHwV9AcsBMfzY76NQji6/5oI5Wmp1rAQOSIROMg==",
         "dependencies": {
-          "NuGet.Credentials": "6.4.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
-          "NuGet.ProjectModel": "6.4.0"
+          "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
+          "NuGet.Credentials": "6.7.0",
+          "NuGet.ProjectModel": "6.7.0"
         }
       },
       "NuGet.Common": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "srECugLk+LB1bXelDCDhHoi6do/EYTXzuntKhjHraS4roVB3NfWohEdCSiAPdpSV9M40Q6jo6MV2Srml9e+jHQ==",
+        "contentHash": "o3hdvub38qN4UuPWISIvdhM36liEno2o58LRnIrSucZ6+SNv4jc+Cqh/y7BfmQ+UvpqLY19yEc4123rMpp6Edg==",
         "dependencies": {
-          "NuGet.Frameworks": "6.4.0"
+          "NuGet.Frameworks": "6.7.0"
         }
       },
       "NuGet.Configuration": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "vPjauG9AoacEjiZWGIs+d11FCRVmseqAw78FIApfLvZrYMEbbwc9vc0LdC3PpoW5FxYkktyZSiiXVKXGLu+gXw==",
+        "contentHash": "M1ttuwgjCNIEcgjFj3Fh/SZ/CaZY11SpxDOEOgPFUxB24K9JMGnB5BGBMOV8joleNcbwzEEY6WCVwHPYg3bb9A==",
         "dependencies": {
-          "NuGet.Common": "6.4.0",
+          "NuGet.Common": "6.7.0",
           "System.Security.Cryptography.ProtectedData": "4.4.0"
         }
       },
       "NuGet.Credentials": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "tebsxclknVz3D4FrvE2MzVcsOyf6PffjGNQ77X9Yvbj9x5YpVWfumVPetqETcdsNEgiN0bBzfMre33lhrY7Itw==",
+        "contentHash": "q4ewbEg/ocZZFY8X56WwV274uRzsE0ibXiLKCsJww5y0CRLPXxsk4GhIgA13N32zm91COjaeyZrDxf62yDTU4w==",
         "dependencies": {
-          "NuGet.Protocol": "6.4.0"
+          "NuGet.Protocol": "6.7.0"
         }
       },
       "NuGet.DependencyResolver.Core": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "AKomZEKuhQlshujuiHbKvwl2cZNGq3SHsXFbpjCfCjMFMLwwA8saJGQQZp1lzsqQWcQWa6hLOcPtm7T3rd0SVg==",
+        "contentHash": "kNLYj3VBxFNe99vV7qk7VdknGsrUSHIByRbwIhjUTBrxoJzikmOXsjdya/PiFwEhPm9R+u89DfnMmqfAbsPcTA==",
         "dependencies": {
-          "NuGet.Configuration": "6.4.0",
+          "NuGet.Configuration": "6.7.0",
-          "NuGet.LibraryModel": "6.4.0",
+          "NuGet.LibraryModel": "6.7.0",
-          "NuGet.Protocol": "6.4.0"
+          "NuGet.Protocol": "6.7.0"
         }
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "qcufbjJIDtyY/Hah7JJfcRVpRYM3scgPqYBnukjO9kfADCFGr2azvVBozuwzljA6w/cR3w8bXLq6vW5xGrsmHw=="
+        "contentHash": "mTKaTSINpCjMHTNdaPMD/0nfHvWGetG67KzWtDJklnAp9nNwqA+t65G0v8XA/Ve35ipmPRdklxFIl3O55iTgnQ=="
       },
       "NuGet.LibraryModel": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "K6ROQpWr34Aje81G0HfipiznLTB8vD4BO8sF6FEwx1KjJVdFkSmGZPmAhc6L1vZPs8TKY5BqoH72zG13zVzW2w==",
+        "contentHash": "JSRdDUgnjny9kFaOiU/58b1KMB8hzc/9J+SZsrqtWXCeo+MrMohqUx9yLTjIdPqEyYCmWC7kX4Y9lSXufx0bZQ==",
         "dependencies": {
-          "NuGet.Common": "6.4.0",
+          "NuGet.Common": "6.7.0",
-          "NuGet.Versioning": "6.4.0"
+          "NuGet.Versioning": "6.7.0"
         }
       },
       "NuGet.Packaging": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "aR10aYqcUMGC2mwMGH5rls/MGaz3EVH8DKTTHQ/EC91hXNtrCTTAQonaRR+v1EItcoxtQeZ/WQOorv4z270Tgg==",
+        "contentHash": "uDhdZXzW8MLXhloPla/7j8jBWduNhDvY5UC1Dg1z8zJEvkGSj+WAcXKvymDf9UpbyiklWmonlb2hkX02ToJ1yQ==",
         "dependencies": {
           "Newtonsoft.Json": "13.0.1",
-          "NuGet.Configuration": "6.4.0",
+          "NuGet.Configuration": "6.7.0",
-          "NuGet.Versioning": "6.4.0",
+          "NuGet.Versioning": "6.7.0",
-          "System.Security.Cryptography.Cng": "5.0.0",
+          "System.Security.Cryptography.Pkcs": "6.0.4"
-          "System.Security.Cryptography.Pkcs": "5.0.0"
         }
       },
       "NuGet.ProjectModel": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "eW9Q7vPk8cpXDd5b+vtIPkl8dSDCPkPJPrjXPTfZGxhstldnhJrj1XPaonsDZLQ24YY7LrYCzC0BiHh3iO5zUA==",
+        "contentHash": "SnT/0ni+2GoAVY4VsiRvBYOv5E6FpRqY24vVm38rS5Gfq4iQGjxPl7ZZsXGg5Iy2q3kED20DO+x+/yXCRUqswg==",
         "dependencies": {
-          "NuGet.DependencyResolver.Core": "6.4.0"
+          "NuGet.DependencyResolver.Core": "6.7.0"
         }
       },
       "NuGet.Protocol": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "KIPjsWP0P3EMsDsXaa6YBCTvYKur/zI0luS1kO5G37ci8mHs2kJFsuG5qaMhGvgyHASu54sxlic1n1oza2Pcbw==",
+        "contentHash": "CZvnf3n0A1wtGNHAViLtZbtqZ5KXnI/fDe0CE+rphoIYJP91D8ImYQG2eM/Y4aQ1n4pcqebg/XVnSr37qjXoeQ==",
         "dependencies": {
-          "NuGet.Packaging": "6.4.0"
+          "NuGet.Packaging": "6.7.0"
         }
       },
       "NuGet.Versioning": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "YE8p3TpX4jIw+Gb24maE8YRDoqWA4imLmCbdOj5IvslLrZJXQ8akeFOGOplxICNVevON1g1SFYT2+cq4yy0nQQ=="
+        "contentHash": "3sKMpt6btwpv6TKbbpUisT7a9qZoqoAGvHC0lUiqMl9V1oArqXP0DRhlNq7alFynA1HqKOFeRje5kPYkbqFJ/Q=="
       },
       "protobuf-net": {
         "type": "Transitive",
-        "resolved": "3.1.26",
+        "resolved": "3.2.26",
-        "contentHash": "iy+VROYtWZEqDvkUjS6FfzKZNpWRoVGc5h0cupGQT/37Ox0LxPblRKLnw6V0RT1MPclLo8nZp7E2M0f7PNn/Tw==",
+        "contentHash": "zBzBiKs4yP+tzQOsRA5WbI/zayS6eFv8g0KIKNPI7/RUY1nk9Oe+STmtbUYkNUkO3T3SidEoZv+tF1nmgTSutQ==",
         "dependencies": {
-          "protobuf-net.Core": "3.1.26"
+          "protobuf-net.Core": "3.2.26"
         }
       },
       "protobuf-net.Core": {
         "type": "Transitive",
-        "resolved": "3.1.26",
+        "resolved": "3.2.26",
-        "contentHash": "fuKoDWgAf5ju+ixbJoasVFhnUaT0oWUgrWh1AZ5D0Y5keKHpA93vQB5g6aQNtB4zgeQ4hGEeh0MY9bIbAUPgEw=="
+        "contentHash": "s8oJW9dBVxix4p8uqMbeG++DIGjgzOFAKoP2i5wayeeFOKBqG+cCBO2S/CAC4MAFlb5m1Os2m/miLcqRCgqJ7Q==",
+        "dependencies": {
+          "System.Collections.Immutable": "7.0.0"
+        }
       },
       "SemanticVersioning": {
         "type": "Transitive",
@@ -491,11 +491,8 @@
       },
       "System.Collections.Immutable": {
         "type": "Transitive",
-        "resolved": "6.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
+        "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ=="
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
       },
       "System.Formats.Asn1": {
         "type": "Transitive",
@@ -510,29 +507,19 @@
           "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
         }
       },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.5",
-        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
-      },
       "System.Reflection.Metadata": {
         "type": "Transitive",
-        "resolved": "5.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
+        "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
+        "dependencies": {
+          "System.Collections.Immutable": "7.0.0"
+        }
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
         "resolved": "6.0.0",
         "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
       },
-      "System.Security.Cryptography.Cng": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
-        "dependencies": {
-          "System.Formats.Asn1": "5.0.0"
-        }
-      },
       "System.Security.Cryptography.Pkcs": {
         "type": "Transitive",
         "resolved": "7.0.0",
@@ -554,23 +541,10 @@
           "System.Security.Cryptography.Pkcs": "7.0.0"
         }
       },
-      "System.Text.Encoding.CodePages": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==",
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
-      },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "5.0.1",
+        "resolved": "5.0.2",
-        "contentHash": "/UM3UK1dXKl8Ybysg/21gM4S8DJgkR+yLU8JwqCVbuNqQNImelntgYFAN5QxR8sJJ1kMx//hOUdf0lltosi8cQ=="
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ=="
-      },
-      "System.Threading.Tasks.Extensions": {
-        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
       },
       "Torch.SixLabors.ImageSharp": {
         "type": "Transitive",
@@ -584,26 +558,27 @@
       "torch": {
         "type": "Project",
         "dependencies": {
-          "ControlzEx": "[5.0.2, )",
+          "ControlzEx": "[6.0.0, )",
-          "HarmonyX": "[2.10.2-prerelease.4, )",
+          "HarmonyX": "[2.10.2-prerelease.6, )",
-          "MahApps.Metro": "[2.4.9, )",
+          "MahApps.Metro": "[2.4.10, )",
-          "Microsoft.CodeAnalysis.CSharp": "[4.4.0, )",
+          "Microsoft.CodeAnalysis.CSharp": "[4.7.0, )",
-          "Microsoft.CodeAnalysis.Common": "[4.4.0, )",
+          "Microsoft.CodeAnalysis.Common": "[4.7.0, )",
-          "MonoModReorg.RuntimeDetour": "[23.3.22.1, )",
+          "MonoMod.RuntimeDetour": "[25.0.2, )",
-          "NLog": "[5.1.0, )",
+          "NLog": "[5.2.4, )",
           "System.ComponentModel.Annotations": "[5.0.0, )",
           "Torch.API": "[1.0.0, )",
           "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )",
-          "protobuf-net": "[3.1.26, )"
+          "protobuf-net": "[3.2.26, )"
         }
       },
       "torch.api": {
         "type": "Project",
         "dependencies": {
           "JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )",
-          "NLog": "[5.1.0, )",
+          "Microsoft.Extensions.Configuration.Binder": "[7.0.4, )",
-          "NuGet.Commands": "[6.4.0, )",
+          "NLog": "[5.2.4, )",
-          "NuGet.DependencyResolver.Core": "[6.4.0, )",
+          "NuGet.Commands": "[6.7.0, )",
+          "NuGet.DependencyResolver.Core": "[6.7.0, )",
           "SemanticVersioning": "[2.0.2, )",
           "System.Linq.Async": "[6.0.1, )"
         }
@@ -618,21 +593,13 @@
       },
       "System.Management": {
         "type": "Direct",
-        "requested": "[7.0.0, )",
+        "requested": "[7.0.2, )",
-        "resolved": "7.0.0",
+        "resolved": "7.0.2",
-        "contentHash": "A4jed4QUviDOm7fJNKAJObEAEkEUXmkGL/w0iyCYTzrl1rezTj8LGFHfsVst4Vb9JwFcTpboiDrvdST48avBpw==",
+        "contentHash": "/qEUN91mP/MUQmJnM5y5BdT7ZoPuVrtxnFlbJ8a3kBJGhe2wCzBfnPFtK2wTtEEcf3DMGR9J00GZZfg6HRI6yA==",
         "dependencies": {
           "System.CodeDom": "7.0.0"
         }
       },
-      "System.Security.Cryptography.Cng": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
-        "dependencies": {
-          "System.Formats.Asn1": "5.0.0"
-        }
-      },
       "System.Security.Cryptography.Pkcs": {
         "type": "Transitive",
         "resolved": "7.0.0",
@@ -645,14 +612,6 @@
         "type": "Transitive",
         "resolved": "4.4.0",
         "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
-      },
-      "System.Text.Encoding.CodePages": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==",
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
       }
     }
   }

Torch.Tests/Torch.Tests.csproj

@@ -17,9 +17,9 @@
   </PropertyGroup>
 <!--   <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NLog" Version="5.1.0" />
+    <PackageReference Include="NLog" Version="5.2.4" />
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Data.DataSetExtensions" />

Torch/Managers/EntityManager.cs

@@ -27,6 +27,7 @@ using VRage.Game.ModAPI;
 using VRage.Groups;
 using VRage.ModAPI;
 using VRage.ObjectBuilders;
+using VRage.ObjectBuilders.Private;
 using VRage.Sync;
 using VRageMath;
 
@@ -45,14 +46,14 @@ namespace Torch.Managers
         {
             var ob = grid.GetObjectBuilder(true);
             using (var f = File.Open(path, FileMode.CreateNew))
-                MyObjectBuilderSerializer.SerializeXML(f, ob);
+                MyObjectBuilderSerializerKeen.SerializeXML(f, ob);
         }
 
         public void ImportGrid(string path, Vector3D position)
         {
             MyObjectBuilder_EntityBase gridOb;
             using (var f = File.OpenRead(path))
-                MyObjectBuilderSerializer.DeserializeXML(f, out gridOb);
+                MyObjectBuilderSerializerKeen.DeserializeXML(f, out gridOb);
 
             var grid = MyEntities.CreateFromObjectBuilderParallel(gridOb);
             grid.PositionComp.SetPosition(position);

Torch/Managers/ScriptCompilationManager.cs

@@ -82,7 +82,7 @@ public class ScriptCompilationManager : Manager
         TerminationReasonSetter(block, MyProgrammableBlock.ScriptTerminationReason.None);
 
         var component = ScriptComponentGetter(block);
-        component.NextUpdate = UpdateType.None;
+        component.UpdateFrequency = UpdateFrequency.None;
         component.NeedsUpdate = MyEntityUpdateEnum.NONE;
 
         try
@@ -214,7 +214,8 @@ public class ScriptCompilationManager : Manager
         return null;
     }
 
-    private readonly CSharpCompilationOptions _compilationOptions = new(OutputKind.DynamicallyLinkedLibrary);
+    private readonly CSharpCompilationOptions _compilationOptions = new(OutputKind.DynamicallyLinkedLibrary,
+        optimizationLevel: OptimizationLevel.Release, platform: Platform.X64);
     private readonly CSharpParseOptions _parseOptions = new(LanguageVersion.CSharp11, DocumentationMode.None);
     
     private CSharpCompilation CreateCompilation(string assemblyFileName, IEnumerable<Script> scripts)

Torch/Patches/KeenLogPatch.cs

@@ -44,7 +44,7 @@ namespace Torch.Patches
         [ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.WriteLineAndConsole), Parameters = new[] { typeof(string) })]
         private static MethodInfo _logWriteLineAndConsole;
 
-        [ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.Init))]
+        [ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.Init), Parameters = new[] { typeof(string), typeof(StringBuilder), typeof(bool) })]
         private static MethodInfo _logInit;
 
         [ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.Close))]
@@ -78,6 +78,9 @@ namespace Torch.Patches
 
         [ReflectedSetter(Name = "m_enabled")]
         private static Action<MyLog, bool> _enabledSetter = null!;
+        
+        [ReflectedMethod(Type = typeof(MyLog), Name = "LogFlag")]
+        private static Func<MyLog, LoggingOptions, bool> _logFlag = null!;
 
         private static int GetIndentByCurrentThread()
         {
@@ -122,7 +125,7 @@ namespace Torch.Patches
         }
         private static bool PrefixWriteLineOptions(MyLog __instance, string message, LoggingOptions option)
         {
-            if (__instance.LogEnabled && __instance.LogFlag(option) && _log.IsDebugEnabled)
+            if (__instance.LogEnabled && _logFlag(__instance, option) && _log.IsDebugEnabled)
                 _log.Info($"{string.Empty.PadRight(3 * GetIndentByCurrentThread(), ' ')}{message}");
             return false;
         }

Torch/Plugins/PluginManager.cs

@@ -52,8 +52,40 @@ namespace Torch.Managers
         /// <inheritdoc />
         public IReadOnlyDictionary<Guid, ITorchPlugin> Plugins => _plugins.AsReadOnlyObservable();
 
-        public event Action<IReadOnlyCollection<ITorchPlugin>> PluginsLoaded;
+        private Action<IReadOnlyCollection<ITorchPlugin>> _pluginsLoaded;
-        
+        private bool _loaded;
+
+        public event Action<IReadOnlyCollection<ITorchPlugin>> PluginsLoaded
+        {
+            add
+            {
+                var action = _pluginsLoaded;
+                Action<IReadOnlyCollection<ITorchPlugin>> action2;
+                do
+                {
+                    action2 = action;
+                    var action3 = (Action<IReadOnlyCollection<ITorchPlugin>>)Delegate.Combine(action2, value);
+                    action = Interlocked.CompareExchange(ref _pluginsLoaded, action3, action2);
+                }
+                while (action != action2);
+
+                if (_loaded)
+                    value(_plugins.Values.AsReadOnly());
+            }
+            remove
+            {
+                var action = _pluginsLoaded;
+                Action<IReadOnlyCollection<ITorchPlugin>> action2;
+                do
+                {
+                    action2 = action;
+                    var action3 = (Action<IReadOnlyCollection<ITorchPlugin>>)Delegate.Remove(action2, value);
+                    action = Interlocked.CompareExchange(ref _pluginsLoaded, action3, action2);
+                }
+                while (action != action2);
+            }
+        }
+
         public PluginManager(ITorchBase torchInstance) : base(torchInstance)
         {
             if (!Directory.Exists(PluginDir))
@@ -145,7 +177,8 @@ namespace Torch.Managers
                     plugin.Init(Torch);
                 }
                 _log.Info($"Loaded {_plugins.Count} plugins.");
-                PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
+                _loaded = true;
+                _pluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
                 return;
             }
 
@@ -220,7 +253,8 @@ namespace Torch.Managers
                 plugin.Init(Torch);
             }
             _log.Info($"Loaded {_plugins.Count} plugins.");
-            PluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
+            _loaded = true;
+            _pluginsLoaded?.Invoke(_plugins.Values.AsReadOnly());
         }
 
         //debug flag is set when the user asks us to run with a specific plugin for plugin development debug

Torch/Session/TorchSessionManager.cs

@@ -49,8 +49,6 @@ namespace Torch.Session
         public TorchSessionManager(ITorchBase torchInstance) : base(torchInstance)
         {
             _overrideMods = new Dictionary<ulong, MyObjectBuilder_Checkpoint.ModItem>();
-            if (Torch.Config.UgcServiceType == UGCServiceType.Steam)
-                _overrideMods.Add(ModCommunication.MOD_ID, ModItemUtils.Create(ModCommunication.MOD_ID));
         }
 
         /// <inheritdoc/>
@@ -74,7 +72,9 @@ namespace Torch.Session
         {
             if (_overrideMods.ContainsKey(modId))
                 return false;
-            var item = ModItemUtils.Create(modId);
+#pragma warning disable CS0618
+            var item = ModItemUtils.Create(modId, TorchBase.Instance.Config.UgcServiceType.ToString());
+#pragma warning restore CS0618
             _overrideMods.Add(modId, item);
 
             OverrideModsChanged?.Invoke(new CollectionChangeEventArgs(CollectionChangeAction.Add, item));
@@ -193,6 +193,8 @@ namespace Torch.Session
             MySession.AfterLoading += SessionLoaded;
             MySession.OnUnloading += SessionUnloading;
             MySession.OnUnloaded += SessionUnloaded;
+            if (Torch.Config.UgcServiceType == UGCServiceType.Steam)
+                _overrideMods.Add(ModCommunication.MOD_ID, ModItemUtils.Create(ModCommunication.MOD_ID));
         }
 
 

Torch/Torch.csproj

@@ -23,19 +23,19 @@
   <Import Project="..\Torch.Mod\Torch.Mod.projitems" Label="Shared" />
   
   <ItemGroup>
-    <PackageReference Include="ControlzEx" Version="5.0.2" />
+    <PackageReference Include="ControlzEx" Version="6.0.0" />
-    <PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
+    <PackageReference Include="HarmonyX" Version="2.10.2-prerelease.6" />
     <PackageReference Include="InfoOf.Fody" Version="2.1.1" PrivateAssets="all" />
-    <PackageReference Include="MahApps.Metro" Version="2.4.9" />
+    <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
-    <PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.3.22.1" />
+    <PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2" />
-    <PackageReference Include="NLog" Version="5.1.0" />
+    <PackageReference Include="NLog" Version="5.2.4" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
-    <PackageReference Include="protobuf-net" Version="3.1.26" />
+    <PackageReference Include="protobuf-net" Version="3.2.26" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
-    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
+    <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>

Torch/TorchBase.cs

@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Configuration;
 using NLog;
 using Sandbox;
 using Sandbox.Game;
@@ -59,6 +60,8 @@ namespace Torch
         /// <inheritdoc />
         public ITorchConfig Config { get; protected set; }
 
+        public abstract IConfiguration Configuration { get; }
+
         /// <inheritdoc />
         public SemanticVersioning.Version TorchVersion { get; }
         public string InstancePath { get; protected init;}
@@ -113,9 +116,17 @@ namespace Torch
             Plugins = new PluginManager(this);
 #pragma warning restore CS0618
 
+            var sessionManager = new TorchSessionManager(this);
+            sessionManager.AddFactory(_ => Sync.IsServer ? new ChatManagerServer(this) : new ChatManagerClient(this));
+            sessionManager.AddFactory(_ => Sync.IsServer ? new CommandManager(this) : null);
+            sessionManager.AddFactory(_ => new EntityManager(this));
+
+            Managers.AddManager(sessionManager);
             Managers.AddManager(new PatchManager(this));
             Managers.AddManager(new FilesystemManager(this));
-            Managers.AddManager(new UpdateManager(this));
+#if !DEBUG
+            Managers.AddManager(new UpdateManager(this)); 
+#endif
             Managers.AddManager(new EventManager(this));
 #pragma warning disable CS0618
             Managers.AddManager(Plugins);
@@ -280,15 +291,6 @@ namespace Torch
             Game = new VRageGame(this, TweakGameSettings, SteamAppName, SteamAppId, InstancePath, RunArgs);
             if (!Game.WaitFor(VRageGame.GameState.Stopped))
                 Log.Warn("Failed to wait for game to be initialized");
-            
-            var sessionManager = new TorchSessionManager(this);
-            sessionManager.AddFactory((x) => Sync.IsServer ? new ChatManagerServer(this) : new ChatManagerClient(this));
-            sessionManager.AddFactory((x) => Sync.IsServer ? new CommandManager(this) : null);
-            sessionManager.AddFactory((x) => new EntityManager(this));
-
-            Managers.AddManager(sessionManager);
-
-            
             Managers.Attach();
             _init = true;
 
@@ -370,10 +372,10 @@ namespace Torch
         /// <inheritdoc />
         public virtual void Stop()
         {
-            LogManager.Flush();
             Game.SignalStop();
-            if (!Game.WaitFor(VRageGame.GameState.Stopped))
+            if (!Game.WaitFor(VRageGame.GameState.Stopped, TimeSpan.FromSeconds(Config.TickTimeout)))
                 Log.Warn("Failed to wait for the game to be stopped");
+            LogManager.Flush();
         }
 
         /// <inheritdoc />

Torch/VRageGame.cs

@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Havok;
+using Microsoft.Extensions.Configuration;
 using NLog;
 using NLog.Fluent;
 using Sandbox;
@@ -30,6 +31,7 @@ using VRage.Dedicated;
 using VRage.EOS;
 using VRage.FileSystem;
 using VRage.Game;
+using VRage.Game.ModAPI;
 using VRage.Game.ObjectBuilder;
 using VRage.Game.SessionComponents;
 using VRage.GameServices;
@@ -152,7 +154,6 @@ namespace Torch
             Environment.SetEnvironmentVariable("SteamAppId", _appSteamId.ToString());
             MyVRageWindows.Init("SpaceEngineersDedicated", MySandboxGame.Log, null, false);
             SpaceEngineersGame.SetupPerGameSettings();
-            SpaceEngineersGame.SetupBasicGameInfo();
             MySessionComponentExtDebug.ForceDisable = true;
             MyPerGameSettings.SendLogToKeen = false;
             // SpaceEngineersGame.SetupAnalytics();
@@ -169,10 +170,13 @@ namespace Torch
             MyInitializer.InvokeBeforeRun(_appSteamId, _appName, MyVRage.Platform.System.GetRootPath(), _userDataPath);
 
             _log.Info("Loading Dedicated Config");
+            
             // object created in SpaceEngineersGame.SetupPerGameSettings()
             MySandboxGame.ConfigDedicated.Load();
-            MyPlatformGameSettings.CONSOLE_COMPATIBLE = MySandboxGame.ConfigDedicated.ConsoleCompatibility;
+            ApplyConfiguration(MySandboxGame.ConfigDedicated);
             
+            MyPlatformGameSettings.CONSOLE_COMPATIBLE = MySandboxGame.ConfigDedicated.ConsoleCompatibility;
+
             //Type.GetType("VRage.Steam.MySteamService, VRage.Steam").GetProperty("IsActive").GetSetMethod(true).Invoke(service, new object[] {SteamAPI.Init()});
             _log.Info("Initializing network services");
 
@@ -302,6 +306,18 @@ namespace Torch
             MyGlobalTypeMetadata.Static.Init(false);
         }
 
+        private void ApplyConfiguration(IMyConfigDedicated dedicated)
+        {
+            var config = _torch.Configuration.GetSection("DedicatedServer");
+
+            dedicated.ServerPort = config.GetValue("Port", dedicated.ServerPort);
+            dedicated.ConsoleCompatibility = config.GetValue("ConsoleCompatibility", dedicated.ConsoleCompatibility);
+            dedicated.IP = config.GetValue("Ip", dedicated.IP);
+            dedicated.WorldName = config.GetValue("WorldName", dedicated.WorldName);
+            dedicated.ServerName = config.GetValue("ServerName", dedicated.ServerName);
+            dedicated.ServerDescription = config.GetValue("ServerDescription", dedicated.ServerDescription);
+        }
+
         private void Destroy()
         {
             _game.Dispose();

Torch/packages.lock.json

@@ -4,21 +4,21 @@
     "net7.0-windows7.0": {
       "ControlzEx": {
         "type": "Direct",
-        "requested": "[5.0.2, )",
+        "requested": "[6.0.0, )",
-        "resolved": "5.0.2",
+        "resolved": "6.0.0",
-        "contentHash": "f724LoDJ36LxaLR62G4ek9ZAJI8BiiYRJJ04furC/qjXSeIwU0qmHFIe19xB1/FwxyZjevdFguEr9ZUjf3dZgw==",
+        "contentHash": "MEaqj6ienvKR4E7QJ3vwzo2vrdy2Kqw9Z3CudY5iUixR5iMYeLoMlks7EiABsz4WqDsgVLd9u7fixmCOGU+4ow==",
         "dependencies": {
-          "Microsoft.Xaml.Behaviors.Wpf": "1.1.31",
+          "Microsoft.Xaml.Behaviors.Wpf": "1.1.39",
-          "System.Text.Json": "5.0.1"
+          "System.Text.Json": "5.0.2"
         }
       },
       "HarmonyX": {
         "type": "Direct",
-        "requested": "[2.10.2-prerelease.4, )",
+        "requested": "[2.10.2-prerelease.6, )",
-        "resolved": "2.10.2-prerelease.4",
+        "resolved": "2.10.2-prerelease.6",
-        "contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
+        "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==",
         "dependencies": {
-          "MonoModReorg.RuntimeDetour": "23.3.22.1"
+          "MonoMod.RuntimeDetour": "25.0.0"
         }
       },
       "InfoOf.Fody": {
@@ -32,55 +32,52 @@
       },
       "MahApps.Metro": {
         "type": "Direct",
-        "requested": "[2.4.9, )",
+        "requested": "[2.4.10, )",
-        "resolved": "2.4.9",
+        "resolved": "2.4.10",
-        "contentHash": "eMTkg6TBnCwHzszw7CP+pxsBeB4ZMsJFiTJJoifUVBysRyEenzzR+TKQJuMvvKK6KzvLxwHmJsFhi9o5p4vxhQ==",
+        "contentHash": "45exHKJCVYaD1/rNr3ekZPECEBM4uHOt6aYp6yNaJbliFMUo+d3z8Gi1xG+qEkbiHKITX+dlz+BW1FOsjAbl/w==",
         "dependencies": {
           "ControlzEx": "[4.4.0, 6.0.0)"
         }
       },
       "Microsoft.CodeAnalysis.Common": {
         "type": "Direct",
-        "requested": "[4.4.0, )",
+        "requested": "[4.7.0, )",
-        "resolved": "4.4.0",
+        "resolved": "4.7.0",
-        "contentHash": "JfHupS/B7Jb5MZoYkFFABn3mux0wQgxi2D8F/rJYZeRBK2ZOyk7TjQ2Kq9rh6W/DCh0KNbbSbn5qoFar+ueHqw==",
+        "contentHash": "pD5S14xMUebSGYe75kt0q/aaS/ftvktSo/pEv7aX7hNPHfdZS+SZeXvkvcffGxWkunYOyRF9m1oN7zzSdYj9dQ==",
         "dependencies": {
-          "Microsoft.CodeAnalysis.Analyzers": "3.3.3",
+          "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "System.Collections.Immutable": "6.0.0",
+          "System.Collections.Immutable": "7.0.0",
-          "System.Memory": "4.5.5",
+          "System.Reflection.Metadata": "7.0.0",
-          "System.Reflection.Metadata": "5.0.0",
+          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0",
-          "System.Text.Encoding.CodePages": "6.0.0",
-          "System.Threading.Tasks.Extensions": "4.5.4"
         }
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Direct",
-        "requested": "[4.4.0, )",
+        "requested": "[4.7.0, )",
-        "resolved": "4.4.0",
+        "resolved": "4.7.0",
-        "contentHash": "eD2w0xHRoaqK07hjlOKGR9eLNy3nimiGNeCClNax1NDgS/+DBtBqCjXelOa+TNy99kIB3nHhUqDmr46nDXy/RQ==",
+        "contentHash": "JHCP2L6lB0oJ3tQoHkC67SFZxW+KbJVOnAo+6L01K5r/NlBlSUhTk5nUAldWhTVwGdzqNeHqGtnEqpsCmGSwQA==",
         "dependencies": {
-          "Microsoft.CodeAnalysis.Common": "[4.4.0]"
+          "Microsoft.CodeAnalysis.Common": "[4.7.0]"
         }
       },
-      "MonoModReorg.RuntimeDetour": {
+      "MonoMod.RuntimeDetour": {
         "type": "Direct",
-        "requested": "[23.3.22.1, )",
+        "requested": "[25.0.2, )",
-        "resolved": "23.3.22.1",
+        "resolved": "25.0.2",
-        "contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
+        "contentHash": "7HuQGIMMtu9q0PEnJYl7xztT14TmGSP56B4unBYWuZvPgWCZWX9hGOmTm7zDYhwMsjUQcCTl9iiqOlI1+NHVLg==",
         "dependencies": {
           "Mono.Cecil": "0.11.4",
-          "MonoModReorg.Backports": "23.3.22.1",
+          "MonoMod.Backports": "1.0.1",
-          "MonoModReorg.Core": "23.3.22.1",
+          "MonoMod.Core": "1.0.1",
-          "MonoModReorg.ILHelpers": "23.3.22.1",
+          "MonoMod.ILHelpers": "1.0.0",
-          "MonoModReorg.Utils": "23.3.22.1"
+          "MonoMod.Utils": "25.0.3"
         }
       },
       "NLog": {
         "type": "Direct",
-        "requested": "[5.1.0, )",
+        "requested": "[5.2.4, )",
-        "resolved": "5.1.0",
+        "resolved": "5.2.4",
-        "contentHash": "oW7ekrkRG9okpDMUcEglunWj8Qf2RY8qkgl+/chJoavzg3dbT13y32t19R54FKkmq80fKzw4ZekZkCrRGanKgQ=="
+        "contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ=="
       },
       "PropertyChanged.Fody": {
         "type": "Direct",
@@ -93,18 +90,18 @@
       },
       "protobuf-net": {
         "type": "Direct",
-        "requested": "[3.1.26, )",
+        "requested": "[3.2.26, )",
-        "resolved": "3.1.26",
+        "resolved": "3.2.26",
-        "contentHash": "iy+VROYtWZEqDvkUjS6FfzKZNpWRoVGc5h0cupGQT/37Ox0LxPblRKLnw6V0RT1MPclLo8nZp7E2M0f7PNn/Tw==",
+        "contentHash": "zBzBiKs4yP+tzQOsRA5WbI/zayS6eFv8g0KIKNPI7/RUY1nk9Oe+STmtbUYkNUkO3T3SidEoZv+tF1nmgTSutQ==",
         "dependencies": {
-          "protobuf-net.Core": "3.1.26"
+          "protobuf-net.Core": "3.2.26"
         }
       },
       "SpaceEngineersDedicated.ReferenceAssemblies": {
         "type": "Direct",
-        "requested": "[1.202.120, )",
+        "requested": "[1.203.22.3, )",
-        "resolved": "1.202.120",
+        "resolved": "1.203.22.3",
-        "contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
+        "contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
         "dependencies": {
           "protobuf-net": "1.0.0"
         }
@@ -142,51 +139,85 @@
       },
       "Microsoft.CodeAnalysis.Analyzers": {
         "type": "Transitive",
-        "resolved": "3.3.3",
+        "resolved": "3.3.4",
-        "contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ=="
+        "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g=="
+      },
+      "Microsoft.Extensions.Configuration.Abstractions": {
+        "type": "Transitive",
+        "resolved": "7.0.0",
+        "contentHash": "f34u2eaqIjNO9YLHBz8rozVZ+TcFiFs0F3r7nUJd7FRkVSxk8u4OpoK226mi49MwexHOR2ibP9MFvRUaLilcQQ==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "7.0.0"
+        }
+      },
+      "Microsoft.Extensions.Configuration.Binder": {
+        "type": "Transitive",
+        "resolved": "7.0.4",
+        "contentHash": "8+XPvJnHZsYgHOQlcMuQe7QNF5KdVKHH1F/wW3nd8/u81Gk/XFAYMDP0Lpz18h7/AM95M662vvqMorcYxCBB4w==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration.Abstractions": "7.0.0"
+        }
+      },
+      "Microsoft.Extensions.FileProviders.Abstractions": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "0pd4/fho0gC12rQswaGQxbU34jOS1TPS8lZPpkFCH68ppQjHNHYle9iRuHeev1LhrJ94YPvzcRd8UmIuFk23Qw==",
+        "dependencies": {
+          "Microsoft.Extensions.Primitives": "6.0.0"
+        }
+      },
+      "Microsoft.Extensions.FileSystemGlobbing": {
+        "type": "Transitive",
+        "resolved": "6.0.0",
+        "contentHash": "ip8jnL1aPiaPeKINCqaTEbvBFDmVx9dXQEBZ2HOBRXPD1eabGNqP/bKlsIcp7U2lGxiXd5xIhoFcmY8nM4Hdiw=="
+      },
+      "Microsoft.Extensions.Primitives": {
+        "type": "Transitive",
+        "resolved": "7.0.0",
+        "contentHash": "um1KU5kxcRp3CNuI8o/GrZtD4AIOXDk+RLsytjZ9QPok3ttLUelLKpilVPuaFT3TFjOhSibUAso0odbOaCDj3Q=="
       },
       "Microsoft.Xaml.Behaviors.Wpf": {
         "type": "Transitive",
-        "resolved": "1.1.31",
+        "resolved": "1.1.39",
-        "contentHash": "LZpuf82ACZWldmfMuv3CTUMDh3o0xo0uHUaybR5HgqVLDBJJ9RZLykplQ/bTJd0/VDt3EhD4iDgUgbdIUAM+Kg=="
+        "contentHash": "8PZKqw9QOcu42xk8puY4P1+EXHL9YGOR9b7qhaYx5cILHul456H073tj99vyPcCt0W0781T9RwHqkx507ZyUpQ=="
       },
       "Mono.Cecil": {
         "type": "Transitive",
         "resolved": "0.11.4",
         "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
       },
-      "MonoModReorg.Backports": {
+      "MonoMod.Backports": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "1.0.1",
-        "contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
+        "contentHash": "LWIzLvkkmXlucCWL9gg17WBHhmw9hBpMjiFFBfVKJ4Cova6BLoLqjT+yjZM7RW70ezXJ/ry7zsicvvTV67Hxnw==",
         "dependencies": {
-          "MonoModReorg.ILHelpers": "23.3.22.1"
+          "MonoMod.ILHelpers": "1.0.0"
         }
       },
-      "MonoModReorg.Core": {
+      "MonoMod.Core": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "1.0.1",
-        "contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
+        "contentHash": "VL7d4L+/JU9LR1eXe+Wo2NquCzPExeMorBe23S/7Rn8cydb4Ex+wMpFhnlUfwT9jbLV/TiNbaVGJtR73fBwVCw==",
         "dependencies": {
           "Mono.Cecil": "0.11.4",
-          "MonoModReorg.Backports": "23.3.22.1",
+          "MonoMod.Backports": "1.0.1",
-          "MonoModReorg.ILHelpers": "23.3.22.1",
+          "MonoMod.ILHelpers": "1.0.0",
-          "MonoModReorg.Utils": "23.3.22.1"
+          "MonoMod.Utils": "25.0.3"
         }
       },
-      "MonoModReorg.ILHelpers": {
+      "MonoMod.ILHelpers": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "1.0.0",
-        "contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
+        "contentHash": "dTjGA+dYl7W5yQ0oG/Wr57tsa+ueoFUrwPtz9MZF9iheun4n70u7lge52F8UJi9i0zMHRfS2mAY6+nPuRZHQyQ=="
       },
-      "MonoModReorg.Utils": {
+      "MonoMod.Utils": {
         "type": "Transitive",
-        "resolved": "23.3.22.1",
+        "resolved": "25.0.3",
-        "contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
+        "contentHash": "+/lFnYwNB728wnqAzkzCny88Ik++dueJiDAE+mRuMQf8NYHvWhNgLyZQ1VTN4x8iTelQGL1SzaY0I2bBPNNAog==",
         "dependencies": {
           "Mono.Cecil": "0.11.4",
-          "MonoModReorg.Backports": "23.3.22.1",
+          "MonoMod.Backports": "1.0.1",
-          "MonoModReorg.ILHelpers": "23.3.22.1"
+          "MonoMod.ILHelpers": "1.0.0"
         }
       },
       "Newtonsoft.Json": {
@@ -196,99 +227,103 @@
       },
       "NuGet.Commands": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "j3ma45boGZADsHpJcu3Y2yq+n2luicC6ezd61TXTTzbOzA452oAPaSsFGUB1stIsuP/DVoqkTzjHXjaCHuJKPQ==",
+        "contentHash": "qRqOvLbnUBpyYwRaV2jxckv9LWeQDoNHRQIY1Tii91mNrpnfHwV9AcsBMfzY76NQji6/5oI5Wmp1rAQOSIROMg==",
         "dependencies": {
-          "NuGet.Credentials": "6.4.0",
+          "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
-          "NuGet.ProjectModel": "6.4.0"
+          "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
+          "NuGet.Credentials": "6.7.0",
+          "NuGet.ProjectModel": "6.7.0"
         }
       },
       "NuGet.Common": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "srECugLk+LB1bXelDCDhHoi6do/EYTXzuntKhjHraS4roVB3NfWohEdCSiAPdpSV9M40Q6jo6MV2Srml9e+jHQ==",
+        "contentHash": "o3hdvub38qN4UuPWISIvdhM36liEno2o58LRnIrSucZ6+SNv4jc+Cqh/y7BfmQ+UvpqLY19yEc4123rMpp6Edg==",
         "dependencies": {
-          "NuGet.Frameworks": "6.4.0"
+          "NuGet.Frameworks": "6.7.0"
         }
       },
       "NuGet.Configuration": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "vPjauG9AoacEjiZWGIs+d11FCRVmseqAw78FIApfLvZrYMEbbwc9vc0LdC3PpoW5FxYkktyZSiiXVKXGLu+gXw==",
+        "contentHash": "M1ttuwgjCNIEcgjFj3Fh/SZ/CaZY11SpxDOEOgPFUxB24K9JMGnB5BGBMOV8joleNcbwzEEY6WCVwHPYg3bb9A==",
         "dependencies": {
-          "NuGet.Common": "6.4.0",
+          "NuGet.Common": "6.7.0",
           "System.Security.Cryptography.ProtectedData": "4.4.0"
         }
       },
       "NuGet.Credentials": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "tebsxclknVz3D4FrvE2MzVcsOyf6PffjGNQ77X9Yvbj9x5YpVWfumVPetqETcdsNEgiN0bBzfMre33lhrY7Itw==",
+        "contentHash": "q4ewbEg/ocZZFY8X56WwV274uRzsE0ibXiLKCsJww5y0CRLPXxsk4GhIgA13N32zm91COjaeyZrDxf62yDTU4w==",
         "dependencies": {
-          "NuGet.Protocol": "6.4.0"
+          "NuGet.Protocol": "6.7.0"
         }
       },
       "NuGet.DependencyResolver.Core": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "AKomZEKuhQlshujuiHbKvwl2cZNGq3SHsXFbpjCfCjMFMLwwA8saJGQQZp1lzsqQWcQWa6hLOcPtm7T3rd0SVg==",
+        "contentHash": "kNLYj3VBxFNe99vV7qk7VdknGsrUSHIByRbwIhjUTBrxoJzikmOXsjdya/PiFwEhPm9R+u89DfnMmqfAbsPcTA==",
         "dependencies": {
-          "NuGet.Configuration": "6.4.0",
+          "NuGet.Configuration": "6.7.0",
-          "NuGet.LibraryModel": "6.4.0",
+          "NuGet.LibraryModel": "6.7.0",
-          "NuGet.Protocol": "6.4.0"
+          "NuGet.Protocol": "6.7.0"
         }
       },
       "NuGet.Frameworks": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "qcufbjJIDtyY/Hah7JJfcRVpRYM3scgPqYBnukjO9kfADCFGr2azvVBozuwzljA6w/cR3w8bXLq6vW5xGrsmHw=="
+        "contentHash": "mTKaTSINpCjMHTNdaPMD/0nfHvWGetG67KzWtDJklnAp9nNwqA+t65G0v8XA/Ve35ipmPRdklxFIl3O55iTgnQ=="
       },
       "NuGet.LibraryModel": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "K6ROQpWr34Aje81G0HfipiznLTB8vD4BO8sF6FEwx1KjJVdFkSmGZPmAhc6L1vZPs8TKY5BqoH72zG13zVzW2w==",
+        "contentHash": "JSRdDUgnjny9kFaOiU/58b1KMB8hzc/9J+SZsrqtWXCeo+MrMohqUx9yLTjIdPqEyYCmWC7kX4Y9lSXufx0bZQ==",
         "dependencies": {
-          "NuGet.Common": "6.4.0",
+          "NuGet.Common": "6.7.0",
-          "NuGet.Versioning": "6.4.0"
+          "NuGet.Versioning": "6.7.0"
         }
       },
       "NuGet.Packaging": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "aR10aYqcUMGC2mwMGH5rls/MGaz3EVH8DKTTHQ/EC91hXNtrCTTAQonaRR+v1EItcoxtQeZ/WQOorv4z270Tgg==",
+        "contentHash": "uDhdZXzW8MLXhloPla/7j8jBWduNhDvY5UC1Dg1z8zJEvkGSj+WAcXKvymDf9UpbyiklWmonlb2hkX02ToJ1yQ==",
         "dependencies": {
           "Newtonsoft.Json": "13.0.1",
-          "NuGet.Configuration": "6.4.0",
+          "NuGet.Configuration": "6.7.0",
-          "NuGet.Versioning": "6.4.0",
+          "NuGet.Versioning": "6.7.0",
-          "System.Security.Cryptography.Cng": "5.0.0",
+          "System.Security.Cryptography.Pkcs": "6.0.4"
-          "System.Security.Cryptography.Pkcs": "5.0.0"
         }
       },
       "NuGet.ProjectModel": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "eW9Q7vPk8cpXDd5b+vtIPkl8dSDCPkPJPrjXPTfZGxhstldnhJrj1XPaonsDZLQ24YY7LrYCzC0BiHh3iO5zUA==",
+        "contentHash": "SnT/0ni+2GoAVY4VsiRvBYOv5E6FpRqY24vVm38rS5Gfq4iQGjxPl7ZZsXGg5Iy2q3kED20DO+x+/yXCRUqswg==",
         "dependencies": {
-          "NuGet.DependencyResolver.Core": "6.4.0"
+          "NuGet.DependencyResolver.Core": "6.7.0"
         }
       },
       "NuGet.Protocol": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "KIPjsWP0P3EMsDsXaa6YBCTvYKur/zI0luS1kO5G37ci8mHs2kJFsuG5qaMhGvgyHASu54sxlic1n1oza2Pcbw==",
+        "contentHash": "CZvnf3n0A1wtGNHAViLtZbtqZ5KXnI/fDe0CE+rphoIYJP91D8ImYQG2eM/Y4aQ1n4pcqebg/XVnSr37qjXoeQ==",
         "dependencies": {
-          "NuGet.Packaging": "6.4.0"
+          "NuGet.Packaging": "6.7.0"
         }
       },
       "NuGet.Versioning": {
         "type": "Transitive",
-        "resolved": "6.4.0",
+        "resolved": "6.7.0",
-        "contentHash": "YE8p3TpX4jIw+Gb24maE8YRDoqWA4imLmCbdOj5IvslLrZJXQ8akeFOGOplxICNVevON1g1SFYT2+cq4yy0nQQ=="
+        "contentHash": "3sKMpt6btwpv6TKbbpUisT7a9qZoqoAGvHC0lUiqMl9V1oArqXP0DRhlNq7alFynA1HqKOFeRje5kPYkbqFJ/Q=="
       },
       "protobuf-net.Core": {
         "type": "Transitive",
-        "resolved": "3.1.26",
+        "resolved": "3.2.26",
-        "contentHash": "fuKoDWgAf5ju+ixbJoasVFhnUaT0oWUgrWh1AZ5D0Y5keKHpA93vQB5g6aQNtB4zgeQ4hGEeh0MY9bIbAUPgEw=="
+        "contentHash": "s8oJW9dBVxix4p8uqMbeG++DIGjgzOFAKoP2i5wayeeFOKBqG+cCBO2S/CAC4MAFlb5m1Os2m/miLcqRCgqJ7Q==",
+        "dependencies": {
+          "System.Collections.Immutable": "7.0.0"
+        }
       },
       "SemanticVersioning": {
         "type": "Transitive",
@@ -305,16 +340,13 @@
       },
       "System.Collections.Immutable": {
         "type": "Transitive",
-        "resolved": "6.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==",
+        "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ=="
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
       },
       "System.Formats.Asn1": {
         "type": "Transitive",
-        "resolved": "5.0.0",
+        "resolved": "6.0.0",
-        "contentHash": "MTvUIktmemNB+El0Fgw9egyqT9AYSIk6DTJeoDSpc3GIHxHCMo8COqkWT1mptX5tZ1SlQ6HJZ0OsSvMth1c12w=="
+        "contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA=="
       },
       "System.Linq.Async": {
         "type": "Transitive",
@@ -324,36 +356,25 @@
           "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
         }
       },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.5",
-        "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
-      },
       "System.Reflection.Metadata": {
         "type": "Transitive",
-        "resolved": "5.0.0",
+        "resolved": "7.0.0",
-        "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
+        "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
+        "dependencies": {
+          "System.Collections.Immutable": "7.0.0"
+        }
       },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
         "resolved": "6.0.0",
         "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
       },
-      "System.Security.Cryptography.Cng": {
-        "type": "Transitive",
-        "resolved": "5.0.0",
-        "contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
-        "dependencies": {
-          "System.Formats.Asn1": "5.0.0"
-        }
-      },
       "System.Security.Cryptography.Pkcs": {
         "type": "Transitive",
-        "resolved": "5.0.0",
+        "resolved": "6.0.4",
-        "contentHash": "9TPLGjBCGKmNvG8pjwPeuYy0SMVmGZRwlTZvyPHDbYv/DRkoeumJdfumaaDNQzVGMEmbWtg07zUpSW9q70IlDQ==",
+        "contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==",
         "dependencies": {
-          "System.Formats.Asn1": "5.0.0",
+          "System.Formats.Asn1": "6.0.0"
-          "System.Security.Cryptography.Cng": "5.0.0"
         }
       },
       "System.Security.Cryptography.ProtectedData": {
@@ -361,31 +382,19 @@
         "resolved": "4.4.0",
         "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
       },
-      "System.Text.Encoding.CodePages": {
-        "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==",
-        "dependencies": {
-          "System.Runtime.CompilerServices.Unsafe": "6.0.0"
-        }
-      },
       "System.Text.Json": {
         "type": "Transitive",
-        "resolved": "5.0.1",
+        "resolved": "5.0.2",
-        "contentHash": "/UM3UK1dXKl8Ybysg/21gM4S8DJgkR+yLU8JwqCVbuNqQNImelntgYFAN5QxR8sJJ1kMx//hOUdf0lltosi8cQ=="
+        "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ=="
-      },
-      "System.Threading.Tasks.Extensions": {
-        "type": "Transitive",
-        "resolved": "4.5.4",
-        "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
       },
       "torch.api": {
         "type": "Project",
         "dependencies": {
           "JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )",
-          "NLog": "[5.1.0, )",
+          "Microsoft.Extensions.Configuration.Binder": "[7.0.4, )",
-          "NuGet.Commands": "[6.4.0, )",
+          "NLog": "[5.2.4, )",
-          "NuGet.DependencyResolver.Core": "[6.4.0, )",
+          "NuGet.Commands": "[6.7.0, )",
+          "NuGet.DependencyResolver.Core": "[6.7.0, )",
           "SemanticVersioning": "[2.0.2, )",
           "System.Linq.Async": "[6.0.1, )"
         }