From 53f3a19ece1d1db459d1d618a09c2b946d044654 Mon Sep 17 00:00:00 2001 From: Benedek Farkas Date: Fri, 6 Dec 2024 09:49:25 +0100 Subject: [PATCH] #8814: Upgrading NHibernate to 5.5.2 (#8815) * Upgrading NHibernate to 5.5.2 * Adapting SchemaCommandGenerator to obsolete NHibernate code * Adapting unit tests to NHibernate breaking change https://github.com/nhibernate/nhibernate-core/issues/1106 https://github.com/nhibernate/nhibernate-core/issues/1095 * Updating ModuleRootWebConfig.txt codegen template according to the new Newtonsoft.Json and NHibernate version --- .../NHibernate.Linq/NHibernate.Linq.csproj | 4 +-- .../NHibernate.Linq/packages.config | 2 +- src/Orchard.Core.Tests/App.config | 2 +- .../Orchard.Core.Tests.csproj | 4 +-- src/Orchard.Core.Tests/packages.config | 2 +- src/Orchard.Specs/App.Config | 2 +- src/Orchard.Specs/Orchard.Specs.csproj | 4 +-- src/Orchard.Specs/packages.config | 4 +-- src/Orchard.Tests.Modules/App.config | 2 +- .../Orchard.Tests.Modules.csproj | 4 +-- .../Controllers/AccountControllerTests.cs | 8 +++++- .../Users/Services/MembershipServiceTests.cs | 8 +++++- .../Users/Services/UserServiceTests.cs | 8 +++++- src/Orchard.Tests.Modules/packages.config | 2 +- src/Orchard.Tests/App.config | 2 +- .../Orchard.Framework.Tests.csproj | 4 +-- src/Orchard.Tests/packages.config | 2 +- src/Orchard.Web.Tests/app.config | 2 +- src/Orchard.Web/Core/Orchard.Core.csproj | 21 +++++++++++++--- src/Orchard.Web/Core/Web.config | 2 +- src/Orchard.Web/Core/packages.config | 8 ++++-- src/Orchard.Web/Modules/Lucene/Web.config | 2 +- src/Orchard.Web/Modules/Markdown/Web.config | 2 +- .../Modules/Orchard.Alias/Web.config | 2 +- .../Modules/Orchard.AntiSpam/Web.config | 2 +- .../Modules/Orchard.ArchiveLater/Web.config | 2 +- .../Orchard.AuditTrail.csproj | 4 +-- .../Modules/Orchard.AuditTrail/Web.config | 2 +- .../Orchard.AuditTrail/packages.config | 4 +-- .../Modules/Orchard.Autoroute/Web.config | 2 +- .../Orchard.Azure.MediaServices.csproj | 4 +-- .../Orchard.Azure.MediaServices/Web.config | 2 +- .../packages.config | 2 +- .../Orchard.Azure/Orchard.Azure.csproj | 6 ++--- .../Modules/Orchard.Azure/Web.config | 2 +- .../Modules/Orchard.Azure/packages.config | 4 +-- .../Modules/Orchard.Blogs/Web.config | 2 +- .../Modules/Orchard.Caching/Web.config | 2 +- .../ModuleRootWebConfig.txt | 4 +-- .../Modules/Orchard.CodeGeneration/Web.config | 2 +- .../Modules/Orchard.Comments/Web.config | 2 +- .../Modules/Orchard.Conditions/Web.config | 2 +- .../Orchard.ContentPermissions/Web.config | 2 +- .../Orchard.ContentPicker.csproj | 4 +-- .../Modules/Orchard.ContentPicker/Web.config | 2 +- .../Orchard.ContentPicker/packages.config | 4 +-- .../Modules/Orchard.ContentPreview/Web.config | 2 +- .../Modules/Orchard.ContentTypes/Web.config | 2 +- .../Modules/Orchard.CustomForms/Web.config | 2 +- .../Modules/Orchard.Dashboards/Web.config | 2 +- .../Modules/Orchard.DesignerTools/Web.config | 2 +- .../Modules/Orchard.DynamicForms/Web.config | 2 +- .../Modules/Orchard.Email/Web.config | 2 +- .../Modules/Orchard.Fields/Web.config | 2 +- .../Modules/Orchard.Forms/Web.config | 2 +- .../Orchard.Glimpse/Orchard.Glimpse.csproj | 4 +-- .../Modules/Orchard.Glimpse/Web.config | 2 +- .../Modules/Orchard.Glimpse/packages.config | 2 +- .../Modules/Orchard.ImageEditor/Web.config | 2 +- .../Orchard.ImportExport.csproj | 4 +-- .../Modules/Orchard.ImportExport/Web.config | 2 +- .../Orchard.ImportExport/packages.config | 4 +-- .../Modules/Orchard.Indexing/Web.config | 2 +- .../Modules/Orchard.JobsQueue/Web.config | 2 +- .../Modules/Orchard.Layouts/Web.config | 2 +- .../Modules/Orchard.Lists/Web.config | 2 +- .../Modules/Orchard.Localization/Web.config | 2 +- .../Modules/Orchard.Media/Web.config | 2 +- .../Orchard.MediaLibrary.WebSearch/Web.config | 2 +- .../Modules/Orchard.MediaLibrary/Web.config | 2 +- .../Modules/Orchard.MediaPicker/Web.config | 2 +- .../Orchard.MediaProcessing/Web.config | 2 +- .../Orchard.MessageBus.csproj | 6 ++--- .../Modules/Orchard.MessageBus/Web.config | 2 +- .../Orchard.MessageBus/packages.config | 4 +-- .../Modules/Orchard.Migrations/Web.config | 2 +- .../Modules/Orchard.Modules/Web.config | 2 +- .../Orchard.MultiTenancy.csproj | 4 +-- .../Modules/Orchard.MultiTenancy/Web.config | 2 +- .../Orchard.MultiTenancy/packages.config | 4 +-- .../Orchard.OpenId/Orchard.OpenId.csproj | 4 +-- .../Modules/Orchard.OpenId/Web.config | 2 +- .../Modules/Orchard.OpenId/packages.config | 2 +- .../Modules/Orchard.OutputCache/Web.config | 2 +- .../Modules/Orchard.Packaging/Web.config | 2 +- .../Modules/Orchard.Pages/Web.config | 2 +- .../Orchard.Projections.csproj | 4 +-- .../Tests/Orchard.Projections.Tests.csproj | 4 +-- .../Tests/Services/FieldIndexServiceTests.cs | 25 +++++++++++-------- .../Orchard.Projections/Tests/app.config | 2 +- .../Orchard.Projections/Tests/packages.config | 2 +- .../Modules/Orchard.Projections/Web.config | 2 +- .../Orchard.Projections/packages.config | 4 +-- .../Modules/Orchard.PublishLater/Web.config | 2 +- .../Modules/Orchard.Recipes/Web.config | 2 +- .../Orchard.Redis/Orchard.Redis.csproj | 6 ++--- .../Modules/Orchard.Redis/Web.config | 2 +- .../Modules/Orchard.Redis/packages.config | 4 +-- .../Modules/Orchard.Resources/Web.config | 2 +- .../Modules/Orchard.Roles/Web.config | 2 +- .../Modules/Orchard.Rules/Web.config | 2 +- .../Orchard.Scripting.CSharp/Web.config | 2 +- .../Modules/Orchard.Scripting.Dlr/Web.config | 2 +- .../Modules/Orchard.Scripting/Web.config | 2 +- .../Modules/Orchard.Search/Web.config | 2 +- .../Orchard.SecureSocketsLayer/Web.config | 2 +- .../Modules/Orchard.Setup/Web.config | 2 +- .../Modules/Orchard.Tags/Orchard.Tags.csproj | 4 +-- .../Modules/Orchard.Tags/Web.config | 2 +- .../Modules/Orchard.Tags/packages.config | 4 +-- .../Modules/Orchard.TaskLease/Web.config | 2 +- .../Orchard.Taxonomies.csproj | 6 ++--- .../Modules/Orchard.Taxonomies/Web.config | 2 +- .../Orchard.Taxonomies/packages.config | 4 +-- .../Modules/Orchard.Templates/Web.config | 2 +- .../Modules/Orchard.Themes/Web.config | 2 +- .../Modules/Orchard.Tokens/Tests/app.config | 2 +- .../Modules/Orchard.Tokens/Web.config | 2 +- .../Modules/Orchard.Users/Web.config | 2 +- .../Modules/Orchard.Warmup/Web.config | 2 +- .../Modules/Orchard.Widgets/Web.config | 2 +- .../Modules/Orchard.Workflows/Web.config | 2 +- .../Modules/Orchard.jQuery/Web.config | 2 +- .../Modules/SysCache/SysCache.csproj | 6 ++--- src/Orchard.Web/Modules/SysCache/Web.config | 2 +- .../Modules/SysCache/packages.config | 4 +-- src/Orchard.Web/Modules/TinyMce/Web.config | 2 +- .../Modules/Upgrade/Upgrade.csproj | 4 +-- src/Orchard.Web/Modules/Upgrade/Web.config | 2 +- .../Modules/Upgrade/packages.config | 4 +-- src/Orchard.Web/Themes/Web.config | 2 +- src/Orchard.Web/Web.config | 2 +- .../Generator/SchemaCommandGenerator.cs | 5 ++-- src/Orchard/Orchard.Framework.csproj | 4 +-- src/Orchard/app.config | 2 +- src/Orchard/packages.config | 2 +- 136 files changed, 232 insertions(+), 191 deletions(-) diff --git a/src/Libraries/NHibernate/NHibernate.Linq/NHibernate.Linq.csproj b/src/Libraries/NHibernate/NHibernate.Linq/NHibernate.Linq.csproj index 46467801f..a2a7ae206 100644 --- a/src/Libraries/NHibernate/NHibernate.Linq/NHibernate.Linq.csproj +++ b/src/Libraries/NHibernate/NHibernate.Linq/NHibernate.Linq.csproj @@ -49,8 +49,8 @@ ..\..\..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Libraries/NHibernate/NHibernate.Linq/packages.config b/src/Libraries/NHibernate/NHibernate.Linq/packages.config index 55205e415..0272a28bd 100644 --- a/src/Libraries/NHibernate/NHibernate.Linq/packages.config +++ b/src/Libraries/NHibernate/NHibernate.Linq/packages.config @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/src/Orchard.Core.Tests/App.config b/src/Orchard.Core.Tests/App.config index 476eb41bd..2927415cd 100644 --- a/src/Orchard.Core.Tests/App.config +++ b/src/Orchard.Core.Tests/App.config @@ -4,7 +4,7 @@ - + diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index 2461eee03..1d7e7a8d1 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -77,8 +77,8 @@ ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - - ..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Core.Tests/packages.config b/src/Orchard.Core.Tests/packages.config index 4234cf108..d62c1d94d 100644 --- a/src/Orchard.Core.Tests/packages.config +++ b/src/Orchard.Core.Tests/packages.config @@ -9,7 +9,7 @@ - + diff --git a/src/Orchard.Specs/App.Config b/src/Orchard.Specs/App.Config index a544d8735..05fd3dbfc 100644 --- a/src/Orchard.Specs/App.Config +++ b/src/Orchard.Specs/App.Config @@ -12,7 +12,7 @@ - + diff --git a/src/Orchard.Specs/Orchard.Specs.csproj b/src/Orchard.Specs/Orchard.Specs.csproj index 3056790e6..e9001edd6 100644 --- a/src/Orchard.Specs/Orchard.Specs.csproj +++ b/src/Orchard.Specs/Orchard.Specs.csproj @@ -86,8 +86,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Specs/packages.config b/src/Orchard.Specs/packages.config index d7cfa4c7a..ad28f8a8d 100644 --- a/src/Orchard.Specs/packages.config +++ b/src/Orchard.Specs/packages.config @@ -11,10 +11,10 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Tests.Modules/App.config b/src/Orchard.Tests.Modules/App.config index 80a963eaa..5b5fb8eb1 100644 --- a/src/Orchard.Tests.Modules/App.config +++ b/src/Orchard.Tests.Modules/App.config @@ -20,7 +20,7 @@ - + diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 0d49cfd2b..739f04057 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -110,8 +110,8 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\packages\Orchard.NuGet.Core.1.1.0.0\lib\NuGet.Core.dll diff --git a/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs b/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs index 94cf64b5b..96a3118e4 100644 --- a/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs +++ b/src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs @@ -15,6 +15,7 @@ using Orchard.ContentManagement.MetaData.Services; using Orchard.ContentManagement.Records; using Orchard.Core.Settings.Handlers; using Orchard.Core.Settings.Metadata; +using Orchard.Core.Settings.Metadata.Records; using Orchard.Core.Settings.Models; using Orchard.Core.Settings.Services; using Orchard.DisplayManagement; @@ -110,7 +111,12 @@ namespace Orchard.Tests.Modules.Users.Controllers { return new[] { typeof(UserPartRecord), typeof(ContentTypeRecord), typeof(ContentItemRecord), - typeof(ContentItemVersionRecord), + typeof(ContentItemVersionRecord), + typeof(ContentPartDefinitionRecord), + typeof(ContentPartFieldDefinitionRecord), + typeof(ContentFieldDefinitionRecord), + typeof(ContentTypeDefinitionRecord), + typeof(ContentTypePartDefinitionRecord) }; } } diff --git a/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs b/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs index 4d4d2ef2b..8a741ae95 100644 --- a/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs +++ b/src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs @@ -14,6 +14,7 @@ using Orchard.ContentManagement.MetaData.Services; using Orchard.ContentManagement.Records; using Orchard.Core.Settings.Handlers; using Orchard.Core.Settings.Metadata; +using Orchard.Core.Settings.Metadata.Records; using Orchard.Core.Settings.Services; using Orchard.Data; using Orchard.DisplayManagement; @@ -54,7 +55,12 @@ namespace Orchard.Tests.Modules.Users.Services typeof(UserPartRecord), typeof(ContentItemVersionRecord), typeof(ContentItemRecord), - typeof(ContentTypeRecord)); + typeof(ContentTypeRecord), + typeof(ContentPartDefinitionRecord), + typeof(ContentPartFieldDefinitionRecord), + typeof(ContentFieldDefinitionRecord), + typeof(ContentTypeDefinitionRecord), + typeof(ContentTypePartDefinitionRecord)); } [TestFixtureTearDown] diff --git a/src/Orchard.Tests.Modules/Users/Services/UserServiceTests.cs b/src/Orchard.Tests.Modules/Users/Services/UserServiceTests.cs index 3f92ffee2..1d4200932 100644 --- a/src/Orchard.Tests.Modules/Users/Services/UserServiceTests.cs +++ b/src/Orchard.Tests.Modules/Users/Services/UserServiceTests.cs @@ -14,6 +14,7 @@ using Orchard.ContentManagement.MetaData.Services; using Orchard.ContentManagement.Records; using Orchard.Core.Settings.Handlers; using Orchard.Core.Settings.Metadata; +using Orchard.Core.Settings.Metadata.Records; using Orchard.Core.Settings.Services; using Orchard.Data; using Orchard.DisplayManagement; @@ -59,7 +60,12 @@ namespace Orchard.Tests.Modules.Users.Services typeof(UserPartRecord), typeof(ContentItemVersionRecord), typeof(ContentItemRecord), - typeof(ContentTypeRecord)); + typeof(ContentTypeRecord), + typeof(ContentPartDefinitionRecord), + typeof(ContentPartFieldDefinitionRecord), + typeof(ContentFieldDefinitionRecord), + typeof(ContentTypeDefinitionRecord), + typeof(ContentTypePartDefinitionRecord)); } [TestFixtureTearDown] diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index abe8f3750..8761f11fd 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -14,7 +14,7 @@ - + diff --git a/src/Orchard.Tests/App.config b/src/Orchard.Tests/App.config index 80a963eaa..5b5fb8eb1 100644 --- a/src/Orchard.Tests/App.config +++ b/src/Orchard.Tests/App.config @@ -20,7 +20,7 @@ - + diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 45997c729..bb4fb0a0b 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -110,8 +110,8 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index 3e3ef3bd8..6ee2a3051 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -16,7 +16,7 @@ - + diff --git a/src/Orchard.Web.Tests/app.config b/src/Orchard.Web.Tests/app.config index 05c053f56..852be14ac 100644 --- a/src/Orchard.Web.Tests/app.config +++ b/src/Orchard.Web.Tests/app.config @@ -8,7 +8,7 @@ - + diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 2eabcffc1..6b9da3ebc 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -53,6 +53,12 @@ false + + ..\..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll + + + ..\..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll + ..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -60,15 +66,24 @@ ..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll + + + ..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll + + + ..\..\packages\Remotion.Linq.EagerFetching.2.2.0\lib\net45\Remotion.Linq.EagerFetching.dll 3.5 + + + @@ -659,4 +674,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Core/Web.config b/src/Orchard.Web/Core/Web.config index 131a9f700..c87ba8fa2 100644 --- a/src/Orchard.Web/Core/Web.config +++ b/src/Orchard.Web/Core/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Core/packages.config b/src/Orchard.Web/Core/packages.config index bc01c37ec..1cef67cdb 100644 --- a/src/Orchard.Web/Core/packages.config +++ b/src/Orchard.Web/Core/packages.config @@ -1,9 +1,13 @@  + + - - + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Lucene/Web.config b/src/Orchard.Web/Modules/Lucene/Web.config index f814c23d8..3215ec1d9 100644 --- a/src/Orchard.Web/Modules/Lucene/Web.config +++ b/src/Orchard.Web/Modules/Lucene/Web.config @@ -45,7 +45,7 @@ - + diff --git a/src/Orchard.Web/Modules/Markdown/Web.config b/src/Orchard.Web/Modules/Markdown/Web.config index c14ba28de..021881754 100644 --- a/src/Orchard.Web/Modules/Markdown/Web.config +++ b/src/Orchard.Web/Modules/Markdown/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Web.config b/src/Orchard.Web/Modules/Orchard.Alias/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Alias/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config index c14ba28de..021881754 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj index 612956cc6..1a7ed2921 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj @@ -67,8 +67,8 @@ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config index cf2080640..886615a94 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config index 3dbda71a7..78064ba38 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config @@ -8,8 +8,8 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config index 7f4a0f97d..286b6a363 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config @@ -45,7 +45,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj index ab5b25bde..1dadbf912 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj @@ -115,8 +115,8 @@ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config index 2b930bf22..4518ccc6e 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config @@ -67,7 +67,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config index 670821743..b6e0e3c00 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config @@ -18,7 +18,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj index 1eff9ded4..b6e406e94 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj @@ -107,8 +107,8 @@ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll @@ -220,4 +220,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Web.config b/src/Orchard.Web/Modules/Orchard.Azure/Web.config index af1baefa5..301cd0eba 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/Web.config @@ -71,7 +71,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/packages.config b/src/Orchard.Web/Modules/Orchard.Azure/packages.config index 909cc51f8..74217dd57 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/packages.config @@ -14,10 +14,10 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Web.config b/src/Orchard.Web/Modules/Orchard.Caching/Web.config index 1fc8f61a0..3c29f53a0 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Caching/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt index 48c8a2031..9c9138f73 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt @@ -47,11 +47,11 @@ - + - + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config index 1fc8f61a0..3c29f53a0 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Web.config b/src/Orchard.Web/Modules/Orchard.Comments/Web.config index c4ebc5c27..eb2d44373 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config index b4b1cf0de..35c44cb96 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config @@ -44,7 +44,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj index 55074b5e1..ad8f38d6d 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj @@ -65,8 +65,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config index 66dabff13..1cef67cdb 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config @@ -7,7 +7,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentPreview/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPreview/Web.config index 74130ebce..e3c576d0f 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPreview/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPreview/Web.config @@ -66,7 +66,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config index c6b0cd12f..7eeb910d7 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config index 68ff8758d..24e0acd0f 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config index a80a92b24..9760b6016 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config @@ -49,7 +49,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Email/Web.config b/src/Orchard.Web/Modules/Orchard.Email/Web.config index fd7fac8e5..dea324b0a 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Email/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Web.config b/src/Orchard.Web/Modules/Orchard.Fields/Web.config index 541deb171..9491d18ba 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Fields/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Web.config b/src/Orchard.Web/Modules/Orchard.Forms/Web.config index 73a184e13..8cc81895f 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Forms/Web.config @@ -43,7 +43,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj b/src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj index c2a9841a0..3d96c1ede 100644 --- a/src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj +++ b/src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj @@ -95,8 +95,8 @@ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/Orchard.Web/Modules/Orchard.Glimpse/Web.config b/src/Orchard.Web/Modules/Orchard.Glimpse/Web.config index 0ad5a7442..50bf8f144 100644 --- a/src/Orchard.Web/Modules/Orchard.Glimpse/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Glimpse/Web.config @@ -67,7 +67,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Glimpse/packages.config b/src/Orchard.Web/Modules/Orchard.Glimpse/packages.config index 75ffcd1bc..d270e01bd 100644 --- a/src/Orchard.Web/Modules/Orchard.Glimpse/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Glimpse/packages.config @@ -18,7 +18,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config index 5f204e774..4b884e0c5 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj index 77a07832d..7040ee997 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj @@ -68,8 +68,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config index 5b9210e80..a3d4cde84 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config @@ -8,7 +8,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config index fd7fac8e5..dea324b0a 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config index f3b899522..ee7f9fc2c 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config @@ -51,7 +51,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Web.config b/src/Orchard.Web/Modules/Orchard.Lists/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Lists/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Web.config b/src/Orchard.Web/Modules/Orchard.Localization/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Localization/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Media/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Web.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Web.config index 7d2afd9d0..cb0d6575f 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Web.config @@ -66,7 +66,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config index 68ff8758d..24e0acd0f 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj index 1a7796588..e6184174c 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj @@ -59,8 +59,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll @@ -184,4 +184,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config index 1fc8f61a0..3c29f53a0 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config index 249ae7712..a517c8e18 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config @@ -6,7 +6,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config index 1fc8f61a0..3c29f53a0 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Web.config index c5ae93f4f..4cfbec819 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/Web.config @@ -45,7 +45,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj index 5f92927b8..5319c2a0c 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -68,8 +68,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config index c5ae93f4f..4cfbec819 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config @@ -45,7 +45,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config index 5b9210e80..a3d4cde84 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config @@ -8,7 +8,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj b/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj index 5eb6ee7f5..afa5289d6 100644 --- a/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj +++ b/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj @@ -151,8 +151,8 @@ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Web.config b/src/Orchard.Web/Modules/Orchard.OpenId/Web.config index 9e9001652..98425b2b5 100644 --- a/src/Orchard.Web/Modules/Orchard.OpenId/Web.config +++ b/src/Orchard.Web/Modules/Orchard.OpenId/Web.config @@ -52,7 +52,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/packages.config b/src/Orchard.Web/Modules/Orchard.OpenId/packages.config index c31b30987..e9c55374d 100644 --- a/src/Orchard.Web/Modules/Orchard.OpenId/packages.config +++ b/src/Orchard.Web/Modules/Orchard.OpenId/packages.config @@ -34,7 +34,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config index bfd903483..2d3dcbada 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config index 73b45df11..800fc2891 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Web.config b/src/Orchard.Web/Modules/Orchard.Pages/Web.config index 45d70d0cf..9fd17a016 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Pages/Web.config @@ -43,7 +43,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj index 2ef8e50c5..38c685714 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj @@ -65,8 +65,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj index 2cbf78b35..e45831354 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Orchard.Projections.Tests.csproj @@ -51,8 +51,8 @@ ..\..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - - ..\..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Services/FieldIndexServiceTests.cs b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Services/FieldIndexServiceTests.cs index 1107e7dcc..774857f78 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/Services/FieldIndexServiceTests.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/Services/FieldIndexServiceTests.cs @@ -12,6 +12,7 @@ using Orchard.ContentManagement.MetaData; using Orchard.ContentManagement.MetaData.Services; using Orchard.ContentManagement.Records; using Orchard.Core.Settings.Metadata; +using Orchard.Core.Settings.Metadata.Records; using Orchard.Data; using Orchard.Environment; using Orchard.Projections.Handlers; @@ -61,15 +62,21 @@ namespace Orchard.Projections.Tests.Services { protected override IEnumerable DatabaseTypes { get { return new[] { - typeof(ContentItemRecord), - typeof(ContentItemVersionRecord), - typeof(ContentTypeRecord), + typeof(ContentPartDefinitionRecord), + typeof(ContentPartFieldDefinitionRecord), + typeof(ContentFieldDefinitionRecord), + typeof(ContentTypeDefinitionRecord), + typeof(ContentTypePartDefinitionRecord), + + typeof(ContentItemRecord), + typeof(ContentItemVersionRecord), + typeof(ContentTypeRecord), + + typeof(FieldIndexPartRecord), - typeof(FieldIndexPartRecord), - - typeof(StringFieldIndexRecord), - typeof(IntegerFieldIndexRecord), - typeof(DecimalFieldIndexRecord), + typeof(StringFieldIndexRecord), + typeof(IntegerFieldIndexRecord), + typeof(DecimalFieldIndexRecord), typeof(DoubleFieldIndexRecord) }; } @@ -113,8 +120,6 @@ namespace Orchard.Projections.Tests.Services { SaveObject(0m); SaveObject(-42m); SaveObject(42m); - // SaveObject(decimal.MaxValue); - // SaveObject(decimal.MinValue); } [Test, Ignore("SqlCe exception")] diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config index 476eb41bd..2927415cd 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config @@ -4,7 +4,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config index d0e005618..64b6148de 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Web.config b/src/Orchard.Web/Modules/Orchard.Projections/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/packages.config index 66dabff13..1cef67cdb 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/packages.config @@ -7,7 +7,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config index 8e392454d..8eeeaee50 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config @@ -44,7 +44,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj index 7cf049358..6dec16547 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj +++ b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj @@ -59,8 +59,8 @@ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll @@ -175,4 +175,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Web.config b/src/Orchard.Web/Modules/Orchard.Redis/Web.config index 804fac07a..c6dd98bf1 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/packages.config b/src/Orchard.Web/Modules/Orchard.Redis/packages.config index 15b9d28a1..6dac1b0ba 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/packages.config @@ -3,8 +3,8 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Web.config b/src/Orchard.Web/Modules/Orchard.Resources/Web.config index 1421df6fc..bb5b97622 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Resources/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Web.config index fd7fac8e5..dea324b0a 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Web.config b/src/Orchard.Web/Modules/Orchard.Rules/Web.config index ac73c2da8..4d13d2ce6 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Rules/Web.config @@ -49,7 +49,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config index 804fac07a..c6dd98bf1 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config index 804fac07a..c6dd98bf1 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Search/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj index 51e773fc8..49c6c5f4a 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj @@ -65,8 +65,8 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/packages.config b/src/Orchard.Web/Modules/Orchard.Tags/packages.config index 66dabff13..1cef67cdb 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/packages.config @@ -7,7 +7,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config index 804fac07a..c6dd98bf1 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj index 3e2a0d5ff..a10e41975 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj @@ -68,8 +68,8 @@ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll @@ -339,4 +339,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config index 5b19f701e..3d088f813 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config @@ -49,7 +49,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config index be91ddb1b..026caa7c6 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config @@ -10,7 +10,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Web.config b/src/Orchard.Web/Modules/Orchard.Templates/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Templates/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config index 7b7999c59..eaf2794ee 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config @@ -8,7 +8,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Web.config index bd709488a..452a1702b 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Users/Web.config @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config index fd7fac8e5..dea324b0a 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config @@ -47,7 +47,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config index baf3b3125..9cdad18dd 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config @@ -46,7 +46,7 @@ - + diff --git a/src/Orchard.Web/Modules/SysCache/SysCache.csproj b/src/Orchard.Web/Modules/SysCache/SysCache.csproj index 5f90a2dcc..4314b76bd 100644 --- a/src/Orchard.Web/Modules/SysCache/SysCache.csproj +++ b/src/Orchard.Web/Modules/SysCache/SysCache.csproj @@ -57,8 +57,8 @@ ..\..\..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\NHibernate.Caches.SysCache2.5.7.0\lib\net461\NHibernate.Caches.SysCache2.dll @@ -150,4 +150,4 @@ - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/SysCache/Web.config b/src/Orchard.Web/Modules/SysCache/Web.config index 804fac07a..c6dd98bf1 100644 --- a/src/Orchard.Web/Modules/SysCache/Web.config +++ b/src/Orchard.Web/Modules/SysCache/Web.config @@ -41,7 +41,7 @@ - + diff --git a/src/Orchard.Web/Modules/SysCache/packages.config b/src/Orchard.Web/Modules/SysCache/packages.config index af2d30f46..ca3e26a14 100644 --- a/src/Orchard.Web/Modules/SysCache/packages.config +++ b/src/Orchard.Web/Modules/SysCache/packages.config @@ -2,8 +2,8 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/TinyMce/Web.config b/src/Orchard.Web/Modules/TinyMce/Web.config index c5ae93f4f..4cfbec819 100644 --- a/src/Orchard.Web/Modules/TinyMce/Web.config +++ b/src/Orchard.Web/Modules/TinyMce/Web.config @@ -45,7 +45,7 @@ - + diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj index 07c589a7e..900e693ef 100644 --- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj +++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj @@ -67,8 +67,8 @@ ..\..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\..\..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\..\..\packages\Remotion.Linq.2.2.0\lib\net45\Remotion.Linq.dll diff --git a/src/Orchard.Web/Modules/Upgrade/Web.config b/src/Orchard.Web/Modules/Upgrade/Web.config index cabf22b0a..4e0ef49bf 100644 --- a/src/Orchard.Web/Modules/Upgrade/Web.config +++ b/src/Orchard.Web/Modules/Upgrade/Web.config @@ -52,7 +52,7 @@ - + diff --git a/src/Orchard.Web/Modules/Upgrade/packages.config b/src/Orchard.Web/Modules/Upgrade/packages.config index be91ddb1b..026caa7c6 100644 --- a/src/Orchard.Web/Modules/Upgrade/packages.config +++ b/src/Orchard.Web/Modules/Upgrade/packages.config @@ -10,7 +10,7 @@ - + - + \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config index 56c5fed51..04606345a 100644 --- a/src/Orchard.Web/Themes/Web.config +++ b/src/Orchard.Web/Themes/Web.config @@ -69,7 +69,7 @@ - + diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index ef5423694..f09cefc7d 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -166,7 +166,7 @@ - + diff --git a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs index 3fc6ba098..15eb5b0cc 100644 --- a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs +++ b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs @@ -4,12 +4,12 @@ using System.Data; using System.Linq; using System.Reflection; using NHibernate.Cfg; +using NHibernate.Dialect; using NHibernate.Mapping; using NHibernate.Tool.hbm2ddl; using Orchard.ContentManagement.Records; using Orchard.Data.Migration.Schema; using Orchard.Data.Providers; -using NHibernate.Dialect; using Orchard.Environment.Configuration; using Orchard.Environment.Descriptor.Models; using Orchard.Environment.Extensions; @@ -65,8 +65,7 @@ namespace Orchard.Data.Migration.Generator { .CreateProvider(parameters) .BuildConfiguration(parameters); - Dialect.GetDialect(configuration.Properties); - var mapping = configuration.BuildMapping(); + var mapping = configuration.BuildMapping(Dialect.GetDialect(configuration.Properties)); // get the table mappings using reflection var tablesField = typeof(Configuration).GetField("tables", BindingFlags.Instance | BindingFlags.NonPublic); diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 7058ad861..a0c6e6811 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -89,8 +89,8 @@ ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\packages\NHibernate.5.3.10\lib\net461\NHibernate.dll + + ..\packages\NHibernate.5.5.2\lib\net48\NHibernate.dll ..\packages\Owin.1.0\lib\net40\Owin.dll diff --git a/src/Orchard/app.config b/src/Orchard/app.config index 3fd87506f..2caadd0a4 100644 --- a/src/Orchard/app.config +++ b/src/Orchard/app.config @@ -12,7 +12,7 @@ - + diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config index 393d47a22..38f17ba70 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -16,7 +16,7 @@ - +