Merge branch 'MonoTest'

HookAttribute/obj/Release/HookAttribute.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-d8ecb5d4a0d3442744a3508f47ae82529b9d83b5
+6f051f3773f28dd737e06e6fa081d55ae6f23112

HookAttribute/obj/Release/HookAttribute.csproj.FileListAbsolute.txt

@@ -1,11 +1,17 @@
-/home/dbk/Documents/BPGame/bpgameserver_Data/Managed/HookAttribute.dll
-/home/dbk/Documents/BPGame/bpgameserver_Data/Managed/HookAttribute.pdb
-/home/dbk/Documents/UnityHooks/HookAttribute/obj/Release/HookAttribute.csprojResolveAssemblyReference.cache
-/home/dbk/Documents/UnityHooks/HookAttribute/obj/Release/HookAttribute.csproj.CoreCompileInputs.cache
-/home/dbk/Documents/UnityHooks/HookAttribute/obj/Release/HookAttribute.dll
-/home/dbk/Documents/UnityHooks/HookAttribute/obj/Release/HookAttribute.pdb
-F:\BPGame\bpgameserver_Data\Managed\HookAttribute.dll
-F:\BPGame\bpgameserver_Data\Managed\HookAttribute.pdb
-F:\UnityHooks\HookAttribute\obj\Release\HookAttribute.csprojResolveAssemblyReference.cache
-F:\UnityHooks\HookAttribute\obj\Release\HookAttribute.dll
-F:\UnityHooks\HookAttribute\obj\Release\HookAttribute.pdb
+/home/dbk/Documents/BPGame/bpgameserver_Data/Managed/HookAttribute.dll
+/home/dbk/Documents/BPGame/bpgameserver_Data/Managed/HookAttribute.pdb
+/home/dbk/Documents/UnityHooks/HookAttribute/obj/Release/HookAttribute.csprojResolveAssemblyReference.cache
+/home/dbk/Documents/UnityHooks/HookAttribute/obj/Release/HookAttribute.csproj.CoreCompileInputs.cache
+/home/dbk/Documents/UnityHooks/HookAttribute/obj/Release/HookAttribute.dll
+/home/dbk/Documents/UnityHooks/HookAttribute/obj/Release/HookAttribute.pdb
+F:/BPGame/bpgameserver_Data/Managed/HookAttribute.dll
+F:/BPGame/bpgameserver_Data/Managed/HookAttribute.pdb
+F:/UnityHooks/HookAttribute/obj/Release/HookAttribute.csprojResolveAssemblyReference.cache
+F:/UnityHooks/HookAttribute/obj/Release/HookAttribute.dll
+F:/UnityHooks/HookAttribute/obj/Release/HookAttribute.pdb
+/home/dbk/Documents/Git/UniversalUnityHooks/Output/HookAttribute.dll
+/home/dbk/Documents/Git/UniversalUnityHooks/Output/HookAttribute.pdb
+/home/dbk/Documents/Git/UniversalUnityHooks/HookAttribute/obj/Release/HookAttribute.csprojResolveAssemblyReference.cache
+/home/dbk/Documents/Git/UniversalUnityHooks/HookAttribute/obj/Release/HookAttribute.csproj.CoreCompileInputs.cache
+/home/dbk/Documents/Git/UniversalUnityHooks/HookAttribute/obj/Release/HookAttribute.dll
+/home/dbk/Documents/Git/UniversalUnityHooks/HookAttribute/obj/Release/HookAttribute.pdb

HooksInjector/ScriptsCompiler.cs

@@ -45,6 +45,8 @@ public string CompileScript(string scriptFile)
                 if (file.EndsWith(".dll") && !file.Contains("msc") && !file.Contains(("System")))
 				{
 					compilerParams.ReferencedAssemblies.Add(file);
+					compilerParams.ReferencedAssemblies.Add("System.Core.dll");
+
 				}
 			}
 

HooksInjector/obj/Release/HooksInjector.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-cd9ff965a801c6d2016791a7277c1bd703ebd3c1
+c3d5ac8fed8be022c3e32cc07c05feb778703222

HooksInjector/obj/Release/HooksInjector.csproj.FileListAbsolute.txt

