ILMerge support

git-svn-id: http://svn.code.sf.net/p/reflexil/code@268 245f54d4-4a38-0410-b06a-b1304f9c06f5

Build/Binary/generate.AIO.bat

@@ -0,0 +1,3 @@
+@echo off
+
+generate AIO

Build/Binary/generate.bat

@@ -2,7 +2,7 @@
 
 set PATH=.\tools;%WINDIR%\Microsoft.NET\Framework\v4.0.30319;%PATH%
 
-msbuild ..\..\reflexil.sln /p:Configuration=Release;TargetFrameworkVersion=v3.5
+msbuild ..\..\reflexil.sln /t:Clean,Build /p:Configuration=Release;TargetFrameworkVersion=v3.5
 
 rm -fr output
 mkdir output
@@ -21,11 +21,19 @@ cd ..\..\
 cd .\Build\Binary\
 mv ..\..\licenses.zip output
 
-rem ILMerge /keyfile:..\..\Keys\reflexil.snk /out:.\output\Reflexil.AIO.dll .\output\Reflexil.dll .\output\Reflexil.Reflector.dll .\output\Be.Windows.Forms.HexBox.dll .\output\De4dot.dll .\output\ICSharpCode.NRefactory.dll .\output\ICSharpCode.SharpDevelop.Dom.dll .\output\ICSharpCode.TextEditor.dll .\output\Mono.Cecil.dll .\output\Mono.Cecil.Mdb.dll .\output\Mono.Cecil.Pdb.dll /lib:..\..\Plugins\Reflexil.Reflector\Libs\Binaries
-
 grep "AssemblyVersion" ..\..\Properties\SolutionVersion.cs | sed "s/.*\"\(.\..\)\..\..\".*/\1/g" > version.txt
 set /P REFLEXIL_VERSION=<version.txt
 
+IF "%1"=="AIO" GOTO ILMERGE
+GOTO CLEANUP
+
+:ILMERGE
+set ASSEMBLIES=.\output\Reflexil.dll .\output\Reflexil.Reflector.dll .\output\Be.Windows.Forms.HexBox.dll .\output\De4dot.dll .\output\ICSharpCode.NRefactory.dll .\output\ICSharpCode.SharpDevelop.Dom.dll .\output\ICSharpCode.TextEditor.dll .\output\Mono.Cecil.dll .\output\Mono.Cecil.Mdb.dll .\output\Mono.Cecil.Pdb.dll
+ILMerge /ndebug /keyfile:..\..\Keys\reflexil.snk /out:.\output\Reflexil.Reflector.AIO.dll %ASSEMBLIES% /lib:..\..\Plugins\Reflexil.Reflector\Libs\Binaries
+rm %ASSEMBLIES% .\output\Reflexil.CecilStudio.dll .\output\Reflexil.dll.config
+set REFLEXIL_VERSION=%REFLEXIL_VERSION%.AIO
+
+:CLEANUP
 rm -fr reflexil.%REFLEXIL_VERSION%.bin
 mv output reflexil.%REFLEXIL_VERSION%.bin
 

ChangeLog

@@ -1,9 +1,9 @@
 ////////////////////////////////////////////////////////////////////////////////
-// v1.6 - dd/mm/2012 ///////////////////////////////////////////////////////////
+// v1.6 - 17/01/2013 ///////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
   news:
-    - 
+    - Optional ILMerged version to prevent unexpected Mono.Cecil assemblies.
 
   upgrades:
     - de4dot 1.9.0 update. New deobfuscation support for CodeFort, CodeWall,

Plugins/BasePackage.cs

@@ -288,8 +288,11 @@ public void CheckPrerequisites()
             if (!FrameworkVersionChecker.IsVersionInstalled(FrameworkVersions.v3_5) && !FrameworkVersionChecker.IsVersionInstalled(FrameworkVersions.Mono_2_4))
                 ShowMessage("Warning, Reflexil is unable to locate .NET Framework 3.5 or Mono 2.4! This is required!");
 
-        	var marker = Type.GetType("Mono.Cecil.MonoCecilReflexilMarker, Mono.Cecil", false);
-			if (marker == null)
+            // Standalone or ILMerged
+        	var marker = Type.GetType("Mono.Cecil.MonoCecilReflexilMarker, Mono.Cecil", false) ??
+        	             Type.GetType("Mono.Cecil.MonoCecilReflexilMarker", false);
+
+            if (marker == null)
 				ShowMessage("Warning, Reflexil is unable to locate customized Mono.Cecil assembly. Please use Mono.Cecil from Reflexil package! (optionally check your GAC).");
 
         }