diff --git a/CalculateBindingRedirects.ps1 b/CalculateBindingRedirects.ps1 new file mode 100644 index 000000000..45f279b3f --- /dev/null +++ b/CalculateBindingRedirects.ps1 @@ -0,0 +1,34 @@ +[Reflection.Assembly]::LoadWithPartialName("System.Xml") | Out-Null +[Reflection.Assembly]::LoadWithPartialName("System.Xml.Linq") | Out-Null +[System.Xml.Linq.XNamespace]$ns1 = "urn:schemas-microsoft-com:asm.v1" + +$currentPath = (Get-Item -Path ".\").FullName +$orchardWebConfigFullPath = $currentPath+"\src\Orchard.Web\Web.Config" +[XML] $orchardWebConfig = Get-Content ($orchardWebConfigFullPath) +$configFiles = Get-ChildItem -Path ($currentPath +"\src\") -Filter web.config -Recurse -ErrorAction SilentlyContinue -Force +foreach ($configFile in $configFiles) { + $configFullPath = $configFile.FullName + Write-Host "Processing $configFullPath ..." + + if ($configFullPath.ToLower().EndsWith("\orchard.web\web.config")) { #skip orchard.web config files + continue + } + [XML] $projectWebConfig = Get-Content ($configFullPath) + $elements = $projectWebConfig.configuration.runtime.assemblyBinding.dependentAssembly + foreach ($element in $elements){ + Write-Host "Checking" $element.assemblyIdentity.name + $hasBinding = $orchardWebConfig.configuration.runtime.assemblyBinding.dependentAssembly.assemblyIdentity.Where({ $_.name -eq $element.assemblyIdentity.name -and $_.publicKeyToken -eq $element.assemblyIdentity.publicKeyToken -and $_.culture -eq $element.assemblyIdentity.culture }, 'First').Count -gt 0 + if (-not $hasBinding){ + # add the node in $webConfig + Write-Host "Adding" $element.assemblyIdentity.name + $newNode = $orchardWebConfig.ImportNode($element, $true); + $orchardWebConfig.configuration.runtime.assemblyBinding.AppendChild($newNode) + Write-Host "Added " $element.assemblyIdentity.name + } else { + Write-Host "Skipped" $element.assemblyIdentity.name + } + } + Write-Host "Processed $configFullPath ..." +} + +$orchardWebConfig.Save($orchardWebConfigFullPath) diff --git a/src/Orchard.Azure.Tests/App.config b/src/Orchard.Azure.Tests/App.config index 36179d1b2..0c21c1d2b 100644 --- a/src/Orchard.Azure.Tests/App.config +++ b/src/Orchard.Azure.Tests/App.config @@ -31,6 +31,18 @@ + + + + + + + + + + + + diff --git a/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj b/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj index 33759550d..376a17b3f 100644 --- a/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj +++ b/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj @@ -10,7 +10,7 @@ Properties Orchard.Azure.Tests Orchard.Azure.Tests - v4.6.1 + v4.8 512 @@ -57,6 +57,9 @@ false + + ..\packages\log4net.2.0.12\lib\net45\log4net.dll + ..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll True @@ -86,8 +89,7 @@ True - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll diff --git a/src/Orchard.Azure.Tests/packages.config b/src/Orchard.Azure.Tests/packages.config index 8275a0a90..e71757d0a 100644 --- a/src/Orchard.Azure.Tests/packages.config +++ b/src/Orchard.Azure.Tests/packages.config @@ -1,12 +1,13 @@  - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.Core.Tests/App.config b/src/Orchard.Core.Tests/App.config index 44b2c2740..1d39b06b2 100644 --- a/src/Orchard.Core.Tests/App.config +++ b/src/Orchard.Core.Tests/App.config @@ -18,6 +18,14 @@ + + + + + + + + - \ No newline at end of file + diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index e77ed83d5..2d681498d 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -10,7 +10,7 @@ Properties Orchard.Core.Tests Orchard.Core.Tests - v4.6.1 + v4.8 512 @@ -100,25 +100,25 @@ 3.5 - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll 3.5 - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll diff --git a/src/Orchard.Core.Tests/packages.config b/src/Orchard.Core.Tests/packages.config index 454b993f6..281af0b9a 100644 --- a/src/Orchard.Core.Tests/packages.config +++ b/src/Orchard.Core.Tests/packages.config @@ -1,13 +1,13 @@  - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.Profile/App.config b/src/Orchard.Profile/App.config index f245e4f30..f40de4fce 100644 --- a/src/Orchard.Profile/App.config +++ b/src/Orchard.Profile/App.config @@ -7,4 +7,5 @@ - \ No newline at end of file + + diff --git a/src/Orchard.Profile/Orchard.Profile.csproj b/src/Orchard.Profile/Orchard.Profile.csproj index 3fbd2acff..7bb3d6da7 100644 --- a/src/Orchard.Profile/Orchard.Profile.csproj +++ b/src/Orchard.Profile/Orchard.Profile.csproj @@ -10,7 +10,7 @@ Properties Orchard.Profile Orchard.Profile - v4.6.1 + v4.8 512 @@ -142,4 +142,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Profile/packages.config b/src/Orchard.Profile/packages.config index da65d4008..c269027a4 100644 --- a/src/Orchard.Profile/packages.config +++ b/src/Orchard.Profile/packages.config @@ -1,5 +1,5 @@  - - - \ No newline at end of file + + + diff --git a/src/Orchard.Specs/App.Config b/src/Orchard.Specs/App.Config index 298c66f98..d13741e46 100644 --- a/src/Orchard.Specs/App.Config +++ b/src/Orchard.Specs/App.Config @@ -5,7 +5,7 @@ - + @@ -26,16 +26,24 @@ + + + + + + + + - + - + - \ No newline at end of file + diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config index aae1f8b80..ee374d515 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config @@ -11,13 +11,13 @@ - + - + diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config index 4e47f2823..bbec2d93f 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config @@ -18,18 +18,18 @@ To change this behavior apply the ValidateInputAttribute to a controller or action. --> - + - + - + - + diff --git a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config index d0e182bad..0f21714a7 100644 --- a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config +++ b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config @@ -8,7 +8,6 @@
- @@ -17,9 +16,8 @@ - - + @@ -33,34 +31,31 @@ - - - - + - + - + - + @@ -113,7 +108,6 @@ - @@ -162,109 +156,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Specs/Hosting/Simple.Web/Web.config b/src/Orchard.Specs/Hosting/Simple.Web/Web.config index f97ce9bd1..c5c75ff1a 100644 --- a/src/Orchard.Specs/Hosting/Simple.Web/Web.config +++ b/src/Orchard.Specs/Hosting/Simple.Web/Web.config @@ -1,5 +1,4 @@ - - - @@ -24,12 +21,10 @@ machine.config.comments usually located in - - - \ No newline at end of file + diff --git a/src/Orchard.Specs/packages.config b/src/Orchard.Specs/packages.config index a368c0c97..4e36423e3 100644 --- a/src/Orchard.Specs/packages.config +++ b/src/Orchard.Specs/packages.config @@ -1,20 +1,17 @@  - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/src/Orchard.Tests.Modules/App.config b/src/Orchard.Tests.Modules/App.config index 2f50a9549..a9ecc2457 100644 --- a/src/Orchard.Tests.Modules/App.config +++ b/src/Orchard.Tests.Modules/App.config @@ -10,13 +10,13 @@ - + - + @@ -34,6 +34,14 @@ + + + + + + + + diff --git a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj index 5a5f812b3..e2c999fb2 100644 --- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj +++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj @@ -10,7 +10,7 @@ Properties Orchard.Tests.Modules Orchard.Tests.Modules - v4.6.1 + v4.8 512 @@ -61,91 +61,70 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll - True + + + ..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll - True ..\packages\Orchard.FluentPath.1.0.0.1\lib\FluentPath.dll - True - - ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True + + ..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True - - - ..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll - True ..\packages\IronRuby.1.1.3\lib\IronRuby.dll - True ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.dll - True ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.Yaml.dll - True ..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True ..\packages\IronRuby.1.1.3\lib\Microsoft.Dynamic.dll - True ..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.dll - True ..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.Metadata.dll - True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\packages\Moq.4.2.1510.2205\lib\NET40\Moq.dll - True + ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True ..\packages\Orchard.NuGet.Core.1.1.0.0\lib\NuGet.Core.dll - True ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - True ..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - True ..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll - True @@ -162,31 +141,25 @@ - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll 3.5 - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll 3.5 diff --git a/src/Orchard.Tests.Modules/Packaging/Services/Hello.World.csproj.txt b/src/Orchard.Tests.Modules/Packaging/Services/Hello.World.csproj.txt index 557281a0d..5d1f98d70 100644 --- a/src/Orchard.Tests.Modules/Packaging/Services/Hello.World.csproj.txt +++ b/src/Orchard.Tests.Modules/Packaging/Services/Hello.World.csproj.txt @@ -50,7 +50,7 @@ 3.5 - + False ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll diff --git a/src/Orchard.Tests.Modules/packages.config b/src/Orchard.Tests.Modules/packages.config index d483a8461..5b87e0145 100644 --- a/src/Orchard.Tests.Modules/packages.config +++ b/src/Orchard.Tests.Modules/packages.config @@ -1,21 +1,21 @@  - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.Tests/App.config b/src/Orchard.Tests/App.config index 2f50a9549..a9ecc2457 100644 --- a/src/Orchard.Tests/App.config +++ b/src/Orchard.Tests/App.config @@ -10,13 +10,13 @@ - + - + @@ -34,6 +34,14 @@ + + + + + + + + diff --git a/src/Orchard.Tests/Environment/RunningShellTableTests.cs b/src/Orchard.Tests/Environment/RunningShellTableTests.cs index 0d5097128..88fe962a5 100644 --- a/src/Orchard.Tests/Environment/RunningShellTableTests.cs +++ b/src/Orchard.Tests/Environment/RunningShellTableTests.cs @@ -128,9 +128,10 @@ namespace Orchard.Tests.Environment { var settingsG = new ShellSettings { Name = "Gamma", RequestUrlHost = "wiki.example.com" }; var settingsD = new ShellSettings { Name = "Delta", RequestUrlPrefix = "Quux" }; table.Add(settings); + // add this shell first, because the order the shells where processed used to matter + table.Add(settingsG); table.Add(settingsA); table.Add(settingsB); - table.Add(settingsG); table.Add(settingsD); Assert.That(table.Match(new StubHttpContext("~/foo/bar", "wiki.example.com")), Is.EqualTo(settingsA).Using(new ShellComparer())); diff --git a/src/Orchard.Tests/Orchard.Framework.Tests.csproj b/src/Orchard.Tests/Orchard.Framework.Tests.csproj index 20daecf3f..7d971ba4c 100644 --- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj +++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -10,7 +11,7 @@ Properties Orchard.Tests Orchard.Framework.Tests - v4.6.1 + v4.8 512 @@ -32,6 +33,8 @@ false true + + true @@ -61,79 +64,61 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\packages\Autofac.Web.3.2.0\lib\net40\Autofac.Integration.Web.dll - True ..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll - True ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll - True ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\packages\IronRuby.1.1.3\lib\IronRuby.dll - True ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.dll - True ..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.Yaml.dll - True - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True + + ..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\packages\IronRuby.1.1.3\lib\Microsoft.Dynamic.dll - True ..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.dll - True ..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.Metadata.dll - True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\packages\Moq.4.2.1510.2205\lib\NET40\Moq.dll - True + ..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True ..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll - True ..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll - True ..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll - True @@ -149,9 +134,8 @@ True - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll 3.0 @@ -161,35 +145,28 @@ 3.5 - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll 3.5 - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -458,4 +435,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/Orchard.Tests/packages.config b/src/Orchard.Tests/packages.config index 740d483d7..f55f8de5b 100644 --- a/src/Orchard.Tests/packages.config +++ b/src/Orchard.Tests/packages.config @@ -1,20 +1,21 @@  - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj b/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj index c22e7e2b7..98b48abfe 100644 --- a/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj +++ b/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard.WarmupStarter Orchard.WarmupStarter - v4.6.1 + v4.8 512 @@ -55,4 +55,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj index cbb022280..9e91d3dee 100644 --- a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj +++ b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj @@ -10,7 +10,7 @@ Properties Orchard.Web.Tests Orchard.Web.Tests - v4.6.1 + v4.8 512 @@ -132,4 +132,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Web.Tests/app.config b/src/Orchard.Web.Tests/app.config index 95c75a3e0..70bcde886 100644 --- a/src/Orchard.Web.Tests/app.config +++ b/src/Orchard.Web.Tests/app.config @@ -18,10 +18,22 @@ + + + + + + + + + + + + - + - \ No newline at end of file + diff --git a/src/Orchard.Web.Tests/packages.config b/src/Orchard.Web.Tests/packages.config index c3a3b9b5d..47ff0bc51 100644 --- a/src/Orchard.Web.Tests/packages.config +++ b/src/Orchard.Web.Tests/packages.config @@ -1,6 +1,6 @@  - - - - \ No newline at end of file + + + + diff --git a/src/Orchard.Web/Core/Common/Migrations.cs b/src/Orchard.Web/Core/Common/Migrations.cs index 654ffb826..ff4e0bb45 100644 --- a/src/Orchard.Web/Core/Common/Migrations.cs +++ b/src/Orchard.Web/Core/Common/Migrations.cs @@ -34,6 +34,18 @@ namespace Orchard.Core.Common { table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_{nameof(CommonPartRecord.CreatedUtc)}", nameof(CommonPartRecord.CreatedUtc)); table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_{nameof(CommonPartRecord.ModifiedUtc)}", nameof(CommonPartRecord.ModifiedUtc)); table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_{nameof(CommonPartRecord.PublishedUtc)}", nameof(CommonPartRecord.PublishedUtc)); + // This originally in UpdateFrom7 + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_Container_id","Container_id"); + // This originally in UpdateFrom8 + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByCreation", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.CreatedUtc)); + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByModification", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.ModifiedUtc)); + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByPublication", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.PublishedUtc)); }); SchemaBuilder @@ -67,8 +79,8 @@ namespace Orchard.Core.Common { ContentDefinitionManager.AlterPartDefinition("IdentityPart", builder => builder .Attachable() .WithDescription("Automatically generates a unique identity for the content item, which is required in import/export scenarios where one content item references another.")); - - return 7; + + return 9; } public int UpdateFrom1() { @@ -158,5 +170,46 @@ namespace Orchard.Core.Common { return 8; } + + public int UpdateFrom8() { + // Studying SQL Server query execution plans we noticed that when the system + // tries to find content items for requests such as + // "The items of type TTT owned by me, ordered from the most recent" + // the existing indexes are not used. SQL Server does an index scan on the + // Primary key for CommonPartRecord. This may lead to annoying deadlocks when + // there are two concurrent transactions that are doing both this kind of query + // as well as an update (or insert) in the CommonPartRecord. + // Tests show that this can be easily fixed by adding a non-clustered index + // with these keys: OwnerId, {one of PublishedUTC, ModifiedUTC, CreatedUTC}. + // That means we need three indexes (one for each DateTime) to support ordering + // on either of them. + + // The queries we analyzed look like (in pseudo sql) + // SELECT TOP (N) * + // FROM + // ContentItemVersionRecord this_ + // inner join ContentItemRecord contentite1_ on this_.ContentItemRecord_id=contentite1_.Id + // inner join CommonPartRecord commonpart2_ on contentite1_.Id=commonpart2.Id + // left outer join ContentTypeRecord contenttyp6_ on contentite1_.ContentType_id=contenttyp6_.Id + // WHERE + // contentite1.ContentType_id = {TTT} + // and commonpart2_.OwnerId = {userid} + // and this_.Published = 1 + // ORDER BY + // commonpart2_PublishedUtc desc + + SchemaBuilder.AlterTable(nameof(CommonPartRecord), table => { + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByCreation", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.CreatedUtc)); + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByModification", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.ModifiedUtc)); + table.CreateIndex($"IDX_{nameof(CommonPartRecord)}_OwnedBy_ByPublication", + nameof(CommonPartRecord.OwnerId), + nameof(CommonPartRecord.PublishedUtc)); + }); + return 9; + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 8ba7ab439..a8e3e4228 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Core Orchard.Core - v4.6.1 + v4.8 false @@ -73,22 +74,22 @@ - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -659,5 +660,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + - \ No newline at end of file + diff --git a/src/Orchard.Web/Core/Web.config b/src/Orchard.Web/Core/Web.config index e3790dc3a..e7ff32b0a 100644 --- a/src/Orchard.Web/Core/Web.config +++ b/src/Orchard.Web/Core/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,14 @@ - - - - - - - + - + @@ -46,7 +40,6 @@ - @@ -62,20 +55,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Core/packages.config b/src/Orchard.Web/Core/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Core/packages.config +++ b/src/Orchard.Web/Core/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Lucene/Lucene.csproj b/src/Orchard.Web/Modules/Lucene/Lucene.csproj index 55fc8ca44..e8e23cd63 100644 --- a/src/Orchard.Web/Modules/Lucene/Lucene.csproj +++ b/src/Orchard.Web/Modules/Lucene/Lucene.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Lucene Lucene - v4.6.1 + v4.8 false false @@ -54,22 +55,18 @@ false - - ..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - True + + ..\..\..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll ..\..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -79,28 +76,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -138,16 +129,15 @@ Designer - - - - + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -180,4 +170,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Lucene/Web.config b/src/Orchard.Web/Modules/Lucene/Web.config index 45aa28208..a15b1d53f 100644 --- a/src/Orchard.Web/Modules/Lucene/Web.config +++ b/src/Orchard.Web/Modules/Lucene/Web.config @@ -7,7 +7,7 @@ - + @@ -25,26 +25,20 @@ - - - - - - + - + - @@ -60,8 +54,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Lucene/packages.config b/src/Orchard.Web/Modules/Lucene/packages.config index ba3ef38be..430c6cf5b 100644 --- a/src/Orchard.Web/Modules/Lucene/packages.config +++ b/src/Orchard.Web/Modules/Lucene/packages.config @@ -1,10 +1,10 @@  - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Markdown/Markdown.csproj b/src/Orchard.Web/Modules/Markdown/Markdown.csproj index d2f55aa7c..487906453 100644 --- a/src/Orchard.Web/Modules/Markdown/Markdown.csproj +++ b/src/Orchard.Web/Modules/Markdown/Markdown.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Markdown Markdown - v4.6.1 + v4.8 false @@ -54,48 +55,53 @@ false - - ..\..\..\packages\Markdig.Signed.0.18.0\lib\net40\Markdig.Signed.dll + + ..\..\..\packages\Markdig.Signed.0.22.1\lib\net452\Markdig.Signed.dll ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -182,7 +188,7 @@ - + 10.0 @@ -228,4 +234,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Markdown/Web.config b/src/Orchard.Web/Modules/Markdown/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Markdown/Web.config +++ b/src/Orchard.Web/Modules/Markdown/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Markdown/packages.config b/src/Orchard.Web/Modules/Markdown/packages.config index 3f81f03ed..ce060fffd 100644 --- a/src/Orchard.Web/Modules/Markdown/packages.config +++ b/src/Orchard.Web/Modules/Markdown/packages.config @@ -1,9 +1,13 @@  - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs b/src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs index ff6c7471b..ce27e81c2 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs +++ b/src/Orchard.Web/Modules/Orchard.Alias/Implementation/DefaultAliasService.cs @@ -28,7 +28,7 @@ namespace Orchard.Alias.Implementation { } public RouteValueDictionary Get(string aliasPath) { - return _aliasStorage.Get(aliasPath).ToRouteValueDictionary(); + return _aliasStorage.Get(aliasPath)?.ToRouteValueDictionary(); } public void Set(string aliasPath, RouteValueDictionary routeValues, string aliasSource, bool isManaged) { diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj b/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj index b1338e8ce..9758cd737 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj +++ b/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Alias Orchard.Alias - v4.6.1 + v4.8 false @@ -54,14 +55,12 @@ false - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True + ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -76,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -157,7 +150,7 @@ - + 10.0 @@ -203,4 +196,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Web.config b/src/Orchard.Web/Modules/Orchard.Alias/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Alias/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Alias/packages.config b/src/Orchard.Web/Modules/Orchard.Alias/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Alias/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj index ee0b5beb2..acc75aa8f 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.AntiSpam Orchard.AntiSpam - v4.6.1 + v4.8 false @@ -27,6 +28,8 @@ + + true @@ -54,15 +57,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -77,29 +78,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -212,7 +207,7 @@ - + 10.0 @@ -258,4 +253,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config index e96ab82af..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config +++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj index 5ac653363..6d1ff64dd 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.ArchiveLater Orchard.ArchiveLater - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -71,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -142,7 +135,7 @@ - + 10.0 @@ -176,4 +169,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config b/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj index e941bb916..0c8bb6ef3 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.AuditTrail Orchard.AuditTrail - v4.6.1 + v4.8 false @@ -26,6 +27,8 @@ + + true @@ -53,23 +56,19 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -84,40 +83,32 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll ..\..\..\packages\XMLDiffPatch.1.0.8.28\lib\net\XmlDiffPatch.dll - True ..\..\..\packages\XMLDiffPatch.1.0.8.28\lib\net\XmlDiffPatch.View.dll - True @@ -364,7 +355,7 @@ - + 10.0 @@ -410,4 +401,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config index 56673ba25..5d9ad0c4b 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -46,7 +41,6 @@ - @@ -62,8 +56,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config index d589df1cd..b422b9627 100644 --- a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config +++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config @@ -1,12 +1,12 @@  - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj index fffbf0add..4e92696e3 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Autoroute Orchard.Autoroute - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -76,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -178,7 +171,7 @@ - + 10.0 @@ -224,4 +217,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs index c7cc85ab1..0e72d5a8d 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs @@ -208,25 +208,52 @@ namespace Orchard.Autoroute.Services { } public bool ProcessPath(AutoroutePart part) { - var parthWithSamePath = _contentManager.Query() - .Where(p => p.DisplayAlias != null && p.DisplayAlias.Equals(part.Path, StringComparison.InvariantCultureIgnoreCase) - && p.ContentItemRecord.Id != part.Id) - .Count(); - if (parthWithSamePath > 0) { - var pathsLikeThis = GetSimilarPaths(part.Path).ToArray(); - - // Don't include *this* part in the list - // of slugs to consider for conflict detection. - pathsLikeThis = pathsLikeThis.Where(p => p.ContentItem.Id != part.ContentItem.Id).ToArray(); - - if (pathsLikeThis.Any()) { - var originalPath = part.Path; - var newPath = GenerateUniqueSlug(part, pathsLikeThis.Select(p => p.Path)); - part.DisplayAlias = newPath; - - if (originalPath != newPath) - return false; + // Try to get the path from the alias service + var pathRoute = _aliasService.Get(part.Path); + // If we got a route that matches that path + if (pathRoute != null) { + // and that route matches the route for the content item + var itemRoute = _contentManager.GetItemMetadata(part).DisplayRouteValues; + if (itemRoute != null + && pathRoute.Count == itemRoute.Count + && pathRoute.All(x => + // ensure value exists in the other dictionary + itemRoute[x.Key] != null + && x.Value.ToString() + // compare them as strings + .Equals(itemRoute[x.Key].ToString(), StringComparison.InvariantCultureIgnoreCase))) { + // then the path is fine as it is + return true; } + // How does the above behave in different cases: + // 1. Part with new original path + // The route is not found among the aliases, so processing for it falls + // back to the original code below. + // 2. Path hasn't changed + // If the item is Published, the code above finds it among the aliases + // and this method ends. + // 3. Path is not original (there would be a collision) + // We find from the aliases the item the path points to. Comparing routes, + // we discover they do not match and fall back to the original code below. + // This code branch is basically a short circuit for the case where a ContentItem + // is being updated or published without changes to its path. Hence, it does not + // fix all issues we have with AutoroutePart and concurrency, but it is an + // attempt at mitigating them by preventing database operations in some cases. + } + + var pathsLikeThis = GetSimilarPaths(part.Path).ToArray(); + + // Don't include *this* part in the list + // of slugs to consider for conflict detection. + pathsLikeThis = pathsLikeThis.Where(p => p.ContentItem.Id != part.ContentItem.Id).ToArray(); + + if (pathsLikeThis.Any()) { + var originalPath = part.Path; + var newPath = GenerateUniqueSlug(part, pathsLikeThis.Select(p => p.Path)); + part.DisplayAlias = newPath; + + if (originalPath != newPath) + return false; } return true; } diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config index c29d295e1..08efe11cd 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config @@ -7,7 +7,7 @@ - + @@ -24,19 +24,14 @@ - - - - - - + - + @@ -44,7 +39,6 @@ - @@ -60,8 +54,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config b/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + 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 45c9d002f..a6448592a 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 @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Azure.MediaServices Orchard.Azure.MediaServices - v4.6.1 + v4.8 false @@ -26,6 +27,8 @@ + + true @@ -53,36 +56,28 @@ ..\..\..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll - True - - ..\..\..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll - True + + ..\..\..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll - True ..\..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll - True ..\..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll - True ..\..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.2.4\lib\net451\Microsoft.IdentityModel.JsonWebTokens.dll @@ -95,42 +90,33 @@ ..\..\..\packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True ..\..\..\packages\Orchard.WindowsAzure.Diagnostics.2.7.0.0\lib\Microsoft.WindowsAzure.Diagnostics.dll - True ..\..\..\packages\windowsazure.mediaservices.3.4.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.dll - True ..\..\..\packages\windowsazure.mediaservices.3.4.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.Common.BlobTransfer.dll - True ..\..\..\packages\windowsazure.mediaservices.3.4.0.0\lib\net45\Microsoft.WindowsAzure.MediaServices.Client.Common.FileEncryption.dll - True ..\..\..\packages\WindowsAzure.Storage.5.0.2\lib\net40\Microsoft.WindowsAzure.Storage.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -141,9 +127,9 @@ ..\..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\net451\System.IdentityModel.Tokens.Jwt.dll + ..\..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll - True @@ -152,29 +138,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -553,7 +533,7 @@ - + @@ -609,4 +589,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Tests/Microsoft.CloudMedia.Tests/Microsoft.CloudMedia.Tests.csproj b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Tests/Microsoft.CloudMedia.Tests/Microsoft.CloudMedia.Tests.csproj index c359b213b..a35cee52c 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Tests/Microsoft.CloudMedia.Tests/Microsoft.CloudMedia.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Tests/Microsoft.CloudMedia.Tests/Microsoft.CloudMedia.Tests.csproj @@ -10,7 +10,7 @@ Properties Microsoft.CloudMedia.Tests Microsoft.CloudMedia.Tests - v4.6.1 + v4.8 512 diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config index ca04b301d..b750a7c2d 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,15 @@ - - - - - - + - + @@ -46,27 +41,30 @@ - - + + + + + - + + + + + - + - - - - - - + + @@ -77,13 +75,23 @@ - - + + - - + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config index a698fbce1..80338ec52 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config @@ -1,27 +1,27 @@  - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj index fdc6acd9a..7bc8917a1 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj +++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj @@ -12,7 +12,7 @@ Properties Orchard.Azure Orchard.Azure - v4.6.1 + v4.8 false @@ -53,50 +53,39 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True - - ..\..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True + + ..\..\..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll - True ..\..\..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll - True ..\..\..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll - True ..\..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.3.1.0\lib\net40\Microsoft.WindowsAzure.Configuration.dll - True ..\..\..\packages\Orchard.WindowsAzure.ServiceRuntime.2.7.0.0\lib\Microsoft.WindowsAzure.ServiceRuntime.dll - True ..\..\..\packages\WindowsAzure.Storage.5.0.2\lib\net40\Microsoft.WindowsAzure.Storage.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -104,7 +93,6 @@ ..\..\..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll - True @@ -112,28 +100,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -161,7 +143,7 @@ - + 10.0 @@ -207,4 +189,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 ef975705e..0a9ea2b0c 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/Web.config @@ -5,9 +5,9 @@
- +
- + @@ -22,43 +22,48 @@ - + - + - + - - + + + + + - + - + - - - - - - - - - + @@ -72,18 +77,31 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Azure/packages.config b/src/Orchard.Web/Modules/Orchard.Azure/packages.config index c16e0732b..5ce36dd18 100644 --- a/src/Orchard.Web/Modules/Orchard.Azure/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Azure/packages.config @@ -1,19 +1,20 @@  - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index 39adf8665..926e6b2be 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Blogs Orchard.Blogs - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -74,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -249,7 +242,7 @@ - + 10.0 @@ -283,4 +276,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs index b431dabca..9ed5f9b1e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogService.cs @@ -51,8 +51,14 @@ namespace Orchard.Blogs.Services { return blogPart == null ? null : blogPart.ContentItem; } + private IEnumerable _publishedBlogs; public IEnumerable Get() { - return Get(VersionOptions.Published); + // this is currently called at least twice per request on the + // back-office, both times by the code building the admin menu. + if (_publishedBlogs == null) { + _publishedBlogs = Get(VersionOptions.Published); + } + return _publishedBlogs; } public IEnumerable Get(VersionOptions versionOptions) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/packages.config b/src/Orchard.Web/Modules/Orchard.Blogs/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Blogs/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj index 5f48fed21..cfcb66853 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj +++ b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj @@ -12,7 +12,7 @@ Properties Orchard.Caching Orchard.Caching - v4.6.1 + v4.8 false @@ -53,7 +53,6 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -65,30 +64,24 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -112,7 +105,7 @@ - + 10.0 @@ -158,4 +151,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/Web.config b/src/Orchard.Web/Modules/Orchard.Caching/Web.config index a2ff9db7a..ea7b33d10 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Caching/Web.config @@ -7,7 +7,7 @@ - + @@ -22,19 +22,18 @@ - + - + - @@ -50,20 +49,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Caching/packages.config b/src/Orchard.Web/Modules/Orchard.Caching/packages.config index 6729ced49..84f4c1e13 100644 --- a/src/Orchard.Web/Modules/Orchard.Caching/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Caching/packages.config @@ -1,7 +1,7 @@  - - - - - \ No newline at end of file + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt index 64c916029..6e02b105d 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt @@ -12,7 +12,7 @@ Properties $$ModuleName$$ $$ModuleName$$ - v4.5.2 + v4.8 false @@ -69,27 +69,27 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll True - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll True - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll True @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt index 4acdbaa76..5a21d7120 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt @@ -7,7 +7,7 @@ - + @@ -31,13 +31,13 @@ - + - + @@ -48,7 +48,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt index 4a5a2aa49..3afe9ae3d 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt @@ -9,7 +9,7 @@ Properties $$ProjectName$$ $$ProjectName$$ - v4.5.2 + v4.8 4.0 @@ -39,8 +39,8 @@ ..\..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - - ..\..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + ..\..\..\..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll ..\..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll @@ -70,4 +70,4 @@ $$OrchardReferences$$ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj index 96682775d..cc3443d7a 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj @@ -13,7 +13,7 @@ Properties Orchard.CodeGeneration Orchard.CodeGeneration - v4.6.1 + v4.8 false false @@ -27,6 +27,7 @@ + true @@ -54,7 +55,6 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -65,28 +65,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -115,7 +109,6 @@ - Designer @@ -132,6 +125,9 @@ $(MvcBuildViews) + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -164,4 +160,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config index e28989f13..ea7b33d10 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Web.config @@ -7,7 +7,7 @@ - + @@ -22,19 +22,18 @@ - + - + - @@ -50,8 +49,20 @@ - + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config b/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config index 6729ced49..84f4c1e13 100644 --- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config +++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/packages.config @@ -1,7 +1,7 @@  - - - - - \ No newline at end of file + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj index 15a67e242..6752a3616 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj +++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Comments Orchard.Comments - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -74,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -221,7 +214,7 @@ - + @@ -278,4 +271,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Web.config b/src/Orchard.Web/Modules/Orchard.Comments/Web.config index c0df137d7..d7111e65a 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Comments/packages.config b/src/Orchard.Web/Modules/Orchard.Comments/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Comments/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj b/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj index 4ba9b5e78..fdb3c93b3 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Orchard.Conditions.csproj @@ -12,7 +12,7 @@ Properties Orchard.Conditions Orchard.Conditions - v4.6.1 + v4.8 false @@ -65,23 +65,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -164,4 +164,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config index dadb92b77..6f602be1e 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Conditions/Web.config @@ -7,7 +7,7 @@ - + @@ -22,13 +22,13 @@ - + - + @@ -52,20 +52,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Conditions/packages.config b/src/Orchard.Web/Modules/Orchard.Conditions/packages.config index 6729ced49..84f4c1e13 100644 --- a/src/Orchard.Web/Modules/Orchard.Conditions/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Conditions/packages.config @@ -1,7 +1,7 @@  - - - - - \ No newline at end of file + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj index 87bfb9f20..ee0b8149e 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Orchard.ContentPermissions.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.ContentPermissions Orchard.ContentPermissions - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -76,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -163,7 +156,7 @@ - + 10.0 @@ -209,4 +202,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs index 394d11729..50ac2d5d7 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Drivers/ContentPickerFieldDriver.cs @@ -8,13 +8,19 @@ using Orchard.ContentPicker.ViewModels; using Orchard.Localization; using Orchard.Utility.Extensions; using Orchard.ContentPicker.Fields; +using Orchard.Tokens; +using System.Collections.Generic; namespace Orchard.ContentPicker.Drivers { public class ContentPickerFieldDriver : ContentFieldDriver { private readonly IContentManager _contentManager; + private readonly ITokenizer _tokenizer; - public ContentPickerFieldDriver(IContentManager contentManager) { + public ContentPickerFieldDriver( + IContentManager contentManager, + ITokenizer tokenizer) { _contentManager = contentManager; + _tokenizer = tokenizer; T = NullLocalizer.Instance; } @@ -42,18 +48,38 @@ namespace Orchard.ContentPicker.Drivers { protected override DriverResult Editor(ContentPart part, Fields.ContentPickerField field, dynamic shapeHelper) { return ContentShape("Fields_ContentPicker_Edit", GetDifferentiator(field, part), () => { + var ids = part.IsNew() + ? GetDefaultids(part, field) + : field.Ids; var model = new ContentPickerFieldViewModel { Field = field, Part = part, - ContentItems = _contentManager.GetMany(field.Ids, VersionOptions.Latest, QueryHints.Empty).ToList() + ContentItems = _contentManager + .GetMany(ids, VersionOptions.Latest, QueryHints.Empty).ToList() }; - model.SelectedIds = string.Join(",", field.Ids); + model.SelectedIds = string.Join(",", ids); return shapeHelper.EditorTemplate(TemplateName: "Fields/ContentPicker.Edit", Model: model, Prefix: GetPrefix(field, part)); }); } + private int[] GetDefaultids(ContentPart part, Fields.ContentPickerField field) { + var ids = new int[] { }; + var settings = field.PartFieldDefinition.Settings.GetModel(); + if (!string.IsNullOrWhiteSpace(settings?.DefaultValue)) { + var defaultIds = _tokenizer + .Replace(settings.DefaultValue, + new Dictionary { { "Content", part.ContentItem } }); + if (!string.IsNullOrWhiteSpace(defaultIds)) { + // attempt to parse the string we populated from tokens + ids = ContentPickerField.DecodeIds(defaultIds); + } + } + + return ids; + } + protected override DriverResult Editor(ContentPart part, Fields.ContentPickerField field, IUpdateModel updater, dynamic shapeHelper) { var model = new ContentPickerFieldViewModel { SelectedIds = string.Join(",", field.Ids) }; diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs index f4ad2b3cf..4d0a40493 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Fields/ContentPickerField.cs @@ -21,7 +21,7 @@ namespace Orchard.ContentPicker.Fields { } } - private string EncodeIds(ICollection ids) { + private static string EncodeIds(ICollection ids) { if (ids == null || !ids.Any()) { return string.Empty; } @@ -30,12 +30,25 @@ namespace Orchard.ContentPicker.Fields { return "{" + string.Join("},{", ids.ToArray()) + "}"; } - private int[] DecodeIds(string ids) { + public static int[] DecodeIds(string ids) { if(String.IsNullOrWhiteSpace(ids)) { return new int[0]; } - - return ids.Split(separator, StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToArray(); + // if some of the slices of the string cannot be properly parsed, + // we still will return those that can. + return ids + .Split(separator, StringSplitOptions.RemoveEmptyEntries) + .Select(s => { + int i = -1; + if(int.TryParse(s, out i)) { + return i; + } + // if we can't parse return a negative value + return -1; + }) + // take only those that parsed properly + .Where(i => i > 0) + .ToArray(); } } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj index e3669f2e3..b96837b3a 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Orchard.ContentPicker.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.ContentPicker Orchard.ContentPicker - v4.6.1 + v4.8 false @@ -56,20 +57,16 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -79,28 +76,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -197,19 +188,23 @@ {fbc8b571-ed50-49d8-8d9d-64ab7454a0d6} Orchard.Localization + + {6f759635-13d7-4e94-bcc9-80445d63f117} + Orchard.Tokens + - - - + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -254,4 +249,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/ResourceManifest.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/ResourceManifest.cs index 021889434..ad8e46a55 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/ResourceManifest.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/ResourceManifest.cs @@ -5,7 +5,7 @@ namespace Orchard.ContentPicker { public void BuildManifests(ResourceManifestBuilder builder) { var manifest = builder.Add(); manifest.DefineScript("ContentPicker").SetUrl("ContentPicker.js", "ContentPicker.js").SetDependencies("jQuery"); - manifest.DefineScript("SelectableContentTab").SetUrl("SelectableContentTab.js", "SelectableContentTab.js").SetDependencies("jQuery"); + manifest.DefineScript("SelectableContentTab").SetUrl("SelectableContentTab.js?v=1.1", "SelectableContentTab.js?v=1.1").SetDependencies("jQuery"); } } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/SelectableContentTab.js b/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/SelectableContentTab.js index 3e230a5b8..cfd8c8a60 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/SelectableContentTab.js +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Scripts/SelectableContentTab.js @@ -32,8 +32,13 @@ $('.button.addSelected').on('click', function () { var itemsToAdd = new Array(); for (var i = 0; i < sessionStorage.length; i++) { - var data = window.sessionStorage.getItem(sessionStorage.key(i)); - itemsToAdd.push(JSON.parse(data)); + var key = sessionStorage.key(i); + // only add the item if the key is an integer: other scripts may be + // adding stuff to sessionStorage + if (!isNaN(key - parseInt(key))) { + var data = window.sessionStorage.getItem(sessionStorage.key(i)); + itemsToAdd.push(JSON.parse(data)); + } } window.sessionStorage.clear(); window.opener.jQuery[query("callback")](itemsToAdd); diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldEditorEvents.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldEditorEvents.cs index 7d7120532..a3e3baec6 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldEditorEvents.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldEditorEvents.cs @@ -28,6 +28,7 @@ namespace Orchard.ContentPicker.Settings { builder.WithSetting("ContentPickerFieldSettings.Multiple", model.Multiple.ToString(CultureInfo.InvariantCulture)); builder.WithSetting("ContentPickerFieldSettings.ShowContentTab", model.ShowContentTab.ToString(CultureInfo.InvariantCulture)); builder.WithSetting("ContentPickerFieldSettings.DisplayedContentTypes", model.DisplayedContentTypes); + builder.WithSetting("ContentPickerFieldSettings.DefaultValue", model.DefaultValue); } yield return DefinitionTemplate(model); diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldSettings.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldSettings.cs index eab5555d1..7fb70b56d 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldSettings.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Settings/ContentPickerFieldSettings.cs @@ -10,5 +10,7 @@ public bool ShowContentTab { get; set; } public string DisplayedContentTypes { get; set; } + + public string DefaultValue { get; set; } } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldSettings.cshtml b/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldSettings.cshtml index 1191c5629..4d6cb9dd6 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldSettings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/DefinitionTemplates/ContentPickerFieldSettings.cshtml @@ -14,7 +14,7 @@
- @Html.TextAreaFor(m => m.Hint, new { @class = "text medium", rows = "5" } ) + @Html.TextAreaFor(m => m.Hint, new { @class = "text medium", rows = "5" }) @T("The help text is written under the field when authors are selecting content items.") @Html.ValidationMessageFor(m => m.Hint)
@@ -27,7 +27,16 @@
- @Html.TextBoxFor(m => m.DisplayedContentTypes) + @Html.TextBoxFor(m => m.DisplayedContentTypes) @T("A comma separated value of all the content types or content parts to display.")
+
+
+ + @Html.TextBoxFor(m => m.DefaultValue, new { @class = "text large tokenized"}) + @T("A comma separated list of the ids of selected Items. It also accepts {{ or }} as separators, in line with the serialization normally used for this field.") +
+
+ +@Display.TokenHint() \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config index c6cd1ab75..128126181 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/packages.config @@ -1,10 +1,10 @@  - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPreview/Orchard.ContentPreview.csproj b/src/Orchard.Web/Modules/Orchard.ContentPreview/Orchard.ContentPreview.csproj index 47ad3b24f..432382988 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPreview/Orchard.ContentPreview.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentPreview/Orchard.ContentPreview.csproj @@ -12,7 +12,7 @@ Properties Orchard.ContentPreview Orchard.ContentPreview - v4.6.1 + v4.8 false @@ -51,19 +51,38 @@ false + + ..\..\..\packages\log4net.2.0.12\lib\net45\log4net.dll + ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll True + + ..\..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll + + + ..\..\..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll + + + ..\..\..\packages\Microsoft.Owin.Security.4.1.1\lib\net45\Microsoft.Owin.Security.dll + ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\..\..\packages\Owin.1.0\lib\net40\Owin.dll + 3.5 + @@ -71,28 +90,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll diff --git a/src/Orchard.Web/Modules/Orchard.ContentPreview/Web.config b/src/Orchard.Web/Modules/Orchard.ContentPreview/Web.config index 61b4f1ebe..b469dc604 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPreview/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPreview/Web.config @@ -1,23 +1,23 @@ - + -
-
+
+
- + - - - - - - - - + + + + + + + + @@ -33,14 +33,14 @@ - - - - - - - - + + + + + + + + @@ -51,16 +51,40 @@ - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentPreview/packages.config b/src/Orchard.Web/Modules/Orchard.ContentPreview/packages.config index ec0c05cc5..1f60f911c 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPreview/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentPreview/packages.config @@ -1,8 +1,14 @@ - + - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj index fd739af83..9896e5963 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.ContentTypes Orchard.ContentTypes - v4.6.1 + v4.8 false false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -72,28 +71,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -222,7 +215,7 @@ - + 10.0 @@ -256,4 +249,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config b/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj b/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj index 37a50020c..c6d9354c2 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Orchard.CustomForms.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.CustomForms Orchard.CustomForms - v4.6.1 + v4.8 false @@ -74,23 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -225,5 +226,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config index dd9b2feab..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,14 @@ - - - - - - - + - + @@ -46,7 +40,6 @@ - @@ -62,20 +55,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config b/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.CustomForms/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj index b4fe78f53..50ae13350 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Dashboards Orchard.Dashboards - v4.6.1 + v4.8 false @@ -70,23 +71,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -195,5 +196,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config index 30f2a411e..90bb5aef6 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,14 @@ - - - - - - - + - + @@ -62,20 +56,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config b/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Dashboards/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj b/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj index c34df16b0..fbfdaf7d5 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Orchard.DesignerTools.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.DesignerTools Orchard.DesignerTools - v4.6.1 + v4.8 false @@ -56,40 +57,32 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -151,10 +144,10 @@ - + - + 10.0 @@ -200,4 +193,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config index 56673ba25..55aaeee51 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -46,7 +41,6 @@ - @@ -62,8 +56,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config b/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config +++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj index 57170f78f..8bb359ac3 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Orchard.DynamicForms.csproj @@ -1,5 +1,6 @@  + @@ -13,7 +14,7 @@ Properties Orchard.DynamicForms Orchard.DynamicForms - v4.6.1 + v4.8 false @@ -57,15 +58,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -80,29 +79,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -557,10 +550,10 @@ - + - + @@ -615,6 +608,6 @@ + - - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config index 382b83015..32432f7cc 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -48,7 +43,6 @@ - @@ -64,8 +58,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config b/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config index 74b4ecf6f..70a134034 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/packages.config @@ -1,10 +1,10 @@  - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj index 78795bb2b..b0de9f776 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj +++ b/src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Email Orchard.Email - v4.6.1 + v4.8 false @@ -27,6 +28,8 @@ + + true @@ -54,52 +57,41 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll False - - ..\..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -171,7 +163,7 @@ - + 10.0 @@ -221,4 +213,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs index 64a8bdd5e..3829ff7e0 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs +++ b/src/Orchard.Web/Modules/Orchard.Email/Services/SmtpMessageChannel.cs @@ -128,13 +128,13 @@ namespace Orchard.Email.Services { ? emailMessage.FromName : _smtpSettings.FromName; - var sender = (senderAddress, senderName) switch - { - (string address, string name) => new MailAddress(address, name), - (string address, null) => new MailAddress(address), - _ => throw new InvalidOperationException("No sender email address") - }; - mailMessage.From = sender; + if (senderAddress != null && senderName != null) { + mailMessage.From = new MailAddress(senderAddress, senderName); + } else if (senderAddress != null && senderName == null) { + mailMessage.From = new MailAddress(senderAddress); + } else if (senderAddress == null && senderName == null) { + throw new InvalidOperationException("No sender email address"); + } var replyTo = !string.IsNullOrWhiteSpace(emailMessage.ReplyTo) ? ParseRecipients(emailMessage.ReplyTo) : @@ -162,7 +162,7 @@ namespace Orchard.Email.Services { } } - if (!string.IsNullOrWhiteSpace(_smtpSettings.ListUnsubscribe)){ + if (!string.IsNullOrWhiteSpace(_smtpSettings.ListUnsubscribe)) { mailMessage.Headers.Add("List-Unsubscribe", _smtpSettings.ListUnsubscribe); } diff --git a/src/Orchard.Web/Modules/Orchard.Email/Web.config b/src/Orchard.Web/Modules/Orchard.Email/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Email/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Email/packages.config b/src/Orchard.Web/Modules/Orchard.Email/packages.config index 057a6c2ec..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.Email/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Email/packages.config @@ -1,10 +1,9 @@  - - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj b/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj index 30dd0173b..888268940 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj +++ b/src/Orchard.Web/Modules/Orchard.Fields/Orchard.Fields.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Fields Orchard.Fields - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -76,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -184,7 +177,7 @@ - + 10.0 @@ -230,4 +223,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/Web.config b/src/Orchard.Web/Modules/Orchard.Fields/Web.config index ecd8ce0cb..7840817a4 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Fields/Web.config @@ -7,7 +7,7 @@ - + @@ -26,26 +26,20 @@ - - - - - - + - + - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Fields/packages.config b/src/Orchard.Web/Modules/Orchard.Fields/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Fields/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Fields/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj index db1562309..c1bd2353f 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj +++ b/src/Orchard.Web/Modules/Orchard.Forms/Orchard.Forms.csproj @@ -12,7 +12,7 @@ Properties Orchard.Forms Orchard.Forms - v4.6.1 + v4.8 false @@ -55,10 +55,9 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -74,29 +73,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -133,7 +126,7 @@ - + 10.0 @@ -179,4 +172,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/Web.config b/src/Orchard.Web/Modules/Orchard.Forms/Web.config index 652943ca6..b3f79bcdd 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Forms/Web.config @@ -7,7 +7,7 @@ - + @@ -22,13 +22,13 @@ - + - + @@ -36,7 +36,6 @@ - @@ -52,8 +51,20 @@ - + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Forms/packages.config b/src/Orchard.Web/Modules/Orchard.Forms/packages.config index 9d50c2bcd..96de43e4a 100644 --- a/src/Orchard.Web/Modules/Orchard.Forms/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Forms/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj b/src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj index 46f9e22a1..9cf1f39bf 100644 --- a/src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj +++ b/src/Orchard.Web/Modules/Orchard.Glimpse/Orchard.Glimpse.csproj @@ -12,7 +12,7 @@ Properties Orchard.Glimpse Orchard.Glimpse - v4.6.1 + v4.8 false @@ -72,38 +72,56 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll + + ..\..\..\packages\log4net.2.0.12\lib\net45\log4net.dll + ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll True + + ..\..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll + + + ..\..\..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll + + + ..\..\..\packages\Microsoft.Owin.Security.4.1.1\lib\net45\Microsoft.Owin.Security.dll + ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll + + ..\..\..\packages\Owin.1.0\lib\net40\Owin.dll + - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll diff --git a/src/Orchard.Web/Modules/Orchard.Glimpse/Web.config b/src/Orchard.Web/Modules/Orchard.Glimpse/Web.config index 85d582953..7449a9105 100644 --- a/src/Orchard.Web/Modules/Orchard.Glimpse/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Glimpse/Web.config @@ -86,10 +86,6 @@ - - - - @@ -98,6 +94,10 @@ + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Glimpse/packages.config b/src/Orchard.Web/Modules/Orchard.Glimpse/packages.config index 033cca1af..a85557e27 100644 --- a/src/Orchard.Web/Modules/Orchard.Glimpse/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Glimpse/packages.config @@ -1,16 +1,22 @@  - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj b/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj index 0f3bd2785..c22876130 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Orchard.ImageEditor.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.ImageEditor Orchard.ImageEditor - v4.6.1 + v4.8 false @@ -55,12 +56,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -75,29 +74,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -193,7 +186,7 @@ - + 10.0 @@ -239,4 +232,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config index 869090625..cacc9dc55 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -46,7 +41,6 @@ - @@ -62,8 +56,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config b/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ImageEditor/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj index 65da16afd..fc2546940 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.ImportExport Orchard.ImportExport - v4.6.1 + v4.8 false @@ -55,24 +56,19 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True - - - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True + + + ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -83,28 +79,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -200,7 +190,7 @@ - + 10.0 @@ -235,4 +225,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config index 5acbddda3..cb7b9c751 100644 --- a/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config +++ b/src/Orchard.Web/Modules/Orchard.ImportExport/packages.config @@ -1,11 +1,11 @@  - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/InfosetFieldIndexingHandler.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/InfosetFieldIndexingHandler.cs index 725886907..86ea2a031 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/InfosetFieldIndexingHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/InfosetFieldIndexingHandler.cs @@ -46,7 +46,7 @@ namespace Orchard.Indexing.Handlers { var fieldStorage = _fieldStorageProvider.BindStorage(localPart, localField); var indexName = infosetPart.TypeDefinition.Name.ToLower() + "-" + field.Name.ToLower(); - var membersContext = new DescribeMembersContext(fieldStorage, values => { + var membersContext = new DescribeMembersContext(null, fieldStorage, values => { foreach (var value in values) { @@ -112,7 +112,7 @@ namespace Orchard.Indexing.Handlers { } } - }); + }, localField); foreach (var driver in drivers) { driver.Describe(membersContext); diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj index 79e8ef3a4..6022365ec 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Indexing Orchard.Indexing - v4.6.1 + v4.8 @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -71,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -155,7 +148,7 @@ - + 10.0 @@ -190,4 +183,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs index 93fa1eb9b..2833d5a59 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs @@ -20,8 +20,7 @@ namespace Orchard.Indexing.Services { /// This class is synchronized using a lock file as both command line and web workers can potentially use it, /// and singleton locks would not be shared accross those two. /// - public class IndexingTaskExecutor : IIndexingTaskExecutor, IIndexStatisticsProvider - { + public class IndexingTaskExecutor : IIndexingTaskExecutor, IIndexStatisticsProvider { private readonly IRepository _taskRepository; private readonly IRepository _contentRepository; private IIndexProvider _indexProvider; @@ -160,13 +159,22 @@ namespace Orchard.Indexing.Services { .OrderBy(versionRecord => versionRecord.Id) .Take(ContentItemsPerLoop) .ToList() + .Select(versionRecord => { + try { + // In some rare cases a ContentItemVersionRecord without a ContentItemRecord can end up in the DB. + // in that case ContentManager throws a ObjectNotFoundException. + // e.g. NHibernate.ObjectNotFoundException: No row with the given identifier exists[Orchard.ContentManagement.Records.ContentItemRecord#148] + return _contentManager.Get(versionRecord.ContentItemRecord.Id, VersionOptions.VersionRecord(versionRecord.Id)); + } + catch { + return null; + } + }) // In some rare cases a ContentItemRecord without a ContentType can end up in the DB. // We need to filter out such records, otherwise they will crash the ContentManager. - .Where(x => x.ContentItemRecord != null && x.ContentItemRecord.ContentType != null) - .Select(versionRecord => _contentManager.Get(versionRecord.ContentItemRecord.Id, VersionOptions.VersionRecord(versionRecord.Id))) + .Where(content => content != null && content.ContentType != null) .Distinct() .ToList(); - // if no more elements to index, switch to update mode if (contentItems.Count == 0) { indexSettings.Mode = IndexingMode.Update; @@ -288,7 +296,7 @@ namespace Orchard.Indexing.Services { } } while (loop); - } + } // save current state of the index indexSettings.LastIndexedUtc = _clock.UtcNow; @@ -328,12 +336,10 @@ namespace Orchard.Indexing.Services { /// /// Loads the settings file or create a new default one if it doesn't exist /// - public IndexSettings LoadSettings(string indexName) - { + public IndexSettings LoadSettings(string indexName) { var indexSettings = new IndexSettings(); var settingsFilename = GetSettingsFileName(indexName); - if (_appDataFolder.FileExists(settingsFilename)) - { + if (_appDataFolder.FileExists(settingsFilename)) { var content = _appDataFolder.ReadFile(settingsFilename); indexSettings = IndexSettings.Parse(content); } @@ -372,7 +378,7 @@ namespace Orchard.Indexing.Services { if (contentItem == null || contentItem.TypeDefinition == null || contentItem.TypeDefinition.Settings == null) { - return new TypeIndexing {Indexes = ""}; + return new TypeIndexing { Indexes = "" }; } return contentItem.TypeDefinition.Settings.GetModel(); } diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/packages.config b/src/Orchard.Web/Modules/Orchard.Indexing/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Indexing/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj b/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj index 273fe6f78..6e0d7d1fb 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Orchard.JobsQueue.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.JobsQueue Orchard.JobsQueue - v4.6.1 + v4.8 @@ -28,6 +29,8 @@ + + true @@ -55,14 +58,12 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -74,28 +75,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -168,7 +163,7 @@ - + 10.0 @@ -203,4 +198,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj b/src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj index d9b6be742..ae415be76 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj @@ -10,7 +10,7 @@ Properties Orchard.Messaging.Tests Orchard.Messaging.Tests - v4.6.1 + v4.8 512 diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config b/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config index e96ab82af..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config +++ b/src/Orchard.Web/Modules/Orchard.JobsQueue/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj index e9e293575..6e739b2d0 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Layouts Orchard.Layouts - v4.6.1 + v4.8 false @@ -26,6 +27,8 @@ + + true @@ -53,15 +56,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -69,48 +70,39 @@ 3.5 - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll - - ..\..\..\packages\YamlDotNet.5.3.0\lib\net45\YamlDotNet.dll - True + + ..\..\..\packages\YamlDotNet.9.1.3\lib\net45\YamlDotNet.dll @@ -595,7 +587,7 @@ - + 10.0 @@ -641,4 +633,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Serialization/LocalizedStringYamlConverter.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Serialization/LocalizedStringYamlConverter.cs index 01ab2499e..b5779c293 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Serialization/LocalizedStringYamlConverter.cs +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Serialization/LocalizedStringYamlConverter.cs @@ -8,9 +8,9 @@ namespace Orchard.Layouts.Serialization { public class LocalizedStringYamlConverter : IYamlTypeConverter { public bool Accepts(Type type) => type == typeof(LocalizedString); - public object ReadYaml(IParser parser, Type type) => new LocalizedString(parser.Expect()?.Value); + public object ReadYaml(IParser parser, Type type) => new LocalizedString(parser.Consume()?.Value); public void WriteYaml(IEmitter emitter, object value, Type type) => emitter.Emit(new Scalar((value as LocalizedString)?.Text ?? "")); } -} \ No newline at end of file +} diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config index 69d9c6134..082d5aa44 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/Web.config @@ -7,7 +7,7 @@ - + @@ -25,31 +25,26 @@ - - - - - - + - + + - - + @@ -63,6 +58,31 @@ + + + + + + + + + + + + - + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config index be336a5b9..c75dbd3d5 100644 --- a/src/Orchard.Web/Modules/Orchard.Layouts/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Layouts/packages.config @@ -1,12 +1,12 @@  - - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj index 08fc7317d..b5c154b6a 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj +++ b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Lists Orchard.Lists - v4.6.1 + v4.8 false @@ -56,13 +57,12 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True + @@ -70,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -235,7 +229,7 @@ - + 10.0 @@ -281,4 +275,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/Web.config b/src/Orchard.Web/Modules/Orchard.Lists/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Lists/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Lists/packages.config b/src/Orchard.Web/Modules/Orchard.Lists/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Lists/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Lists/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj index 0e1e5fcd6..26096ebe3 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj +++ b/src/Orchard.Web/Modules/Orchard.Localization/Orchard.Localization.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.Localization Orchard.Localization - v4.6.1 + v4.8 false @@ -56,43 +57,34 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Orchard.MSTranslitTools.6.0.0.0\lib\MSTranslitTools.DLL - True - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -205,7 +197,7 @@ - + @@ -243,4 +235,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Web.config b/src/Orchard.Web/Modules/Orchard.Localization/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Localization/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Localization/packages.config b/src/Orchard.Web/Modules/Orchard.Localization/packages.config index 17c4ab138..a858bdbde 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Localization/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj index 26475dcaf..ddc4045e3 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj +++ b/src/Orchard.Web/Modules/Orchard.Media/Orchard.Media.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Media Orchard.Media - v4.6.1 + v4.8 false @@ -54,7 +55,7 @@ false - + ..\..\..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll @@ -72,22 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -206,4 +207,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Media/Web.config b/src/Orchard.Web/Modules/Orchard.Media/Web.config index dd9b2feab..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Media/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,14 @@ - - - - - - - + - + @@ -46,7 +40,6 @@ - @@ -62,20 +55,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Media/packages.config b/src/Orchard.Web/Modules/Orchard.Media/packages.config index 660825412..80b4cf92f 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Media/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Orchard.MediaLibrary.WebSearch.csproj b/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Orchard.MediaLibrary.WebSearch.csproj index 9984aa84e..83dd61336 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Orchard.MediaLibrary.WebSearch.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Orchard.MediaLibrary.WebSearch.csproj @@ -12,7 +12,7 @@ Properties Orchard.MediaLibrary.WebSearch Orchard.MediaLibrary.WebSearch - v4.6.1 + v4.8 false @@ -51,17 +51,32 @@ false + + ..\..\..\packages\log4net.2.0.12\lib\net45\log4net.dll + ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll True + + ..\..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll + + + ..\..\..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll + + + ..\..\..\packages\Microsoft.Owin.Security.4.1.1\lib\net45\Microsoft.Owin.Security.dll + ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\..\..\packages\Owin.1.0\lib\net40\Owin.dll ..\..\..\packages\RestEase.1.4.9\lib\net45\RestEase.dll @@ -70,40 +85,37 @@ 3.5 + + + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll + - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - False - ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll + + ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Web.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Web.config index d8500471d..4527fa5cd 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/Web.config @@ -62,6 +62,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/packages.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/packages.config index e2ec26e1b..d97d8db4d 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary.WebSearch/packages.config @@ -1,10 +1,17 @@  - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj index 8723a19c9..3288e7b19 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Orchard.MediaLibrary.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.MediaLibrary Orchard.MediaLibrary - v4.6.1 + v4.8 false @@ -26,6 +27,8 @@ + + true @@ -53,15 +56,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -77,29 +78,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -414,7 +409,7 @@ - + @@ -485,4 +480,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css index 8cd94d641..a568fde81 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Styles/media-library-picker-admin.css @@ -50,12 +50,21 @@ opacity: 0.6; height: 40px; } +.thumbnail .overlay { + height: 40px; + overflow: hidden; +} .overlay h3 { padding-right:5px; font-size: 12px; overflow: hidden; } +.thumbnail .overlay h3 { + height: 1rem; + white-space: nowrap; + text-overflow: ellipsis; +} .overlay .publication-status { padding-right:5px; diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml index 3881cf0a9..165dd7179 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/MediaLibraryPicker.cshtml @@ -46,7 +46,7 @@
@Display(BuildDisplay(contentItem, "Thumbnail"))
-

@Html.ItemDisplayText(contentItem)

+

@Html.ItemDisplayText(contentItem)

@(contentItem.IsPublished() ? "" : T("Draft").Text) @{ diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config index 56673ba25..55aaeee51 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -46,7 +41,6 @@ - @@ -62,8 +56,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config b/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config index e96ab82af..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj index 50cfb2062..7cf1e55e0 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.MediaPicker Orchard.MediaPicker - v4.6.1 + v4.8 false @@ -74,23 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -184,6 +185,9 @@ Designer + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -228,4 +232,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config index dd9b2feab..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,14 @@ - - - - - - - + - + @@ -46,7 +40,6 @@ - @@ -62,20 +55,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config b/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj index e97abe4c0..a505f057e 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Orchard.MediaProcessing.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.MediaProcessing Orchard.MediaProcessing - v4.6.1 + v4.8 false @@ -54,18 +55,15 @@ false - - ..\..\..\packages\ImageResizer.3.4.3\lib\ImageResizer.dll - True + + ..\..\..\packages\ImageResizer.4.2.8\lib\net45\ImageResizer.dll ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -81,29 +79,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -197,7 +189,7 @@ - + 10.0 @@ -243,4 +235,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config b/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config index 12d51b53f..eb78f16d5 100644 --- a/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MediaProcessing/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj index 0076f57f8..09ba9a65c 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Orchard.MessageBus.csproj @@ -12,7 +12,7 @@ Properties Orchard.MessageBus Orchard.MessageBus - v4.6.1 + v4.8 false @@ -71,23 +71,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -175,4 +175,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 36bc0dd58..ea7b33d10 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/Web.config @@ -7,7 +7,7 @@ - + @@ -22,19 +22,18 @@ - + - + - @@ -50,20 +49,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config index 96e09a989..825ae1bbd 100644 --- a/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MessageBus/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj index b59b94ec8..bbd18622d 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Orchard.Migrations.csproj @@ -13,7 +13,7 @@ Properties Orchard.Migrations Orchard.Migrations - v4.6.1 + v4.8 false @@ -27,6 +27,7 @@ + true @@ -54,7 +55,6 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -64,28 +64,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -113,7 +107,7 @@ - + 10.0 @@ -147,4 +141,4 @@ - \ 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 e28989f13..ea7b33d10 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Migrations/Web.config @@ -7,7 +7,7 @@ - + @@ -22,19 +22,18 @@ - + - + - @@ -50,8 +49,20 @@ - + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Migrations/packages.config b/src/Orchard.Web/Modules/Orchard.Migrations/packages.config index 6729ced49..84f4c1e13 100644 --- a/src/Orchard.Web/Modules/Orchard.Migrations/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Migrations/packages.config @@ -1,7 +1,7 @@  - - - - - \ No newline at end of file + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj index 910022a3c..d9ca19a12 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Modules/Orchard.Modules.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Modules Orchard.Modules - v4.6.1 + v4.8 false @@ -56,16 +57,13 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -75,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -174,7 +166,7 @@ - + 10.0 @@ -208,4 +200,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Web.config b/src/Orchard.Web/Modules/Orchard.Modules/Web.config index 45aa28208..a15b1d53f 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/Web.config @@ -7,7 +7,7 @@ - + @@ -25,26 +25,20 @@ - - - - - - + - + - @@ -60,8 +54,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Modules/packages.config b/src/Orchard.Web/Modules/Orchard.Modules/packages.config index 53b84a4ec..40d0dc821 100644 --- a/src/Orchard.Web/Modules/Orchard.Modules/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Modules/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj index 77320fc1e..180cd8f72 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Orchard.MultiTenancy.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.MultiTenancy Orchard.MultiTenancy - v4.6.1 + v4.8 false @@ -56,23 +57,18 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -86,28 +82,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -175,7 +165,7 @@ - + 10.0 @@ -209,4 +199,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config index 45aa28208..a15b1d53f 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Web.config @@ -7,7 +7,7 @@ - + @@ -25,26 +25,20 @@ - - - - - - + - + - @@ -60,8 +54,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config index 5acbddda3..cb7b9c751 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/packages.config @@ -1,11 +1,11 @@  - - - - - - - - - \ 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 48e39774a..2912bacd2 100644 --- a/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj +++ b/src/Orchard.Web/Modules/Orchard.OpenId/Orchard.OpenId.csproj @@ -12,7 +12,7 @@ Properties Orchard.OpenId Orchard.OpenId - v4.6.1 + v4.8 false @@ -55,6 +55,9 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll True + + ..\..\..\packages\log4net.2.0.12\lib\net45\log4net.dll + ..\..\..\packages\Microsoft.Azure.ActiveDirectory.GraphClient.2.1.1\lib\portable-net4+sl5+win+wpa+wp8\Microsoft.Azure.ActiveDirectory.GraphClient.dll True @@ -100,14 +103,14 @@ ..\..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll - - ..\..\..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + ..\..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll - - ..\..\..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll + + ..\..\..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - - ..\..\..\packages\Microsoft.Owin.Security.4.0.0\lib\net451\Microsoft.Owin.Security.dll + + ..\..\..\packages\Microsoft.Owin.Security.4.1.1\lib\net45\Microsoft.Owin.Security.dll ..\..\..\packages\Microsoft.Owin.Security.ActiveDirectory.4.0.0\lib\net451\Microsoft.Owin.Security.ActiveDirectory.dll @@ -138,7 +141,7 @@ True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll @@ -171,31 +174,25 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True - - - False - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll + - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/Web.config b/src/Orchard.Web/Modules/Orchard.OpenId/Web.config index d14d88d21..130d7b2ed 100644 --- a/src/Orchard.Web/Modules/Orchard.OpenId/Web.config +++ b/src/Orchard.Web/Modules/Orchard.OpenId/Web.config @@ -85,17 +85,9 @@ - - - - - - - - - + @@ -121,6 +113,22 @@ + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.OpenId/packages.config b/src/Orchard.Web/Modules/Orchard.OpenId/packages.config index 6e9bc4b30..604cef741 100644 --- a/src/Orchard.Web/Modules/Orchard.OpenId/packages.config +++ b/src/Orchard.Web/Modules/Orchard.OpenId/packages.config @@ -1,35 +1,37 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs index 080cee81e..312c43a96 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs @@ -76,6 +76,7 @@ namespace Orchard.OutputCache.Filters { private string _invariantCacheKey; private bool _transformRedirect; private bool _isCachingRequest; + private IEnumerable _ignoredRelativePaths; public void OnActionExecuting(ActionExecutingContext filterContext) { @@ -330,7 +331,7 @@ namespace Orchard.OutputCache.Filters { } // Don't cache ignored URLs. - if (IsIgnoredUrl(filterContext.RequestContext.HttpContext.Request.AppRelativeCurrentExecutionFilePath, CacheSettings.IgnoredUrls)) { + if (IsIgnoredUrl(filterContext.RequestContext.HttpContext.Request.AppRelativeCurrentExecutionFilePath)) { Logger.Debug("Request for item '{0}' ignored because the URL is configured as ignored.", itemDescriptor); return false; } @@ -504,6 +505,19 @@ namespace Orchard.OutputCache.Filters { } } + private IEnumerable IgnoredRelativePaths { + get { + return _ignoredRelativePaths + ?? (_ignoredRelativePaths = _cacheManager.Get($"{CacheSettings.CacheKey}_IgnoredUrls", true, ContextBoundObject => { + ContextBoundObject.Monitor(_signals.When(CacheSettings.CacheKey)); + return CacheSettings.IgnoredUrls + ?.Select(s => s.TrimStart(new[] { '~' }).Trim()) + ?.Where(s => !string.IsNullOrWhiteSpace(s) && !s.StartsWith("#")) + ?? Enumerable.Empty(); + })); + } + } + private void ServeCachedItem(ActionExecutingContext filterContext, CacheItem cacheItem) { var response = filterContext.HttpContext.Response; var request = filterContext.HttpContext.Request; @@ -588,6 +602,37 @@ namespace Orchard.OutputCache.Filters { } } + protected virtual bool IsIgnoredUrl(string url) { + if (IgnoredRelativePaths == null || !IgnoredRelativePaths.Any()) { + return false; + } + + url = url.TrimStart(new[] { '~' }); + + if (string.IsNullOrWhiteSpace(_shellSettings.RequestUrlPrefix)) { + foreach (var relativePath in IgnoredRelativePaths) { + if (String.Equals(relativePath, url, StringComparison.OrdinalIgnoreCase)) { + return true; + } + } + } else { + // if there is a RequestUrlPrefix, we want to check by also removing it from the + // url we are verifying, because the configuration might have been done without it + var tmp = url.TrimStart(new[] { '/' }); + if (tmp.StartsWith(_shellSettings.RequestUrlPrefix)) { + tmp = tmp.Substring(_shellSettings.RequestUrlPrefix.Length); + } + foreach (var relativePath in IgnoredRelativePaths) { + if (String.Equals(relativePath, url, StringComparison.OrdinalIgnoreCase) + || String.Equals(relativePath, tmp, StringComparison.OrdinalIgnoreCase)) { + return true; + } + } + } + + return false; + } + protected virtual bool IsIgnoredUrl(string url, IEnumerable ignoredUrls) { if (ignoredUrls == null || !ignoredUrls.Any()) { return false; @@ -610,6 +655,29 @@ namespace Orchard.OutputCache.Filters { return true; } } + // repeat the check by removing the RequestUrlPrefix if it exists. + if (!string.IsNullOrWhiteSpace(_shellSettings.RequestUrlPrefix)) { + var tmp = url.TrimStart(new[] { '/' }); + if (tmp.StartsWith(_shellSettings.RequestUrlPrefix)) { + tmp = tmp.Substring(_shellSettings.RequestUrlPrefix.Length); + foreach (var ignoredUrl in ignoredUrls) { + var relativePath = ignoredUrl.TrimStart(new[] { '~' }).Trim(); + if (String.IsNullOrWhiteSpace(relativePath)) { + continue; + } + + // Ignore comments + if (relativePath.StartsWith("#")) { + continue; + } + + if (String.Equals(relativePath, tmp, StringComparison.OrdinalIgnoreCase)) { + return true; + } + } + } + } + return false; } diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj index a7de5837f..81c91f0c2 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Orchard.OutputCache.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.OutputCache Orchard.OutputCache - v4.6.1 + v4.8 false @@ -56,16 +57,13 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -80,29 +78,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -169,7 +161,7 @@ - + 10.0 @@ -215,4 +207,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config index badff7589..633071ce3 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config b/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config index 53b84a4ec..40d0dc821 100644 --- a/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config +++ b/src/Orchard.Web/Modules/Orchard.OutputCache/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj index 65645370a..178f5ca04 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Orchard.Packaging.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.Packaging Orchard.Packaging - v4.6.1 + v4.8 false false @@ -56,16 +57,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Orchard.NuGet.Core.1.1.0.0\lib\NuGet.Core.dll - True @@ -82,28 +80,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -227,7 +219,7 @@ - + 10.0 @@ -261,4 +253,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config index 1f4513f3d..d936e11f3 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,15 @@ - - - - - - + - + @@ -46,7 +41,6 @@ - @@ -62,8 +56,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/packages.config b/src/Orchard.Web/Modules/Orchard.Packaging/packages.config index 4a6f15c13..b9fffc84c 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Packaging/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj index 2605ee1c6..d944ad78b 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj +++ b/src/Orchard.Web/Modules/Orchard.Pages/Orchard.Pages.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Pages Orchard.Pages - v4.6.1 + v4.8 @@ -130,4 +130,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Web.config b/src/Orchard.Web/Modules/Orchard.Pages/Web.config index 652943ca6..eb0b8ea26 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Pages/Web.config @@ -7,7 +7,7 @@ - + @@ -22,13 +22,13 @@ - + - + @@ -36,7 +36,6 @@ - @@ -52,7 +51,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs index 49b5c6fab..36513f028 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Migrations.cs @@ -332,6 +332,9 @@ namespace Orchard.Projections { return 5; } +#pragma warning disable CS0618 + // disable compiler warning regarding the fact that RewriteOutput is obsolete + // because this migration is handling just that. public int UpdateFrom5() { SchemaBuilder.AlterTable("PropertyRecord", table => table .AddColumn("RewriteOutputCondition", c => c.Unlimited()) @@ -342,5 +345,6 @@ namespace Orchard.Projections { return 6; } +#pragma warning restore CS0618 } } diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs b/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs index 3f28c2ae7..be8bd03d8 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Models/LayoutRecord.cs @@ -12,6 +12,7 @@ namespace Orchard.Projections.Models { public virtual string Description { get; set; } public virtual string Category { get; set; } public virtual string Type { get; set; } + [StringLengthMax] public virtual string State { get; set; } public virtual int Display { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj index 00972aa38..277bf24ca 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj +++ b/src/Orchard.Web/Modules/Orchard.Projections/Orchard.Projections.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Projections Orchard.Projections - v4.6.1 + v4.8 false @@ -56,20 +57,16 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -85,29 +82,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -337,10 +328,10 @@ - + - + 10.0 @@ -386,4 +377,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayoutForms.cs b/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayoutForms.cs index f13f90a0d..f9f7a7b51 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayoutForms.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/GridLayoutForms.cs @@ -86,7 +86,7 @@ namespace Orchard.Projections.Providers.Layouts { Description: T("The class to provide on each cell."), Classes: new[] { "text medium", "tokenized" } ), - _EmptyCell: Shape.TextBox( + _EmptyCell: Shape.TextArea( Id: "empty-cell", Name: "EmptyCell", Title: T("Empty Cell"), Description: T("The HTML to render as empty cells to fill a row. (e.g.,  )"), diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayoutForms.cs b/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayoutForms.cs index d2aaf6535..393b48582 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayoutForms.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/RawLayoutForms.cs @@ -53,19 +53,19 @@ namespace Orchard.Projections.Providers.Layouts { Description: T("The class to provide on each item."), Classes: new[] { "text medium", "tokenized" } ), - _Prepend: Shape.TextBox( + _Prepend: Shape.TextArea( Id: "prepend", Name: "Prepend", Title: T("Prepend"), Description: T("Some HTML to insert before the first element."), Classes: new[] { "text medium", "tokenized" } ), - _Separator: Shape.TextBox( + _Separator: Shape.TextArea( Id: "separator", Name: "Separator", Title: T("Separator"), Description: T("Some HTML to insert between two items."), Classes: new[] { "text medium", "tokenized" } ), - _Append: Shape.TextBox( + _Append: Shape.TextArea( Id: "append", Name: "Append", Title: T("Append"), Description: T("Some HTML to insert after the last element."), diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Services/CustomMemberBindingProvider.cs b/src/Orchard.Web/Modules/Orchard.Projections/Services/CustomMemberBindingProvider.cs index 5b28d941e..20c35d24b 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Services/CustomMemberBindingProvider.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Services/CustomMemberBindingProvider.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Reflection; using Orchard.Data; @@ -16,11 +17,18 @@ namespace Orchard.Projections.Services { _sessionFactoryHolder = sessionFactoryHolder; } + private List memberBindings; public void GetMemberBindings(BindingBuilder builder) { var recordBluePrints = _sessionFactoryHolder.GetSessionFactoryParameters().RecordDescriptors; - foreach(var member in _repository.Table.ToList()) { + // save this in memory once per request, to avoid hitting the database 5+ + // times per projection per request. + if (memberBindings == null) { + memberBindings = _repository.Table.ToList(); + } + + foreach (var member in memberBindings) { var record = recordBluePrints.FirstOrDefault(r => String.Equals(r.Type.FullName, member.Type, StringComparison.OrdinalIgnoreCase)); if (record == null) { @@ -28,7 +36,7 @@ namespace Orchard.Projections.Services { } var property = record.Type.GetProperty(member.Member, BindingFlags.Instance | BindingFlags.Public); - if(property == null) { + if (property == null) { continue; } diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs b/src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs index 4393d0849..f579c3e44 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs +++ b/src/Orchard.Web/Modules/Orchard.Projections/Services/ProjectionManager.cs @@ -168,10 +168,12 @@ namespace Orchard.Projections.Services { // iterate over each sort criteria to apply the alterations to the query object foreach (var sortCriterion in queryRecord.SortCriteria.OrderBy(s => s.Position)) { + var tokenizedState = _tokenizer.Replace(sortCriterion.State, tokens); var sortCriterionContext = new SortCriterionContext { Query = groupQuery, - State = FormParametersHelper.ToDynamic(sortCriterion.State), - QueryPartRecord = queryRecord + State = FormParametersHelper.ToDynamic(tokenizedState), + QueryPartRecord = queryRecord, + Tokens = tokens }; string category = sortCriterion.Category; @@ -214,7 +216,8 @@ namespace Orchard.Projections.Services { var filterContext = new FilterContext { Query = contentQuery, State = FormParametersHelper.ToDynamic(tokenizedState), - QueryPartRecord = queryRecord + QueryPartRecord = queryRecord, + Tokens = tokens }; string category = filter.Category; @@ -238,10 +241,12 @@ namespace Orchard.Projections.Services { // iterate over each sort criteria to apply the alterations to the query object foreach (var sortCriterion in sortCriteria.OrderBy(s => s.Position)) { + var tokenizedState = _tokenizer.Replace(sortCriterion.State, tokens); var sortCriterionContext = new SortCriterionContext { Query = contentQuery, - State = FormParametersHelper.ToDynamic(sortCriterion.State), - QueryPartRecord = queryRecord + State = FormParametersHelper.ToDynamic(tokenizedState), + QueryPartRecord = queryRecord, + Tokens = tokens }; string category = sortCriterion.Category; 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 b95717e7d..85b440be2 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 @@ -10,7 +10,7 @@ Properties Orchard.Projections.Tests Orchard.Projections.Tests - v4.6.1 + v4.8 512 diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config index 44b2c2740..1d39b06b2 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/app.config @@ -18,6 +18,14 @@ + + + + + + + + - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config index 223030f6f..71bda6817 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Tests/packages.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml index a0d465e13..68e5e2ca4 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Projections/Views/Property/Edit.cshtml @@ -49,8 +49,8 @@

- @Html.TextBoxFor(m => m.Label, new { @class = "text medium tokenized" }) - @T("The text to display as a label for this property.") + @Html.TextBoxFor(m => m.Label, new { @class = "text large tokenized" }) + @T("The text to display as a label for this property. It may include HTML.")
@@ -117,7 +117,7 @@
- @Html.TextBoxFor(m => m.NoResultText, new { @class = "text medium tokenized" }) + @Html.TextBoxFor(m => m.NoResultText, new { @class = "text large tokenized" }) @T("Text to display when the property is empty.")
@@ -151,7 +151,7 @@
- @Html.TextBoxFor(m => m.RewriteText, new { @class = "text large tokenized" }) + @Html.TextAreaFor(m => m.RewriteText, new { @class = "text large tokenized" }) @T("The tokenized text that will be evaluated and applied if \"Rewrite output condition\" evaluates to true. It may include HTML and {Text} can be used to inject the current property text.")
diff --git a/src/Orchard.Web/Modules/Orchard.Projections/Web.config b/src/Orchard.Web/Modules/Orchard.Projections/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Projections/packages.config b/src/Orchard.Web/Modules/Orchard.Projections/packages.config index c6cd1ab75..128126181 100644 --- a/src/Orchard.Web/Modules/Orchard.Projections/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Projections/packages.config @@ -1,10 +1,10 @@  - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj index 6bc32be82..dfe10580f 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Orchard.PublishLater.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.PublishLater Orchard.PublishLater - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -71,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -159,7 +152,7 @@ - + 10.0 @@ -193,4 +186,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config index 9f25731b3..2089fbcf5 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,7 +55,7 @@ - + @@ -73,8 +67,14 @@ - + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config b/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config +++ b/src/Orchard.Web/Modules/Orchard.PublishLater/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj index 6d50fb1e8..186aabe5d 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.Recipes Orchard.Recipes - v4.6.1 + v4.8 false @@ -55,20 +56,16 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True - - ..\..\..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True + + ..\..\..\packages\log4net.2.0.12\lib\net45\log4net.dll ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -78,28 +75,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -191,7 +182,7 @@ - + @@ -232,4 +223,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config index cdf067190..32ddbd7be 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/Web.config @@ -7,7 +7,7 @@ - + @@ -25,25 +25,19 @@ - - - - - - + - + - @@ -59,8 +53,26 @@ - + + + + + + + + + + + + + - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config index 55bcca44e..f9f2e4978 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Recipes/packages.config @@ -1,10 +1,10 @@  - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj index ad37a6d0b..12fc7ba8d 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj +++ b/src/Orchard.Web/Modules/Orchard.Redis/Orchard.Redis.csproj @@ -12,7 +12,7 @@ Properties Orchard.Redis Orchard.Redis - v4.6.1 + v4.8 false @@ -53,19 +53,16 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True ..\..\..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll - True @@ -123,7 +120,7 @@ - + 10.0 @@ -169,4 +166,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 e28989f13..e198d83fe 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/Web.config @@ -7,7 +7,7 @@ - + @@ -22,19 +22,18 @@ - + - + - @@ -50,7 +49,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Redis/packages.config b/src/Orchard.Web/Modules/Orchard.Redis/packages.config index d5709c1d9..29f4bb8d8 100644 --- a/src/Orchard.Web/Modules/Orchard.Redis/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Redis/packages.config @@ -1,7 +1,7 @@  - - - - - \ No newline at end of file + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj index 2e881689d..f26c25403 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj +++ b/src/Orchard.Web/Modules/Orchard.Resources/Orchard.Resources.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Resources Orchard.Resources - v4.6.1 + v4.8 false @@ -70,23 +71,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -1146,7 +1147,9 @@ - + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -1191,4 +1194,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/Web.config b/src/Orchard.Web/Modules/Orchard.Resources/Web.config index e08d57b7a..cf8edb40d 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Resources/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,14 @@ - - - - - - - + - + @@ -48,14 +42,6 @@ - - - - - - - - @@ -70,7 +56,7 @@ - + @@ -86,4 +72,10 @@ + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Resources/packages.config b/src/Orchard.Web/Modules/Orchard.Resources/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Resources/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Resources/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj index d32cc62a5..7a56c0812 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj +++ b/src/Orchard.Web/Modules/Orchard.Roles/Orchard.Roles.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Roles Orchard.Roles - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -72,28 +71,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -206,10 +199,10 @@ - + - + 10.0 @@ -255,4 +248,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Web.config b/src/Orchard.Web/Modules/Orchard.Roles/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Roles/packages.config b/src/Orchard.Web/Modules/Orchard.Roles/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Roles/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj index 772734121..00d1d156c 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Rules Orchard.Rules - v4.6.1 + v4.8 false @@ -74,23 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -195,6 +196,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -239,4 +243,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Web.config b/src/Orchard.Web/Modules/Orchard.Rules/Web.config index 4e1d7fa38..7cec0917a 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Rules/Web.config @@ -7,7 +7,7 @@ - + @@ -28,20 +28,14 @@ - - - - - - - + - + @@ -49,7 +43,6 @@ - @@ -65,20 +58,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Rules/packages.config b/src/Orchard.Web/Modules/Orchard.Rules/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Rules/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj index d8ae76c92..3ed509c0e 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Orchard.Scripting.CSharp.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Scripting.CSharp Orchard.Scripting.CSharp - v4.6.1 + v4.8 false @@ -55,16 +56,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Mono.CSharp.4.0.0.143\lib\4.5\Mono.CSharp.dll - True @@ -79,29 +77,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -159,7 +151,7 @@ - + 10.0 @@ -205,4 +197,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config index 2b235d70d..59b517a69 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.CSharp/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj index 36080566e..cad62acd2 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Orchard.Scripting.Dlr.csproj @@ -13,7 +13,7 @@ Properties Orchard.Scripting.Dlr Orchard.Scripting.Dlr - v4.6.1 + v4.8 false false @@ -27,6 +27,7 @@ + true @@ -53,28 +54,22 @@ ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\IronRuby.Libraries.Yaml.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Dynamic.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.dll - True ..\..\..\packages\IronRuby.1.1.3\lib\Microsoft.Scripting.Metadata.dll - True @@ -111,7 +106,7 @@ - + 10.0 @@ -145,4 +140,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config index e28989f13..e198d83fe 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/Web.config @@ -7,7 +7,7 @@ - + @@ -22,19 +22,18 @@ - + - + - @@ -50,7 +49,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config index 224495f63..1e4f5b488 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting.Dlr/packages.config @@ -1,4 +1,4 @@  - - \ No newline at end of file + + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj b/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj index 18df54650..60784775f 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Orchard.Scripting.csproj @@ -1,4 +1,4 @@ - + @@ -13,7 +13,7 @@ Properties Orchard.Scripting Orchard.Scripting - v4.6.1 + v4.8 false false @@ -131,4 +131,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config index e28989f13..e198d83fe 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Web.config @@ -7,7 +7,7 @@ - + @@ -22,19 +22,18 @@ - + - + - @@ -50,7 +49,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.Search/ContentAdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Search/ContentAdminMenu.cs index 7edc873fa..716686632 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/ContentAdminMenu.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/ContentAdminMenu.cs @@ -1,11 +1,29 @@ -using Orchard.Environment.Extensions; +using System.Linq; +using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.Core.Contents; +using Orchard.Core.Contents.Settings; +using Orchard.Environment.Extensions; using Orchard.Localization; +using Orchard.Security; using Orchard.UI.Navigation; namespace Orchard.Search { [OrchardFeature("Orchard.Search.Content")] public class ContentAdminMenu : INavigationProvider { - public ContentAdminMenu() { + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentManager _contentManager; + private readonly IAuthorizer _authorizer; + + public ContentAdminMenu( + IContentDefinitionManager contentDefinitionManager, + IContentManager contentManager, + IAuthorizer authorizer) { + + _contentDefinitionManager = contentDefinitionManager; + _contentManager = contentManager; + _authorizer = authorizer; + T = NullLocalizer.Instance; } @@ -16,11 +34,28 @@ namespace Orchard.Search { } public void GetNavigation(NavigationBuilder builder) { - builder.Add(T("Content"), - menu => menu - .Add(T("Search"), "1.5", item => item.Action("Index", "Admin", new {area = "Orchard.Search"}).LocalNav()) - ); - + // if the user may edit at least one type of Listable content, + // we add the link to the admin menu for them. This is the same + // logic used for Orcahrd.Core.Contents admin menu + var contentTypeDefinitions = _contentDefinitionManager + .ListTypeDefinitions() + .OrderBy(d => d.Name); + var listableContentTypes = contentTypeDefinitions + .Where(ctd => ctd + .Settings + .GetModel() + .Listable); + ContentItem listableCi = null; + foreach (var contentTypeDefinition in listableContentTypes) { + listableCi = _contentManager.New(contentTypeDefinition.Name); + if (_authorizer.Authorize(Permissions.EditContent, listableCi)) { + builder.Add(T("Content"), + menu => menu + .Add(T("Search"), "1.5", item => item.Action("Index", "Admin", new { area = "Orchard.Search" }).LocalNav()) + ); + break; + } + } } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs index bb55f3f35..36b77bef0 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/AdminController.cs @@ -1,15 +1,22 @@ using System; +using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Web.Mvc; using Orchard.Collections; using Orchard.ContentManagement; +using Orchard.ContentManagement.MetaData; +using Orchard.Core.Contents; +using Orchard.Core.Contents.Settings; using Orchard.Environment.Extensions; using Orchard.Indexing; using Orchard.Localization; +using Orchard.Localization.Services; using Orchard.Logging; using Orchard.Search.Helpers; using Orchard.Search.Models; using Orchard.Search.Services; +using Orchard.Security; using Orchard.Settings; using Orchard.UI.Navigation; using Orchard.UI.Notify; @@ -19,14 +26,31 @@ namespace Orchard.Search.Controllers { public class AdminController : Controller { private readonly ISearchService _searchService; private readonly ISiteService _siteService; + private readonly IIndexManager _indexManager; + private readonly IContentDefinitionManager _contentDefinitionManager; + private readonly IContentManager _contentManager; + private readonly IAuthorizer _authorizer; + private readonly ICultureManager _cultureManager; public AdminController( IOrchardServices orchardServices, ISearchService searchService, - ISiteService siteService) { + ISiteService siteService, + IIndexManager indexManager, + IContentDefinitionManager contentDefinitionManager, + IContentManager contentManager, + IAuthorizer authorizer, + ICultureManager cultureManager) { + _searchService = searchService; _siteService = siteService; Services = orchardServices; + _indexManager = indexManager; + _contentDefinitionManager = contentDefinitionManager; + _contentManager = contentManager; + _authorizer = authorizer; + _cultureManager = cultureManager; + T = NullLocalizer.Instance; Logger = NullLogger.Instance; } @@ -42,13 +66,75 @@ namespace Orchard.Search.Controllers { IPageOfItems searchHits = new PageOfItems(new ISearchHit[] { }); try { + // replicate a logic similar to ContentPickerController, but here + // we want to filter results based on authorized types. This is also + // partially replicates the logic in SearchService.Search. + if (!string.IsNullOrWhiteSpace(searchText)) { + // select types + var contentTypeDefinitions = _contentDefinitionManager + .ListTypeDefinitions() + .OrderBy(d => d.Name); + var listableContentTypes = contentTypeDefinitions + .Where(ctd => ctd + .Settings + .GetModel() + .Listable); + ContentItem listableCi = null; + var searchableTypes = new List(); + foreach (var contentTypeDefinition in listableContentTypes) { + listableCi = _contentManager.New(contentTypeDefinition.Name); + if (_authorizer.Authorize(Permissions.EditContent, listableCi)) { + // add the type to the list of types we will filter for + searchableTypes.Add(contentTypeDefinition.Name); + } + } + // we don't even search if no type is allowed + if (searchableTypes.Any()) { + var searchBuilder = _indexManager.HasIndexProvider() + ? _indexManager + .GetSearchIndexProvider() + .CreateSearchBuilder(adminSearchSettingsPart.SearchIndex) + : new NullSearchBuilder(); - searchHits = _searchService.Query( - searchText, pager.Page, pager.PageSize, - searchSettingsPart.FilterCulture, - adminSearchSettingsPart.SearchIndex, - searchSettingsPart.GetSearchFields(adminSearchSettingsPart.SearchIndex), - searchHit => searchHit); + searchBuilder + .Parse(searchSettingsPart + .GetSearchFields(adminSearchSettingsPart.SearchIndex), + searchText); + + foreach (var searchableType in searchableTypes) { + // filter by type + searchBuilder + .WithField("type", searchableType) + .NotAnalyzed() + .AsFilter(); + } + // filter by culture? + if (searchSettingsPart.FilterCulture) { + var culture = _cultureManager.GetCurrentCulture(Services.WorkContext.HttpContext); + + // use LCID as the text representation gets analyzed by the query parser + searchBuilder + .WithField("culture", CultureInfo.GetCultureInfo(culture).LCID) + .AsFilter(); + } + // pagination + var totalCount = searchBuilder.Count(); + if (pager != null) { + searchBuilder = searchBuilder + .Slice( + (pager.Page > 0 ? pager.Page - 1 : 0) * pager.PageSize, + pager.PageSize); + } + // search + var searchResults = searchBuilder.Search(); + // prepare the shape for the page + searchHits = new PageOfItems(searchResults.Select(searchHit => searchHit)) { + PageNumber = pager != null ? pager.Page : 0, + PageSize = pager != null ? (pager.PageSize != 0 ? pager.PageSize : totalCount) : totalCount, + TotalItemCount = totalCount + }; + } + } } catch (Exception exception) { Logger.Error(T("Invalid search query: {0}", exception.Message).Text); diff --git a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj index f0bde9761..c992378c0 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj +++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.Search Orchard.Search - v4.6.1 + v4.8 false false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -72,28 +71,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -213,7 +206,7 @@ - + 10.0 @@ -247,4 +240,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Search/Web.config b/src/Orchard.Web/Modules/Orchard.Search/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Search/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Search/packages.config b/src/Orchard.Web/Modules/Orchard.Search/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Search/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Search/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj index 353c17fa2..21d5c5e34 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Orchard.SecureSocketsLayer.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.SecureSocketsLayer Orchard.SecureSocketsLayer - v4.6.1 + v4.8 false @@ -55,19 +56,16 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True - - ..\..\..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + ..\..\..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\Owin.1.0\lib\net40\Owin.dll - True @@ -82,29 +80,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -148,7 +140,7 @@ - + 10.0 @@ -194,4 +186,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config index f222c1663..b77a2bcfd 100644 --- a/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config +++ b/src/Orchard.Web/Modules/Orchard.SecureSocketsLayer/packages.config @@ -1,10 +1,10 @@  - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj index b8a4841eb..189ecc99d 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Setup/Orchard.Setup.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Setup Orchard.Setup - v4.6.1 + v4.8 false @@ -56,15 +57,12 @@ ..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -79,28 +77,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -170,7 +162,7 @@ - + 10.0 @@ -216,4 +208,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Web.config b/src/Orchard.Web/Modules/Orchard.Setup/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Setup/packages.config b/src/Orchard.Web/Modules/Orchard.Setup/packages.config index 53b84a4ec..40d0dc821 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Setup/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj index c14b5e824..3b7520287 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Tags Orchard.Tags - v4.6.1 + v4.8 false @@ -56,20 +57,16 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -80,28 +77,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -203,9 +194,8 @@ - + - 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -250,4 +240,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Web.config b/src/Orchard.Web/Modules/Orchard.Tags/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tags/packages.config b/src/Orchard.Web/Modules/Orchard.Tags/packages.config index c6cd1ab75..128126181 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tags/packages.config @@ -1,10 +1,10 @@  - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj index 307500642..f411e6f57 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Orchard.TaskLease.csproj @@ -12,7 +12,7 @@ Properties Orchard.TaskLease Orchard.TaskLease - v4.6.1 + v4.8 false @@ -138,4 +138,4 @@ - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Tests/Orchard.TaskLease.Tests/Orchard.TaskLease.Tests.csproj b/src/Orchard.Web/Modules/Orchard.TaskLease/Tests/Orchard.TaskLease.Tests/Orchard.TaskLease.Tests.csproj index 0aa79c2f4..d4cac192d 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Tests/Orchard.TaskLease.Tests/Orchard.TaskLease.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Tests/Orchard.TaskLease.Tests/Orchard.TaskLease.Tests.csproj @@ -10,7 +10,7 @@ Properties Orchard.TaskLease.Tests Orchard.TaskLease.Tests - v4.6.1 + v4.8 512 diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config index 7df5d9e25..e198d83fe 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/Web.config @@ -7,7 +7,7 @@ - + @@ -22,32 +22,19 @@ - + - + - - - - - - - - - - - - - @@ -62,7 +49,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config b/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config index 7bc87e890..5bcf9dec4 100644 --- a/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config +++ b/src/Orchard.Web/Modules/Orchard.TaskLease/packages.config @@ -1,4 +1,4 @@  - - \ No newline at end of file + + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs index 1cc66cd02..091debace 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs @@ -57,10 +57,6 @@ namespace Orchard.Taxonomies.Handlers { } private void InitializerTermsLoader(TermsPart part) { - if (part._termParts != null) { - return; - } - var queryHint = new QueryHints() .ExpandRecords("ContentTypeRecord", "CommonPartRecord", "TermsPartRecord"); diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj index 9133b5b72..b8b1cc4e6 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.Taxonomies Orchard.Taxonomies - v4.6.1 + v4.8 false false @@ -28,6 +29,8 @@ + + true @@ -52,25 +55,18 @@ false - - ..\..\..\packages\Iesi.Collections.4.0.0.4000\lib\net40\Iesi.Collections.dll - True - ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -79,9 +75,8 @@ - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll @@ -90,33 +85,26 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -296,7 +284,7 @@ - + @@ -339,4 +327,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ 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 d709a6834..1da8bd063 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Web.config @@ -7,7 +7,7 @@ - + @@ -24,30 +24,25 @@ - - - - - - + - + + - - + @@ -61,6 +56,31 @@ + + + + + + + + + + + + - + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config index 425d8f402..e7f80fae2 100644 --- a/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/packages.config @@ -1,12 +1,11 @@  - - - - - - - - - - \ No newline at end of file + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj b/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj index cc64ca20d..edd109e2e 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj +++ b/src/Orchard.Web/Modules/Orchard.Templates/Orchard.Templates.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Templates Orchard.Templates - v4.6.1 + v4.8 false @@ -55,12 +56,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -75,29 +74,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -233,10 +226,10 @@ - + - + 10.0 @@ -282,4 +275,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/Web.config b/src/Orchard.Web/Modules/Orchard.Templates/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Templates/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Templates/packages.config b/src/Orchard.Web/Modules/Orchard.Templates/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Templates/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Templates/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj index 4f52c48b6..604a20741 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj +++ b/src/Orchard.Web/Modules/Orchard.Themes/Orchard.Themes.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Themes Orchard.Themes - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -71,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -178,7 +171,7 @@ - + 10.0 @@ -212,4 +205,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Web.config b/src/Orchard.Web/Modules/Orchard.Themes/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Themes/packages.config b/src/Orchard.Web/Modules/Orchard.Themes/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Themes/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Themes/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj b/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj index bcd906914..23919c3ca 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Orchard.Tokens.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Tokens Orchard.Tokens - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -76,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -167,7 +160,7 @@ - + 10.0 @@ -213,4 +206,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj index cd4d1d2bf..cfee32461 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/Orchard.Tokens.Tests.csproj @@ -10,7 +10,7 @@ Properties Orchard.Tokens.Tests Orchard.Tokens.Tests - v4.6.1 + v4.8 512 @@ -106,4 +106,4 @@ --> - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config index 77f93022d..d8c287814 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/app.config @@ -18,6 +18,14 @@ + + + + + + + + - \ No newline at end of file + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config index 79a38d228..8bf2f2c76 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Tests/packages.config @@ -1,5 +1,5 @@  - - - \ No newline at end of file + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Tokens/packages.config b/src/Orchard.Web/Modules/Orchard.Tokens/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Tokens/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Tokens/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj index 4c7d003ae..2311d4617 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj +++ b/src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Users Orchard.Users - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -74,28 +73,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -239,7 +232,7 @@ - + @@ -294,4 +287,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Users/Web.config b/src/Orchard.Web/Modules/Orchard.Users/Web.config index aefc72045..4f2330459 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Users/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -46,7 +41,6 @@ - @@ -62,8 +56,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Users/packages.config b/src/Orchard.Web/Modules/Orchard.Users/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Users/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj b/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj index ff4fd2666..5ce724032 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Orchard.Warmup.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Warmup Orchard.Warmup - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -76,29 +75,23 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -157,7 +150,7 @@ - + 10.0 @@ -203,4 +196,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Warmup/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/packages.config b/src/Orchard.Web/Modules/Orchard.Warmup/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Warmup/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Warmup/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs index 89d929582..22f6e12d0 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Handlers/LayerPartHandler.cs @@ -1,12 +1,30 @@ -using Orchard.ContentManagement; +using Orchard.Caching; +using Orchard.ContentManagement; using Orchard.ContentManagement.Handlers; using Orchard.Data; using Orchard.Widgets.Models; namespace Orchard.Widgets.Handlers { public class LayerPartHandler : ContentHandler { - public LayerPartHandler(IRepository layersRepository) { + private readonly ISignals _signals; + public LayerPartHandler( + IRepository layersRepository, + ISignals signals) { + Filters.Add(StorageFilter.For(layersRepository)); + _signals = signals; + + // Evict cached content when updated, removed or destroyed. + OnUpdated( + (context, part) => Invalidate()); + OnImported( + (context, part) => Invalidate()); + OnPublished( + (context, part) => Invalidate()); + OnRemoved( + (context, part) => Invalidate()); + OnDestroyed( + (context, part) => Invalidate()); } protected override void GetItemMetadata(GetContentItemMetadataContext context) { @@ -16,5 +34,9 @@ namespace Orchard.Widgets.Handlers { context.Metadata.Identity.Add("Layer.LayerName", part.Name); } } + + private void Invalidate() { + _signals.Trigger(LayerPart.AllLayersCacheEvictSignal); + } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs index 02f728819..2ee3ede03 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Models/LayerPart.cs @@ -29,5 +29,10 @@ namespace Orchard.Widgets.Models { get { return Retrieve(x => x.LayerRule); } set { Store(x => x.LayerRule, value); } } + + public static string AllLayersCacheEvictSignal = + "LayerPart_AllLayers_EvictCache"; + public static string AllLayersCacheKey = + "LayerPart_AllLayers_CacheKey"; } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj index 95d5ead22..3e6fdda00 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj @@ -1,5 +1,6 @@  + Debug @@ -13,7 +14,7 @@ Properties Orchard.Widgets Orchard.Widgets - v4.6.1 + v4.8 false false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -72,28 +71,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -256,7 +249,7 @@ - + 10.0 @@ -290,4 +283,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs index 4f9633deb..8cb36a26a 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Services/DefaultLayerEvaluationService.cs @@ -6,17 +6,27 @@ using Orchard.Logging; using Orchard.Widgets.Models; using Orchard.ContentManagement; using Orchard.ContentManagement.Utilities; +using Orchard.Caching; namespace Orchard.Widgets.Services{ public class DefaultLayerEvaluationService : ILayerEvaluationService { private readonly IConditionManager _conditionManager; private readonly IOrchardServices _orchardServices; + private readonly ICacheManager _cacheManager; + private readonly ISignals _signals; private readonly LazyField _activeLayerIDs; - public DefaultLayerEvaluationService(IConditionManager conditionManager, IOrchardServices orchardServices) { + public DefaultLayerEvaluationService( + IConditionManager conditionManager, + IOrchardServices orchardServices, + ICacheManager cacheManager, + ISignals signals) { + _conditionManager = conditionManager; _orchardServices = orchardServices; + _cacheManager = cacheManager; + _signals = signals; Logger = NullLogger.Instance; T = NullLocalizer.Instance; @@ -42,7 +52,15 @@ namespace Orchard.Widgets.Services{ // Once the Condition Engine is done: // Get Layers and filter by zone and rule // NOTE: .ForType("Layer") is faster than .Query() - var activeLayers = _orchardServices.ContentManager.Query().ForType("Layer").List(); + var activeLayers = _cacheManager.Get(LayerPart.AllLayersCacheKey, true, ctx => { + // invalidation signal + ctx.Monitor(_signals.When(LayerPart.AllLayersCacheEvictSignal)); + // cache + return _orchardServices + .ContentManager + .Query() + .ForType("Layer").List(); + }); var activeLayerIds = new List(); foreach (var activeLayer in activeLayers) { diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/packages.config b/src/Orchard.Web/Modules/Orchard.Widgets/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Widgets/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Activities/ContentActivity.cs b/src/Orchard.Web/Modules/Orchard.Workflows/Activities/ContentActivity.cs index eb69fe0ba..67c8437bb 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Activities/ContentActivity.cs +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Activities/ContentActivity.cs @@ -78,6 +78,16 @@ namespace Orchard.Workflows.Activities { } } + public class ContentFirstUpdatedActivity : ContentActivity { + public override string Name { + get { return "ContentFirstUpdated"; } + } + + public override LocalizedString Description { + get { return T("Content is updated for the first time."); } + } + } + public class ContentPublishedActivity : ContentActivity { public override string Name { get { return "ContentPublished"; } diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Handlers/WorkflowContentHandler.cs b/src/Orchard.Web/Modules/Orchard.Workflows/Handlers/WorkflowContentHandler.cs index 378b83e0a..76a32f42b 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Handlers/WorkflowContentHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Handlers/WorkflowContentHandler.cs @@ -6,8 +6,16 @@ using Orchard.Workflows.Services; namespace Orchard.Workflows.Handlers { public class WorkflowContentHandler : ContentHandler { + // Used to memorize the ids of ContentItems for which we go through the + // OnCreated handler. + private HashSet _createdItems; + // Used to memorize the ids of ContentItems for which we go through the + // OnUpdated handler. + private HashSet _updatedItems; public WorkflowContentHandler(IWorkflowManager workflowManager) { + _createdItems = new HashSet(); + _updatedItems = new HashSet(); OnPublished( (context, part) => @@ -34,9 +42,15 @@ namespace Orchard.Workflows.Handlers { () => new Dictionary { { "Content", context.BuildingContentItem } })); OnCreated( - (context, part) => + (context, part) => { + + if (context.ContentItem != null) { // sanity check + _createdItems.Add(context.ContentItem.Id); + } + workflowManager.TriggerEvent("ContentCreated", context.ContentItem, - () => new Dictionary { { "Content", context.ContentItem } })); + () => new Dictionary { { "Content", context.ContentItem } }); + }); OnUpdated( (context, part) => { @@ -44,11 +58,28 @@ namespace Orchard.Workflows.Handlers { return; } + if (context.ContentItem != null) { // sanity check + if (!_updatedItems.Contains(context.ContentItem.Id)) { + // in case a further update is invoked, this would prevent + // the FirstUpdate event to be fired again + _updatedItems.Add(context.ContentItem.Id); + if (_createdItems.Contains(context.ContentItem.Id)) { + // first update after creation of item + workflowManager.TriggerEvent( + "ContentFirstUpdated", + context.ContentItem, + () => new Dictionary { { "Content", context.ContentItem } } + ); + } + } + } + workflowManager.TriggerEvent( "ContentUpdated", context.ContentItem, () => new Dictionary { { "Content", context.ContentItem } } ); + }); } } diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj index 8fecb0821..57022ccd5 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Workflows Orchard.Workflows - v4.6.1 + v4.8 false @@ -26,6 +27,8 @@ + + true @@ -53,15 +56,13 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -77,28 +78,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -254,7 +249,7 @@ - + 10.0 @@ -300,4 +295,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config index 913e98a62..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/Web.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,7 +40,6 @@ - @@ -61,8 +55,26 @@ - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.Workflows/packages.config b/src/Orchard.Web/Modules/Orchard.Workflows/packages.config index e96ab82af..63841a016 100644 --- a/src/Orchard.Web/Modules/Orchard.Workflows/packages.config +++ b/src/Orchard.Web/Modules/Orchard.Workflows/packages.config @@ -1,9 +1,9 @@  - - - - - - - \ No newline at end of file + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj index 2460ada93..7c37aa8ea 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Orchard.jQuery.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.jQuery Orchard.jQuery - v4.6.1 + v4.8 false @@ -60,28 +61,29 @@ ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -659,4 +661,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config index dd9b2feab..2744c49fc 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/Web.config +++ b/src/Orchard.Web/Modules/Orchard.jQuery/Web.config @@ -7,7 +7,7 @@ - + @@ -25,20 +25,14 @@ - - - - - - - + - + @@ -46,7 +40,6 @@ - @@ -62,20 +55,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Orchard.jQuery/packages.config b/src/Orchard.Web/Modules/Orchard.jQuery/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/Orchard.jQuery/packages.config +++ b/src/Orchard.Web/Modules/Orchard.jQuery/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/SysCache/SysCache.csproj b/src/Orchard.Web/Modules/SysCache/SysCache.csproj index 22f3798a3..77911bf09 100644 --- a/src/Orchard.Web/Modules/SysCache/SysCache.csproj +++ b/src/Orchard.Web/Modules/SysCache/SysCache.csproj @@ -12,7 +12,7 @@ Properties SysCache SysCache - v4.6.1 + v4.8 false @@ -26,6 +26,7 @@ + true @@ -53,16 +54,13 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True ..\..\..\packages\NHibernate.Caches.SysCache2.4.0.0.4000\lib\net40\NHibernate.Caches.SysCache2.dll - True @@ -96,7 +94,7 @@ - + 10.0 @@ -142,4 +140,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 7df5d9e25..e198d83fe 100644 --- a/src/Orchard.Web/Modules/SysCache/Web.config +++ b/src/Orchard.Web/Modules/SysCache/Web.config @@ -7,7 +7,7 @@ - + @@ -22,32 +22,19 @@ - + - + - - - - - - - - - - - - - @@ -62,7 +49,7 @@ - + diff --git a/src/Orchard.Web/Modules/SysCache/packages.config b/src/Orchard.Web/Modules/SysCache/packages.config index cb4f271d8..9395dcd30 100644 --- a/src/Orchard.Web/Modules/SysCache/packages.config +++ b/src/Orchard.Web/Modules/SysCache/packages.config @@ -1,6 +1,6 @@  - - - - \ No newline at end of file + + + + diff --git a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj index 9a35dab37..e0ce2db4b 100644 --- a/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj +++ b/src/Orchard.Web/Modules/TinyMce/TinyMce.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties TinyMce TinyMce - v4.6.1 + v4.8 false @@ -56,12 +57,10 @@ ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True @@ -71,28 +70,22 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -370,9 +363,6 @@ - - - Designer @@ -385,6 +375,9 @@ + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -429,4 +422,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/TinyMce/Web.config b/src/Orchard.Web/Modules/TinyMce/Web.config index fb537751e..9fce79f3b 100644 --- a/src/Orchard.Web/Modules/TinyMce/Web.config +++ b/src/Orchard.Web/Modules/TinyMce/Web.config @@ -7,7 +7,7 @@ - + @@ -25,35 +25,21 @@ - - - - - - + - + - - - - - - - - - @@ -68,7 +54,7 @@ - + @@ -80,8 +66,14 @@ - + + + + + + + diff --git a/src/Orchard.Web/Modules/TinyMce/packages.config b/src/Orchard.Web/Modules/TinyMce/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Modules/TinyMce/packages.config +++ b/src/Orchard.Web/Modules/TinyMce/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj index c908602ec..0169d49cd 100644 --- a/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj +++ b/src/Orchard.Web/Modules/Upgrade/Upgrade.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Upgrade Upgrade - v4.6.1 + v4.8 false @@ -26,6 +27,8 @@ + + true @@ -53,23 +56,19 @@ ..\..\..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True ..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\..\..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True @@ -77,9 +76,8 @@ 3.5 - - ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll @@ -87,33 +85,26 @@ - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -193,10 +184,10 @@ - + - + @@ -245,4 +236,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Modules/Upgrade/Web.config b/src/Orchard.Web/Modules/Upgrade/Web.config index 89bac884d..6f74e9ed4 100644 --- a/src/Orchard.Web/Modules/Upgrade/Web.config +++ b/src/Orchard.Web/Modules/Upgrade/Web.config @@ -7,7 +7,7 @@ - + @@ -25,19 +25,14 @@ - - - - - - + - + @@ -45,12 +40,12 @@ + - - + @@ -64,6 +59,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Orchard.Web/Modules/Upgrade/packages.config b/src/Orchard.Web/Modules/Upgrade/packages.config index c30b18d63..818f27466 100644 --- a/src/Orchard.Web/Modules/Upgrade/packages.config +++ b/src/Orchard.Web/Modules/Upgrade/packages.config @@ -1,13 +1,13 @@  - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index 4a3510bf8..fa7f521a8 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Orchard.Web Orchard.Web - v4.6.1 + v4.8 false true 44300 @@ -23,6 +24,7 @@ true + true @@ -54,7 +56,6 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\packages\Glimpse.AspNet.1.9.2\lib\net45\Glimpse.AspNet.dll @@ -68,46 +69,35 @@ ..\packages\Glimpse.Mvc5.1.5.3\lib\net45\Glimpse.Mvc5.dll True - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True - - ..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll + + ..\packages\Microsoft.Owin.Host.SystemWeb.4.1.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True ..\packages\Npgsql.2.2.3\lib\net45\Mono.Security.dll - True ..\packages\MySql.Data.6.7.9\lib\net45\MySql.Data.dll - True - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\Npgsql.2.2.3\lib\net45\Npgsql.dll - True ..\packages\Orchard.NuGet.Core.1.1.0.0\lib\NuGet.Core.dll - True ..\packages\Owin.1.0\lib\net40\Owin.dll - True @@ -127,29 +117,23 @@ - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -198,7 +182,7 @@ - + Web.config @@ -306,4 +290,10 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj index 16475f396..7a299d787 100644 --- a/src/Orchard.Web/Themes/Themes.csproj +++ b/src/Orchard.Web/Themes/Themes.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,7 +13,7 @@ Properties Themes Themes - v4.6.1 + v4.8 false @@ -67,22 +68,22 @@ - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + + ..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + ..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + ..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -245,4 +246,10 @@ - \ No newline at end of file + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + diff --git a/src/Orchard.Web/Themes/Web.config b/src/Orchard.Web/Themes/Web.config index f84d12a2d..9fed7646e 100644 --- a/src/Orchard.Web/Themes/Web.config +++ b/src/Orchard.Web/Themes/Web.config @@ -11,7 +11,7 @@ - + @@ -26,11 +26,6 @@ - - - - - - + - + - + - + @@ -69,26 +64,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -105,10 +80,6 @@ - - - - @@ -117,6 +88,16 @@ + + + + + + + + + + diff --git a/src/Orchard.Web/Themes/packages.config b/src/Orchard.Web/Themes/packages.config index e807cea03..0938ac40a 100644 --- a/src/Orchard.Web/Themes/packages.config +++ b/src/Orchard.Web/Themes/packages.config @@ -1,8 +1,8 @@  - - - - - - \ No newline at end of file + + + + + + diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index 98691eead..873e70cbe 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -1,308 +1,306 @@  - -
-
+
+
-
+
- - - - - - + + + + - - - + - - + - - - - - - - - + + + + + + + + - - + - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - + + + + + + + + - + - + - - + - - - - + + + + - + - + - + - - - - - - + + + + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - + - + + + + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - - - - + + + + diff --git a/src/Orchard.Web/packages.config b/src/Orchard.Web/packages.config index daf5175c3..44bb4ac4b 100644 --- a/src/Orchard.Web/packages.config +++ b/src/Orchard.Web/packages.config @@ -1,20 +1,20 @@  - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs b/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs index 3fdce3a6d..522afa690 100644 --- a/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs +++ b/src/Orchard/ContentManagement/Handlers/DescribeMembersContext.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using Orchard.ContentManagement.FieldStorage; +using Orchard.ContentManagement.MetaData.Models; using Orchard.Localization; namespace Orchard.ContentManagement.Handlers { @@ -8,18 +9,25 @@ namespace Orchard.ContentManagement.Handlers { private readonly Action _processMember; private readonly IFieldStorage _storage; private readonly Action _apply; + private readonly ContentPartFieldDefinition _contentPartFieldDefinition; - public DescribeMembersContext(Action processMember) : this(processMember, null, null) { + public DescribeMembersContext(Action processMember) + : this(processMember, null, null, null) { } public DescribeMembersContext(IFieldStorage storage, Action apply) - : this(null, storage, apply) { + : this(null, storage, apply, null) { } - public DescribeMembersContext(Action processMember, IFieldStorage storage, Action apply) { + public DescribeMembersContext(Action processMember, IFieldStorage storage, Action apply) + : this(null, storage, apply, null) { + } + + public DescribeMembersContext(Action processMember, IFieldStorage storage, Action apply, ContentPartFieldDefinition contentPartFieldDefinition) { _processMember = processMember; _storage = storage; _apply = apply; + _contentPartFieldDefinition = contentPartFieldDefinition; } public DescribeMembersContext Member(string storageName, Type storageType) { @@ -43,6 +51,9 @@ namespace Orchard.ContentManagement.Handlers { var f = enumerate(); var field = Activator.CreateInstance(); field.Storage = _storage; + if (field.PartFieldDefinition == null) { + field.PartFieldDefinition = _contentPartFieldDefinition; + } _apply(f(field)); } diff --git a/src/Orchard/Environment/RunningShellTable.cs b/src/Orchard/Environment/RunningShellTable.cs index b5322f7c4..b4c2f1ee7 100644 --- a/src/Orchard/Environment/RunningShellTable.cs +++ b/src/Orchard/Environment/RunningShellTable.cs @@ -84,7 +84,12 @@ namespace Orchard.Environment { .Select(h => new ShellSettings(s) {RequestUrlHost = h})) .GroupBy(s => s.RequestUrlHost ?? string.Empty) .OrderByDescending(g => g.Key.Length) - .ToDictionary(x => x.Key, x => x.AsEnumerable(), StringComparer.OrdinalIgnoreCase); + .ToDictionary( + x => x.Key, + // we want to keep this ordered so that, for the same host, shells with a configured + // RequestUrlPrefix are tested first when trying to match them to coming requests. + x => x.OrderByDescending(ss => (ss.RequestUrlPrefix ?? "").Length).AsEnumerable(), + StringComparer.OrdinalIgnoreCase); if (unqualified.Count() == 1) { // only one shell had no request url criteria @@ -164,20 +169,20 @@ namespace Orchard.Environment { shells = _shellsByHost[subHostKey]; } } - + // looking for a request url prefix match var mostQualifiedMatch = shells.FirstOrDefault(settings => { - if (settings.State == TenantState.Disabled) { - return false; - } + if (settings.State == TenantState.Disabled) { + return false; + } - if (String.IsNullOrWhiteSpace(settings.RequestUrlPrefix)) { - return true; - } - - return key.Equals(host + "/" + settings.RequestUrlPrefix, StringComparison.OrdinalIgnoreCase); - }); + if (String.IsNullOrWhiteSpace(settings.RequestUrlPrefix)) { + return true; + } + return key.Equals(host + "/" + settings.RequestUrlPrefix, StringComparison.OrdinalIgnoreCase); + }); + return mostQualifiedMatch ?? _fallback; }); diff --git a/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs new file mode 100644 index 000000000..ce2753c50 --- /dev/null +++ b/src/Orchard/Mvc/ModelBinders/BooleanBinderProvider.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Web.Mvc; +using System.Linq; + +namespace Orchard.Mvc.ModelBinders { + public class BooleanBinderProvider : IModelBinderProvider, IModelBinder { + + public IEnumerable GetModelBinders() { + return new[] { + new ModelBinderDescriptor { + ModelBinder = this, + Type = typeof(bool) + } + }; + } + + public object BindModel(ControllerContext controllerContext, ModelBindingContext bindingContext) { + // returning null from here allows the downstream method to set its own default + var value = false; + if (bindingContext != null) { + if (bindingContext.ValueProvider + ?.GetValue(bindingContext.ModelName) == null) { + // this is the case where we are not receiving a possible value for the boolean. + // Returning null is ok here, and will let the downstream method set its own defaults. + return null; + } + } + try { + var attemptedValues = bindingContext.ValueProvider + .GetValue(bindingContext.ModelName) + .AttemptedValue + // for bool, AttemptedValue may be "true,false" because in the form there may be + // a checkbox and an hidden input. + .Split(new char[] { ',' }); + value = attemptedValues + .Select(v => Convert.ToBoolean(v)) + // This Aggregate operation works because the "true" is normally only there when + // the checkbox was selected, while the false is always there thanks to the hidden + // input. + .Aggregate((a, b) => a || b); + // The steps above don't affect binding booleans from any where other than a form, + // because those won't give us here a list of possible values to aggregate. + } catch { + bindingContext.ModelState.AddModelError(bindingContext.ModelName, new FormatException()); + return null; + } + return value; + } + } +} diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 84b071215..6748f6bc9 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -10,7 +10,7 @@ Properties Orchard Orchard.Framework - v4.6.1 + v4.8 512 @@ -63,42 +63,34 @@ ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll - True ..\packages\Autofac.Configuration.3.3.0\lib\net40\Autofac.Configuration.dll - True ..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll - True ..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll - True ..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll - True - - ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - True + + ..\packages\log4net.2.0.12\lib\net45\log4net.dll - - ..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.4.1.1\lib\net45\Microsoft.Owin.dll ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - True - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll ..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll - True False @@ -106,7 +98,6 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll - True @@ -120,9 +111,8 @@ True - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - True + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll 3.0 @@ -134,36 +124,28 @@ - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - True + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll - True + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - True + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - True + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll - True + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -185,6 +167,7 @@ + @@ -1099,4 +1082,4 @@ - \ No newline at end of file + diff --git a/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs b/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs index 078e40a6d..efa506a9e 100644 --- a/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs +++ b/src/Orchard/Tasks/Locking/Services/DistributedLockService.cs @@ -46,7 +46,7 @@ namespace Orchard.Tasks.Locking.Services { return true; } - Logger.Warning("Failed to acquire lock '{0}' within the specified timeout ({1}).", name, timeout); + Logger.Debug("Failed to acquire lock '{0}' within the specified timeout ({1}).", name, timeout); } catch (Exception ex) { Logger.Error(ex, "Error while trying to acquire lock '{0}'.", name); @@ -104,6 +104,7 @@ namespace Orchard.Tasks.Locking.Services { Logger.Debug("Record for lock '{0}' already owned by current machine or was successfully created; creating lock object.", internalName); dLock = new DistributedLock(name, internalName, releaseLockAction: () => { + _locks.Remove(monitorObj); Monitor.Exit(monitorObj); DeleteDistributedLockRecord(internalName); }); @@ -111,7 +112,6 @@ namespace Orchard.Tasks.Locking.Services { _locks.Add(monitorObj, dLock); return true; } - return false; }); @@ -120,7 +120,9 @@ namespace Orchard.Tasks.Locking.Services { if (throwOnTimeout) throw new TimeoutException(String.Format("Failed to acquire lock '{0}' within the specified timeout ({1}).", internalName, timeout)); - + else + Monitor.Exit(monitorObj); + return null; } } diff --git a/src/Orchard/app.config b/src/Orchard/app.config index 5c28c4863..13f534a72 100644 --- a/src/Orchard/app.config +++ b/src/Orchard/app.config @@ -22,6 +22,14 @@ + + + + + + + + - + diff --git a/src/Orchard/packages.config b/src/Orchard/packages.config index 9394f7fdf..65a8bf398 100644 --- a/src/Orchard/packages.config +++ b/src/Orchard/packages.config @@ -1,20 +1,20 @@  - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + diff --git a/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj b/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj index 48a129bf1..ccbeb9b6b 100644 --- a/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj +++ b/src/Tools/MSBuild.Orchard.Tasks/MSBuild.Orchard.Tasks.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties MSBuild.Orchard.Tasks MSBuild.Orchard.Tasks - v4.6.1 + v4.8 512 @@ -101,4 +101,4 @@ --> - \ No newline at end of file + diff --git a/src/Tools/Orchard.Tests/Orchard.Tests.csproj b/src/Tools/Orchard.Tests/Orchard.Tests.csproj index 639b5bfa6..1367ee9b9 100644 --- a/src/Tools/Orchard.Tests/Orchard.Tests.csproj +++ b/src/Tools/Orchard.Tests/Orchard.Tests.csproj @@ -10,7 +10,7 @@ Properties Orchard.Tests Orchard.Tests - v4.6.1 + v4.8 512 diff --git a/src/Tools/Orchard.Tests/packages.config b/src/Tools/Orchard.Tests/packages.config index ea761ef7a..442b6f5ad 100644 --- a/src/Tools/Orchard.Tests/packages.config +++ b/src/Tools/Orchard.Tests/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/src/Tools/Orchard/Orchard.csproj b/src/Tools/Orchard/Orchard.csproj index 79aabfd57..52f0e1bf8 100644 --- a/src/Tools/Orchard/Orchard.csproj +++ b/src/Tools/Orchard/Orchard.csproj @@ -1,4 +1,4 @@ - + Debug @@ -10,7 +10,7 @@ Properties Orchard Orchard - v4.6.1 + v4.8 512 @@ -125,4 +125,4 @@ --> - \ No newline at end of file + diff --git a/src/Tools/Orchard/app.config b/src/Tools/Orchard/app.config index 3b0d55ed4..a48f9d65f 100644 --- a/src/Tools/Orchard/app.config +++ b/src/Tools/Orchard/app.config @@ -1,6 +1,7 @@ - + +