From eda898c9bf8cd2054c42b28ddbf05444388dc690 Mon Sep 17 00:00:00 2001
From: Roger Kratz <roger.kratz@gmail.com>
Date: Tue, 17 Jan 2017 13:17:53 +0100
Subject: [PATCH] Upgrade to ilmerge 2.14

---
 NHibernate.SqlAzure/NHibernate.SqlAzure.csproj   | 2 +-
 NHibernate.SqlAzure/packages.config              | 2 +-
 NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj | 2 +-
 NHibernate4.SqlAzure/packages.config             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/NHibernate.SqlAzure/NHibernate.SqlAzure.csproj b/NHibernate.SqlAzure/NHibernate.SqlAzure.csproj
index 2d207e9..571ac7c 100644
--- a/NHibernate.SqlAzure/NHibernate.SqlAzure.csproj
+++ b/NHibernate.SqlAzure/NHibernate.SqlAzure.csproj
@@ -97,7 +97,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>mkdir "$(TargetDir)Combined"
-"$(ProjectDir)..\packages\ilmerge.2.13.0307\ILMerge.exe" /v4 /target:library "$(TargetPath)" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll" /out:"$(TargetDir)Combined\NHibernate.SqlAzure.dll"
+"$(ProjectDir)..\packages\ilmerge.2.14.1208\tools\ILMerge.exe" /v4 /target:library "$(TargetPath)" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll" /out:"$(TargetDir)Combined\NHibernate.SqlAzure.dll"
 copy "$(TargetDir)NHibernate.SqlAzure.XML" "$(TargetDir)Combined\NHibernate.SqlAzure.XML"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/NHibernate.SqlAzure/packages.config b/NHibernate.SqlAzure/packages.config
index 6b2162b..bb7b6ab 100644
--- a/NHibernate.SqlAzure/packages.config
+++ b/NHibernate.SqlAzure/packages.config
@@ -3,6 +3,6 @@
   <package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net45" />
   <package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net45" />
   <package id="Iesi.Collections" version="3.2.0.4000" targetFramework="net45" />
-  <package id="ilmerge" version="2.13.0307" targetFramework="net45" />
+  <package id="ILMerge" version="2.14.1208" targetFramework="net45" />
   <package id="NHibernate" version="3.3.3.4001" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj
index 5fe3f4d..4c53e5c 100644
--- a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj
+++ b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj
@@ -69,7 +69,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>mkdir "$(TargetDir)Combined"
-"$(ProjectDir)..\packages\ilmerge.2.13.0307\ILMerge.exe" /v4 /target:library "$(TargetPath)" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll" /out:"$(TargetDir)Combined\NHibernate.SqlAzure.dll"
+"$(ProjectDir)..\packages\ilmerge.2.14.1208\tools\ILMerge.exe" /v4 /target:library "$(TargetPath)" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll" "$(TargetDir)Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll" /out:"$(TargetDir)Combined\NHibernate.SqlAzure.dll"
 copy "$(TargetDir)NHibernate.SqlAzure.XML" "$(TargetDir)Combined\NHibernate.SqlAzure.XML"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/NHibernate4.SqlAzure/packages.config b/NHibernate4.SqlAzure/packages.config
index c413c37..643bb21 100644
--- a/NHibernate4.SqlAzure/packages.config
+++ b/NHibernate4.SqlAzure/packages.config
@@ -3,6 +3,6 @@
   <package id="EnterpriseLibrary.TransientFaultHandling" version="6.0.1304.0" targetFramework="net45" />
   <package id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0.1304.1" targetFramework="net45" />
   <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
-  <package id="ilmerge" version="2.13.0307" targetFramework="net45" />
+  <package id="ILMerge" version="2.14.1208" targetFramework="net45" />
   <package id="NHibernate" version="4.1.0.4000" targetFramework="net45" />
 </packages>
\ No newline at end of file