Get latest ilmerge to support msbuild 14 (vs 2015)

Msbuild 14 is required by @teyc latest commit due to the use of string interpolation. SchemaZen will no longer compile with older versions of msbuild.
sethreno · Jan 29, 2016 · 7352bf0 · 7352bf0
1 parent 4ae35a6
commit 7352bf0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/console/console.csproj b/console/console.csproj
@@ -130,7 +130,7 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>"$(SolutionDir)\packages\ilmerge.2.13.0307\ilmerge" /target:exe /out:SchemaZen.exe console.exe model.dll ManyConsole.dll NDesk.Options.dll
+    <PostBuildEvent>"$(SolutionDir)\packages\ILMerge.2.14.1208\tools\ilmerge.exe" /target:exe /out:SchemaZen.exe console.exe model.dll ManyConsole.dll NDesk.Options.dll
 </PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

diff --git a/console/packages.config b/console/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <packages>
-  <package id="ILMerge" version="2.13.0307" targetFramework="net35" />
+  <package id="ILMerge" version="2.14.1208" targetFramework="net35" />
   <package id="ManyConsole" version="0.4.2.16" targetFramework="net35" />
   <package id="NDesk.Options" version="0.2.1" targetFramework="net35" />
 </packages>