Merge pull request #21 from RogerKratz/master

#20 Upgrading to NH 4.1.x
MRCollective · Jan 10, 2017 · 0ad3aae · 0ad3aae
2 parents 713b47c + eba1d2a
commit 0ad3aae
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/NHibernate4.SqlAzure.Tests/App.config b/NHibernate4.SqlAzure.Tests/App.config
@@ -4,4 +4,13 @@
     <add name="PooledDatabase" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=True;Initial Catalog=NHibernateSqlAzureTests"/>
     <add name="NonPooledDatabase" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=True;Initial Catalog=NHibernateSqlAzureTests;Pooling=false"/>
   </connectionStrings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.1.0.4000" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/NHibernate4.SqlAzure.Tests/NHibernate4.SqlAzure.Tests.csproj b/NHibernate4.SqlAzure.Tests/NHibernate4.SqlAzure.Tests.csproj
@@ -50,8 +50,9 @@
     <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling">
       <HintPath>..\packages\EnterpriseLibrary.TransientFaultHandling.6.0.1304.0\lib\portable-net45+win+wp8\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate">
-      <HintPath>..\packages\NHibernate.4.0.2.4000\lib\net40\NHibernate.dll</HintPath>
+    <Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <HintPath>..\packages\NHibernate.4.1.0.4000\lib\net40\NHibernate.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>

diff --git a/NHibernate4.SqlAzure.Tests/packages.config b/NHibernate4.SqlAzure.Tests/packages.config
@@ -8,7 +8,7 @@
   <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="NBuilder" version="3.0.1.1" targetFramework="net45" />
-  <package id="NHibernate" version="4.0.2.4000" targetFramework="net45" />
+  <package id="NHibernate" version="4.1.0.4000" targetFramework="net45" />
   <package id="NHibernateProfiler" version="1.0.0.951" targetFramework="net45" />
   <package id="NUnit" version="2.6.2" targetFramework="net45" />
   <package id="WebActivator" version="1.4.4" targetFramework="net45" />

diff --git a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.Standalone.nuspec b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.Standalone.nuspec
@@ -33,7 +33,7 @@
        en-US 
     </language>
     <dependencies>
-      <dependency id="NHibernate" version="4.0.2.4000" />
+      <dependency id="NHibernate" version="[4.1, 4.2)" />
       <dependency id="EnterpriseLibrary.TransientFaultHandling" version="6.0" />
       <dependency id="EnterpriseLibrary.TransientFaultHandling.Data" version="6.0" />
     </dependencies>

diff --git a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.csproj
@@ -41,8 +41,9 @@
     <Reference Include="Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data">
       <HintPath>..\packages\EnterpriseLibrary.TransientFaultHandling.Data.6.0.1304.1\lib\NET45\Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling.Data.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate">
-      <HintPath>..\packages\NHibernate.4.0.2.4000\lib\net40\NHibernate.dll</HintPath>
+    <Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
+      <HintPath>..\packages\NHibernate.4.1.0.4000\lib\net40\NHibernate.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/NHibernate4.SqlAzure/NHibernate4.SqlAzure.nuspec b/NHibernate4.SqlAzure/NHibernate4.SqlAzure.nuspec
@@ -33,7 +33,7 @@
        en-US 
     </language>
     <dependencies>
-      <dependency id="NHibernate" version="4.0.2.4000" />
+      <dependency id="NHibernate" version="[4.1, 4.2)" />
     </dependencies>
   </metadata>
   <files>

diff --git a/NHibernate4.SqlAzure/packages.config b/NHibernate4.SqlAzure/packages.config
@@ -4,5 +4,5 @@
   <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="NHibernate" version="4.0.2.4000" targetFramework="net45" />
+  <package id="NHibernate" version="4.1.0.4000" targetFramework="net45" />
 </packages>