From 81730a6df389ebf67f97dcb5f4af0783b193037e Mon Sep 17 00:00:00 2001
From: Alexander Ulitin <alexander.a.ulitin@gmail.com>
Date: Wed, 29 Apr 2015 00:29:53 +0300
Subject: [PATCH] ReSharper 9.1 support fix #13

---
 ZenSharp.nuspec |  8 +-------
 build.bat       |  1 +
 buildNuPack.ps1 | 22 ++++------------------
 ilmerge.bat     |  8 ++++++++
 4 files changed, 14 insertions(+), 25 deletions(-)
 create mode 100644 ilmerge.bat

diff --git a/ZenSharp.nuspec b/ZenSharp.nuspec
index a1377d2..b973ce5 100644
--- a/ZenSharp.nuspec
+++ b/ZenSharp.nuspec
@@ -24,13 +24,7 @@ Free and open source. More information on github.
   <files>
     <!--<file src="ZenSharp.Integration\Templates.ltg" target="ReSharper\vAny\plugins\"/>-->
 
-    <!-- 9.0+ -->
-    <file src="bin\Release\NLog.dll"                    target="$TargetDir$\"/>
-    <file src="bin\Release\Nemerle.dll"                 target="$TargetDir$\"/>
-    <file src="bin\Release\Nemerle.Peg.dll"             target="$TargetDir$\"/>
-    <file src="bin\Release\ZenSharp.Core.dll"           target="$TargetDir$\"/>
-    <file src="$IntegrationDll$"                        target="$TargetDir$\ZenSharp.Integration.dll"/>
-    <file src="bin\Release\Nlog.dll.deploy.nlog"        target="$TargetDir$\Nlog.dll.nlog"/>
+    <file src="ZenSharp.dll" target="DotFiles\ZenSharp.dll"/>
 
   </files>
 </package>
diff --git a/build.bat b/build.bat
index c2742dc..4bd485e 100644
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,6 @@
 @echo off
 SET PATH=%PATH%;C:\Windows\Microsoft.NET\Framework64\v4.0.30319
+SET HostFullIdentifier=
 
 if not defined version set /P VERSION=Version:
 
diff --git a/buildNuPack.ps1 b/buildNuPack.ps1
index dbfaa91..7200fd4 100644
--- a/buildNuPack.ps1
+++ b/buildNuPack.ps1
@@ -5,27 +5,11 @@ $version = [System.Diagnostics.FileVersionInfo]::GetVersionInfo((gi .\bin\Releas
 write-host "Version = $version"
 
 $packages = @{
-	"ZenSharp" = @{
-		'PackageId' = 'ZenSharp';
-        'PackageVersion' = $version;
-        'DependencyId' = 'ReSharper';
-        'DependencyVersion' = '8.2';
-        'IntegrationDll' = 'bin\Release\ZenSharp.Integration.dll';
-        'TargetDir' = 'ReSharper\v8.2\plugins';
-    };
-	"ZenSharp_R9" = @{
+	"ZenSharp_R91" = @{
 		'PackageId' = 'Ulex.ZenSharp';
         'PackageVersion' = $version;
         'DependencyId' = 'Wave';
-        'DependencyVersion' = '[1.0]';
-        'IntegrationDll' = 'bin\Release.R90\ZenSharp.Integration.dll';
-        'TargetDir' = 'DotFiles\';
-    };
-	"ZenSharp_R91" = @{
-		'PackageId' = 'Ulex.ZenSharp91';
-        'PackageVersion' = $version;
-        'DependencyId' = 'wave';
-        'DependencyVersion' = '[2.0]';
+        'DependencyVersion' = '[2.0, 3.0)';
         'IntegrationDll' = 'bin\Release.R91\ZenSharp.Integration.dll';
         'TargetDir' = 'DotFiles\';
     };
@@ -33,7 +17,9 @@ $packages = @{
 foreach ($p in $packages.Values){
     $properties = [String]::Join(";" ,($p.GetEnumerator() | % {("{0}={1}" -f @($_.Key, $_.Value))}))
     write-host $properties
+    .\ilmerge.bat $p['IntegrationDll']
     nuget.exe pack $nuspec -Properties $properties
+    ri ZenSharp.dll
 }
 
 Move-Item *.nupkg .\bin\Release -Force
diff --git a/ilmerge.bat b/ilmerge.bat
new file mode 100644
index 0000000..8940c0c
--- /dev/null
+++ b/ilmerge.bat
@@ -0,0 +1,8 @@
+SET INTEGRATIONDLL=%1
+SET PATH=%PATH%;C:\Program Files (x86)\Microsoft\ILMerge
+SET NETDIR=%WINDIR%\Microsoft.NET\Framework\v4.0.30319
+set LIBS=/lib:bin\Release.R90 /lib:%NETDIR% /lib:%NETDIR%\WPF
+SET ILMERGED=bin\Release\NLog.dll bin\Release\Nemerle.dll bin\Release\Nemerle.Peg.dll bin\Release\ZenSharp.Core.dll %INTEGRATIONDLL%
+SET TARGETPL=/targetplatform:v4,%WINDIR%\Microsoft.NET\Framework\v4.0.30319
+ilmerge.exe %LIBS% /out:ZenSharp.dll %TARGETPL% %ILMERGED% 
+