Merge branch 'MonoTest'

lewisdoesstuff · lewisdoesstuff · commit 5aab18482a20 · 2017-09-09T20:57:56.000+01:00
diff --git a/HooksInjector/ScriptsCompiler.cs b/HooksInjector/ScriptsCompiler.cs
@@ -28,7 +28,8 @@ public ScriptsCompiler(string pluginsDirectory, string managedFolder)
 
         public string CompileScript(string scriptFile)
         {
-            CSharpCodeProvider provider = new CSharpCodeProvider();
+
+			CSharpCodeProvider provider = new CSharpCodeProvider();
 
             string outputPath = "Plugins/" + new FileInfo(scriptFile).Name.Replace(".cs", ".dll");
             CompilerParameters compilerParams = new CompilerParameters
@@ -42,7 +43,7 @@ public string CompileScript(string scriptFile)
 
 			foreach (var file in Directory.GetFiles(_managedFolder))
 			{
-                if (file.EndsWith(".dll") && !file.Contains("msc") && !file.Contains(("System")))
+                if (file.EndsWith(".dll") && !file.Contains("msc"))
 				{
 					compilerParams.ReferencedAssemblies.Add(file);
 					compilerParams.ReferencedAssemblies.Add("System.Core.dll");

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ public ScriptsCompiler(string pluginsDirectory, string managedFolder)`
`28`	`28`
`29`	`29`	`public string CompileScript(string scriptFile)`
`30`	`30`	`{`
`31`		`- CSharpCodeProvider provider = new CSharpCodeProvider();`
	`31`	`+`
	`32`	`+ CSharpCodeProvider provider = new CSharpCodeProvider();`
`32`	`33`
`33`	`34`	`string outputPath = "Plugins/" + new FileInfo(scriptFile).Name.Replace(".cs", ".dll");`
`34`	`35`	`CompilerParameters compilerParams = new CompilerParameters`
`@@ -42,7 +43,7 @@ public string CompileScript(string scriptFile)`
`42`	`43`
`43`	`44`	`foreach (var file in Directory.GetFiles(_managedFolder))`
`44`	`45`	`{`
`45`		`- if (file.EndsWith(".dll") && !file.Contains("msc") && !file.Contains(("System")))`
	`46`	`+ if (file.EndsWith(".dll") && !file.Contains("msc"))`
`46`	`47`	`{`
`47`	`48`	`compilerParams.ReferencedAssemblies.Add(file);`
`48`	`49`	`compilerParams.ReferencedAssemblies.Add("System.Core.dll");`