fix for restart on crash too

Torch.Server/TorchServer.cs

@@ -3,11 +3,10 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Diagnostics.Runtime;
 using NLog;
 using PropertyChanged;
@@ -21,8 +20,6 @@ using Torch.API.Session;
 using Torch.Commands;
 using Torch.Managers.PatchManager;
 using Torch.Mod;
-using Torch.Mod.Messages;
-using Torch.Patches;
 using Torch.Server.Commands;
 using Torch.Server.Managers;
 using Torch.Utils;
@@ -211,7 +208,7 @@ namespace Torch.Server
                 Environment.Exit(0);
 #endif
 
-                var exe = Assembly.GetExecutingAssembly().Location.Replace("dll", "exe");
+                var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
 
                 var args = Environment.GetCommandLineArgs();
 

Torch.Server/UnhandledExceptionHandler.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Threading;
 using NLog;
 using VRage;
@@ -31,7 +32,7 @@ internal class UnhandledExceptionHandler
         {
             Console.WriteLine("Restarting in 5 seconds.");
             Thread.Sleep(5000);
-            var exe = typeof(Program).Assembly.Location;
+            var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
             
             Process.Start(exe, $"-waitForPid {Environment.ProcessId} {_config}");
         }

Torch/Managers/FilesystemManager.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using NLog;
@@ -9,7 +10,7 @@ using Torch.API;
 
 namespace Torch.Managers
 {
-    public class FilesystemManager : Manager
+    public partial class FilesystemManager : Manager
     {
         private static readonly Logger _log = LogManager.GetCurrentClassLogger();
         /// <summary>
@@ -51,19 +52,27 @@ namespace Torch.Managers
             }
         }
 
-        /// <summary>
-        /// Move the given file (if it exists) to a temporary directory that will be cleared the next time the application starts.
-        /// </summary>
         public void SoftDelete(string path, string file)
         {
-            string source = Path.Combine(path, file);
+            var source = Path.Combine(path, file);
             if (!File.Exists(source))
                 return;
-            var rand = Path.GetRandomFileName();
-            var dest = Path.Combine(TempDirectory, rand);
-            File.Move(source, rand);
-            string rsource = Path.Combine(path, rand);
-            File.Move(rsource, dest);
-        }
+            
+            var tempFilePath = Path.Combine(path, file + ".old");
+            if (File.Exists(tempFilePath))
+                File.Delete(tempFilePath);
+
+            var errorCode = Rename(source, tempFilePath);
+            if (Marshal.GetExceptionForHR(errorCode) is { } exception)
+                throw exception;
+        }
+        
+        [LibraryImport("msvcrt", SetLastError = true, EntryPoint = "rename")]
+        [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
+        private static partial int Rename(
+            [MarshalAs(UnmanagedType.LPWStr)]
+            string oldpath,
+            [MarshalAs(UnmanagedType.LPWStr)]
+            string newpath);
     }
 }