New system for resolving binaries

2017-10-04 21:40:42 -07:00
parent c14b8ed23a
commit d709bf68dd
4 changed files with 71 additions and 8 deletions
--- a/Torch.Server/Program.cs
+++ b/Torch.Server/Program.cs
@@ -44,13 +44,16 @@ namespace Torch.Server
            var binDir = Path.Combine(workingDir, "DedicatedServer64");
            Directory.SetCurrentDirectory(workingDir);

+            if (!TorchLauncher.IsTorchWrapped())
+            {
+                TorchLauncher.Launch(Assembly.GetEntryAssembly().FullName,args,  binDir);
+                return;
+            }
+
            if (!Environment.UserInteractive)
            {
                using (var service = new TorchService())
-                using (new TorchAssemblyResolver(binDir))
-                {
                    ServiceBase.Run(service);
-                }
                return;
            }