update NHibernate

VocaDB · Dec 30, 2016 · 444409f · 444409f
1 parent 8bc42fa
commit 444409f
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ VocaDb.Migrations/obj/
 VocaDb.Migrations/bin/
 *.vspx
 .vs/config/applicationhost.config
+TestResults/
diff --git a/Tests/VocaDb.Tests.csproj b/Tests/VocaDb.Tests.csproj
@@ -77,9 +77,9 @@
       <HintPath>..\packages\Moq.4.5.28\lib\net45\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NHibernate.4.0.3.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="NHibernate.Logging.CommonLogging, Version=4.0.3.4000, Culture=neutral, PublicKeyToken=63d83fd55b02701d, processorArchitecture=MSIL">
       <HintPath>..\packages\NHibernate.Logging.4.0.3\lib\net45\NHibernate.Logging.CommonLogging.dll</HintPath>

diff --git a/Tests/app.config b/Tests/app.config
@@ -5,17 +5,17 @@
 		<sectionGroup name="vocaDb">
 			<section name="affiliates" type="VocaDb.Model.Utils.Config.AffiliatesSection, VocaDb.Model"></section>
 		</sectionGroup>
-		<sectionGroup name="common">
+		<!--<sectionGroup name="common">
       <section name="logging" type="Common.Logging.ConfigurationSectionHandler, Common.Logging" />
-    </sectionGroup>		
+    </sectionGroup>		-->
 	</configSections>
 
 	<appSettings>
 		<add key="HostAddress" value="http://localhost:39390" />
-		<add key="nhibernate-logger" value="NHibernate.Logging.CommonLogging.CommonLoggingLoggerFactory, NHibernate.Logging.CommonLogging" />
+		<!--<add key="nhibernate-logger" value="NHibernate.Logging.CommonLogging.CommonLoggingLoggerFactory, NHibernate.Logging.CommonLogging" />-->
 	</appSettings>
 
-	<common>
+	<!--<common>
     <logging>
       <factoryAdapter type="Common.Logging.Simple.ConsoleOutLoggerFactoryAdapter, Common.Logging">
         <arg key="level" value="INFO" />
@@ -24,7 +24,7 @@
         <arg key="dateTimeFormat" value="yyyy/MM/dd HH:mm:ss:fff" />
       </factoryAdapter>
     </logging>
-  </common>	
+  </common>	-->
 
 	<connectionStrings>
 		<add name="LocalDB" connectionString="Server=(localdb)\v11.0;Integrated Security=true" />
@@ -33,7 +33,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.1.0.4000" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -111,6 +111,10 @@
         <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NHibernate.Logging.CommonLogging" publicKeyToken="63d83fd55b02701d" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.0.3.4000" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 

diff --git a/Tests/packages.config b/Tests/packages.config
@@ -13,6 +13,6 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Moq" version="4.5.28" targetFramework="net462" />
-  <package id="NHibernate" version="4.0.3.4000" targetFramework="net45" />
+  <package id="NHibernate" version="4.1.0.4000" targetFramework="net462" />
   <package id="NHibernate.Logging" version="4.0.3" targetFramework="net46" />
 </packages>
diff --git a/VocaDb.UtaiteDbResources/app.config b/VocaDb.UtaiteDbResources/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.1.0.4000" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

diff --git a/VocaDbModel/VocaDb.Model.csproj b/VocaDbModel/VocaDb.Model.csproj
@@ -61,9 +61,9 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NHibernate.4.0.3.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="NHibernate.Caches.SysCache2, Version=4.0.0.4000, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/VocaDbModel/app.config b/VocaDbModel/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.1.0.4000" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

diff --git a/VocaDbModel/packages.config b/VocaDbModel/packages.config
@@ -6,7 +6,7 @@
   <package id="IvanAkcheurov.NTextCat.Lib" version="0.2.1.1" targetFramework="net45" />
   <package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="NHibernate" version="4.0.3.4000" targetFramework="net45" />
+  <package id="NHibernate" version="4.1.0.4000" targetFramework="net462" />
   <package id="NHibernate.Caches.SysCache2" version="4.0.0.4000" targetFramework="net45" />
   <package id="NLog" version="4.3.11" targetFramework="net462" />
   <package id="PiaproClient" version="1.1.2.0" targetFramework="net46" />

diff --git a/VocaDbWeb/VocaDbWeb.csproj b/VocaDbWeb/VocaDbWeb.csproj
@@ -97,9 +97,9 @@
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NHibernate, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NHibernate.4.0.3.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="NHibernate.Caches.SysCache2, Version=3.1.0.4000, Culture=neutral, PublicKeyToken=6876f2ea66c9f443, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/VocaDbWeb/Web.config b/VocaDbWeb/Web.config
@@ -116,7 +116,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.0.4000" newVersion="4.1.0.4000" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/VocaDbWeb/packages.config b/VocaDbWeb/packages.config
@@ -36,7 +36,7 @@
   <package id="Moment.js" version="2.17.0" targetFramework="net462" />
   <package id="moment.TypeScript.DefinitelyTyped" version="1.8.2" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
-  <package id="NHibernate" version="4.0.3.4000" targetFramework="net45" />
+  <package id="NHibernate" version="4.1.0.4000" targetFramework="net462" />
   <package id="NHibernate.Caches.SysCache2" version="4.0.0.4000" targetFramework="net45" />
   <package id="NLog" version="4.3.11" targetFramework="net462" />
   <package id="NLog.Schema" version="4.3.11" targetFramework="net462" />