Added support for preprocessor directives #5

Author: Zaczero

SharpLoader/Core/RuntimeCompiler.cs

@@ -1,7 +1,5 @@
 using System;
 using System.CodeDom.Compiler;
-using System.Collections.Generic;
-using System.Diagnostics;
 using Microsoft.CodeDom.Providers.DotNetCompilerPlatform;
 
 namespace SharpLoader.Core

SharpLoader/Core/SourceRandomizer.cs

@@ -193,8 +193,8 @@ private void Encode(ref string str)
                 if (insideString == 0)
                 {
                     // Encode
-                    if (str[i] == '\r' ||
-                        str[i] == '\n' ||
+                    if (//str[i] == '\r' ||
+                        //str[i] == '\n' ||
                         str[i] == '\t')
                     {
                         continue;
@@ -234,7 +234,7 @@ private void Encode(ref string str)
 
             str = resultSb.ToString();
         }
-
+        
         private void Replace(ref string str)
         {
             str = str.Replace("<seed>", _seed.ToString());
@@ -1396,7 +1396,8 @@ private string[] GetCodeBlocks(string str)
             else
             {
                 // Split
-                var lines = str.Split(new[] {';'}, StringSplitOptions.RemoveEmptyEntries);
+                var lines = str.Split(';').Where(rawLine => !string.IsNullOrWhiteSpace(rawLine)).ToArray();
+
                 for (var i = 0; i < lines.Length; i++)
                 {
                     lines[i] += ';';

SharpLoader/Program.cs

@@ -35,7 +35,7 @@ public static class Program
         private const int SW_SHOW = 5;
 
         public const string Author = "Zaczero";
-        public const string Version = "2.1";
+        public const string Version = "2.2";
 
         private const int ReadBufferSize = ushort.MaxValue;
 
@@ -189,7 +189,21 @@ public static void DumpToAppData()
                 }
 
                 // Run the newest file
-                File.Copy(thisPath, exePath, true);
+                retry:
+                try
+                {
+                    File.Copy(thisPath, exePath, true);
+                }
+                catch (Exception)
+                {
+                    if (MessageBox.Show("SharpLoader is already running.", "SharpLoader", MessageBoxButtons.RetryCancel,
+                            MessageBoxIcon.Information) == DialogResult.Retry)
+                    {
+                        goto retry;
+                    }
+                    
+                    Environment.Exit(0);
+                }
 
                 var argsString = string.Empty;
                 foreach (var arg in Environment.GetCommandLineArgs())

SharpLoader/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]

SharpLoader/SelectForm.Designer.cs

@@ -1,12 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace SharpLoader