lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Upgrading to NHibernate 3.3 nad fixing background JIT

Browse Source 
--HG--
branch : 1.x
extra : rebase_source : fa8def89521d86d3dbeb38d0808e72bde29bb64f
This commit is contained in:
Sebastien Ros
2012-11-14 11:39:51 -08:00
parent babdd75b3e
commit 493d2748a4
7 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/nhibernate/Iesi.Collections.dll
BIN
View File
Binary file not shown.
lib/nhibernate/NHibernate.dll
BIN
View File
Binary file not shown.
lib/nhibernate/PATCH.txt
+1
View File
@@ -0,0 +1 @@
This is a patched version of NHibernate to prevent background JIT from failing.
src/Orchard.Specs/Hosting/Orchard.Web/Web.config
+1 -1
View File
@@ -190,7 +190,7 @@
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" /> <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000" /> <bindingRedirect oldVersion="0.0.0.0-3.3.2.4000" newVersion="3.3.2.4000" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
src/Orchard.Specs/Hosting/Simple.Web/Web.config
+1 -1
View File
@@ -193,7 +193,7 @@
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" /> <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000" /> <bindingRedirect oldVersion="0.0.0.0-3.3.2.4000" newVersion="3.3.2.4000" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
src/Orchard.Tests/App.config
+1 -1
View File
@@ -20,7 +20,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" /> <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000" /> <bindingRedirect oldVersion="0.0.0.0-3.3.2.4000" newVersion="3.3.2.4000" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
src/Orchard.Web/Web.config
+2 -2
View File
@@ -57,7 +57,7 @@
affects performance, set this value to true only affects performance, set this value to true only
during development. during development.
--> -->
<compilation debug="true" targetFramework="4.0" batch="true" numRecompilesBeforeAppRestart="250" optimizeCompilations="true"> <compilation debug="false" targetFramework="4.0" batch="true" numRecompilesBeforeAppRestart="250" optimizeCompilations="true">
<buildProviders> <buildProviders>
<add extension=".csproj" type="Orchard.Environment.Extensions.Compilers.CSharpExtensionBuildProviderShim"/> <add extension=".csproj" type="Orchard.Environment.Extensions.Compilers.CSharpExtensionBuildProviderShim"/>
</buildProviders> </buildProviders>
@@ -190,7 +190,7 @@
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" /> <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.3.1.4000" newVersion="3.3.1.4000" /> <bindingRedirect oldVersion="0.0.0.0-3.3.2.4000" newVersion="3.3.2.4000" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>