diff --git a/src/Libraries/NHibernate/NHibernate.Linq/NHibernate.Linq.csproj b/src/Libraries/NHibernate/NHibernate.Linq/NHibernate.Linq.csproj index 46467801f7..a2a7ae2064 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 55205e415a..0272a28bd4 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 476eb41bda..2927415cd6 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 2461eee039..1d7e7a8d19 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 4234cf1089..d62c1d94df 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 a544d8735e..05fd3dbfc4 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 3056790e67..e9001edd60 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 d7cfa4c7a5..ad28f8a8d0 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 80a963eaa6..5b5fb8eb1e 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 0d49cfd2b5..739f040576 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 94cf64b5b5..96a3118e4b 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.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 @@ protected override IEnumerable DatabaseTypes { 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 4d4d2ef2ba..8a741ae95a 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.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 @@ public void InitFixture() { 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 3f92ffee23..1d4200932a 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.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 @@ public void InitFixture() { 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 abe8f3750f..8761f11fd5 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 80a963eaa6..5b5fb8eb1e 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 45997c7290..bb4fb0a0ba 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 3e3ef3bd83..6ee2a30511 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 05c053f565..852be14acd 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 2eabcffc1c..6b9da3ebcc 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 131a9f7003..c87ba8fa2b 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 bc01c37ece..1cef67cdb6 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 f814c23d82..3215ec1d9c 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 c14ba28de2..021881754e 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 baf3b31252..9cdad18dd9 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 c14ba28de2..021881754e 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 baf3b31252..9cdad18dd9 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 612956cc63..1a7ed2921d 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 cf2080640f..886615a940 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 3dbda71a71..78064ba381 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 7f4a0f97dc..286b6a3636 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 ab5b25bdee..1dadbf9121 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 2b930bf229..4518ccc6e7 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 670821743e..b6e0e3c005 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 1eff9ded43..b6e406e944 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 af1baefa51..301cd0ebaf 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 909cc51f83..74217dd579 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 baf3b31252..9cdad18dd9 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 1fc8f61a05..3c29f53a0b 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 48c8a20312..9c9138f73c 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 1fc8f61a05..3c29f53a0b 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 c4ebc5c277..eb2d44373c 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 b4b1cf0de0..35c44cb968 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 baf3b31252..9cdad18dd9 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 55074b5e1d..ad8f38d6d8 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 baf3b31252..9cdad18dd9 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 66dabff130..1cef67cdb6 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 74130ebcee..e3c576d0f4 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 baf3b31252..9cdad18dd9 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 baf3b31252..9cdad18dd9 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 c6b0cd12fc..7eeb910d7a 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 68ff8758d7..24e0acd0f3 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 a80a92b245..9760b6016a 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 fd7fac8e5c..dea324b0a7 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 541deb171a..9491d18ba9 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 73a184e136..8cc81895f1 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 c2a9841a04..3d96c1ede5 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 0ad5a74421..50bf8f144e 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 75ffcd1bc7..d270e01bdb 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 5f204e774d..4b884e0c57 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 77a07832d6..7040ee997c 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 baf3b31252..9cdad18dd9 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 5b9210e80c..a3d4cde84a 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 baf3b31252..9cdad18dd9 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 fd7fac8e5c..dea324b0a7 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 f3b8995224..ee7f9fc2ca 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 baf3b31252..9cdad18dd9 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 baf3b31252..9cdad18dd9 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 baf3b31252..9cdad18dd9 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 7d2afd9d06..cb0d6575f4 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 68ff8758d7..24e0acd0f3 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 baf3b31252..9cdad18dd9 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 baf3b31252..9cdad18dd9 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 1a7796588a..e6184174c7 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 1fc8f61a05..3c29f53a0b 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 249ae77123..a517c8e185 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 1fc8f61a05..3c29f53a0b 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 c5ae93f4f3..4cfbec8191 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 5f92927b8d..5319c2a0c3 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 c5ae93f4f3..4cfbec8191 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 5b9210e80c..a3d4cde84a 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 5eb6ee7f5f..afa5289d65 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 9e9001652e..98425b2b55 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 c31b309870..e9c55374dc 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 bfd9034831..2d3dcbada6 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 73b45df114..800fc2891c 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 45d70d0cf3..9fd17a016b 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 2ef8e50c54..38c6857143 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 2cbf78b35d..e458313543 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 1107e7dcc6..774857f789 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.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 @@ public override void Init() { protected override IEnumerable DatabaseTypes { get { return new[] { - typeof(ContentItemRecord), - typeof(ContentItemVersionRecord), - typeof(ContentTypeRecord), - - typeof(FieldIndexPartRecord), + typeof(ContentPartDefinitionRecord), + typeof(ContentPartFieldDefinitionRecord), + typeof(ContentFieldDefinitionRecord), + typeof(ContentTypeDefinitionRecord), + typeof(ContentTypePartDefinitionRecord), + + typeof(ContentItemRecord), + typeof(ContentItemVersionRecord), + typeof(ContentTypeRecord), + + typeof(FieldIndexPartRecord), - typeof(StringFieldIndexRecord), - typeof(IntegerFieldIndexRecord), - typeof(DecimalFieldIndexRecord), + typeof(StringFieldIndexRecord), + typeof(IntegerFieldIndexRecord), + typeof(DecimalFieldIndexRecord), typeof(DoubleFieldIndexRecord) }; } @@ -113,8 +120,6 @@ public void DecimalValuesShouldBePersisted() { 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 476eb41bda..2927415cd6 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 d0e0056181..64b6148de0 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 baf3b31252..9cdad18dd9 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 66dabff130..1cef67cdb6 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 baf3b31252..9cdad18dd9 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 8e392454df..8eeeaee506 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 7cf0493581..6dec165476 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 804fac07ab..c6dd98bf10 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 15b9d28a1d..6dac1b0bae 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 1421df6fca..bb5b97622f 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 fd7fac8e5c..dea324b0a7 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 ac73c2da8b..4d13d2ce68 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 baf3b31252..9cdad18dd9 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 804fac07ab..c6dd98bf10 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 804fac07ab..c6dd98bf10 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 baf3b31252..9cdad18dd9 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 baf3b31252..9cdad18dd9 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 baf3b31252..9cdad18dd9 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 51e773fc85..49c6c5f4a1 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 baf3b31252..9cdad18dd9 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 66dabff130..1cef67cdb6 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 804fac07ab..c6dd98bf10 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 3e2a0d5ffa..a10e41975d 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 5b19f701e8..3d088f8136 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 be91ddb1b0..026caa7c6d 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 baf3b31252..9cdad18dd9 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 baf3b31252..9cdad18dd9 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 7b7999c59e..eaf2794eec 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 baf3b31252..9cdad18dd9 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 bd709488a1..452a1702b1 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 baf3b31252..9cdad18dd9 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 baf3b31252..9cdad18dd9 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 fd7fac8e5c..dea324b0a7 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 baf3b31252..9cdad18dd9 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 5f90a2dcc6..4314b76bdd 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 804fac07ab..c6dd98bf10 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 af2d30f46b..ca3e26a147 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 c5ae93f4f3..4cfbec8191 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 07c589a7e8..900e693efe 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 cabf22b0a8..4e0ef49bf4 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 be91ddb1b0..026caa7c6d 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 56c5fed513..04606345a6 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 ef54236949..f09cefc7d0 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 3fc6ba0982..15eb5b0cce 100644 --- a/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs +++ b/src/Orchard/Data/Migration/Generator/SchemaCommandGenerator.cs @@ -4,12 +4,12 @@ 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 @@ public IEnumerable GetCreateFeatureCommands(string feature, bool .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 7058ad861d..a0c6e68112 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 3fd87506f8..2caadd0a40 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 393d47a227..38f17ba706 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -16,7 +16,7 @@ - +