@@ -1,14 +1,22 @@
-/home/dbk/Documents/BPGame/HooksInjector.exe.config
-/home/dbk/Documents/BPGame/HooksInjector.exe
-/home/dbk/Documents/BPGame/HooksInjector.pdb
-/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.csprojResolveAssemblyReference.cache
-/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.csproj.HooksInjector.exe.config
-/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.csproj.CoreCompileInputs.cache
-/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.exe
-/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.pdb
-F:\BPGame\HooksInjector.exe.config
-F:\BPGame\HooksInjector.exe
-F:\BPGame\HooksInjector.pdb
-F:\UnityHooks\HooksInjector\obj\Release\HooksInjector.csprojResolveAssemblyReference.cache
-F:\UnityHooks\HooksInjector\obj\Release\HooksInjector.exe
-F:\UnityHooks\HooksInjector\obj\Release\HooksInjector.pdb
+/home/dbk/Documents/BPGame/HooksInjector.exe.config
+/home/dbk/Documents/BPGame/HooksInjector.exe
+/home/dbk/Documents/BPGame/HooksInjector.pdb
+/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.csprojResolveAssemblyReference.cache
+/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.csproj.HooksInjector.exe.config
+/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.csproj.CoreCompileInputs.cache
+/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.exe
+/home/dbk/Documents/UnityHooks/HooksInjector/obj/Release/HooksInjector.pdb
+F:/BPGame/HooksInjector.exe.config
+F:/BPGame/HooksInjector.exe
+F:/BPGame/HooksInjector.pdb
+F:/UnityHooks/HooksInjector/obj/Release/HooksInjector.csprojResolveAssemblyReference.cache
+F:/UnityHooks/HooksInjector/obj/Release/HooksInjector.exe
+F:/UnityHooks/HooksInjector/obj/Release/HooksInjector.pdb
+/home/dbk/Documents/Git/UniversalUnityHooks/Output/HooksInjector.exe.config
+/home/dbk/Documents/Git/UniversalUnityHooks/Output/HooksInjector.exe
+/home/dbk/Documents/Git/UniversalUnityHooks/Output/HooksInjector.pdb
+/home/dbk/Documents/Git/UniversalUnityHooks/HooksInjector/obj/Release/HooksInjector.csprojResolveAssemblyReference.cache
+/home/dbk/Documents/Git/UniversalUnityHooks/HooksInjector/obj/Release/HooksInjector.csproj.HooksInjector.exe.config
+/home/dbk/Documents/Git/UniversalUnityHooks/HooksInjector/obj/Release/HooksInjector.csproj.CoreCompileInputs.cache
+/home/dbk/Documents/Git/UniversalUnityHooks/HooksInjector/obj/Release/HooksInjector.exe
+/home/dbk/Documents/Git/UniversalUnityHooks/HooksInjector/obj/Release/HooksInjector.pdb

Output/HooksInjector.exe.config

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Core" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="mscorlib" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

UnityHooks.userprefs

@@ -1,32 +1,12 @@
-<Properties StartupConfiguration="{E08F5A15-3083-434E-89FF-900BE91D68B5}|Default">
-  <MonoDevelop.Ide.Workbench ActiveDocument="ConsoleMonitor/Program.cs">
+<Properties StartupConfiguration="{112FE592-133F-497D-8DAB-81EB6BBAB0B6}|Default">
+  <MonoDevelop.Ide.Workbench ActiveDocument="HooksInjector/Program.cs">
     <Files>
-      <File FileName="HooksInjector/Program.cs" Line="67" Column="41" />
+      <File FileName="HooksInjector/Program.cs" Line="120" Column="1" />
       <File FileName="HooksInjector/Injector.cs" Line="29" Column="64" />
       <File FileName="HooksInjector/ScriptsCompiler.cs" Line="33" Column="96" />
-      <File FileName="ConsoleMonitor/Program.cs" Line="58" Column="17" />
       <File FileName="HooksInjector/ScriptsParser.cs" Line="14" Column="21" />
-      <File FileName="../BPGame/Scripts/DM.cs" Line="108" Column="2" />
       <File FileName="HookAttribute/HookAttribute.cs" Line="13" Column="3" />
-      <File FileName="../BrokeProtocol/Scripts/test.cs" Line="11" Column="36" />
     </Files>
-    <Pads>
-      <Pad Id="ProjectPad">
-        <State name="__root__">
-          <Node name="UnityHooks" expanded="True">
-            <Node name="ConsoleMonitor" expanded="True">
-              <Node name="Program.cs" selected="True" />
-            </Node>
-            <Node name="HookAttribute" expanded="True">
-              <Node name="References" expanded="True" />
-            </Node>
-            <Node name="HooksInjector" expanded="True">
-              <Node name="References" expanded="True" />
-            </Node>
-          </Node>
-        </State>
-      </Pad>
-    </Pads>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>