Added IRecipeResultAccessor for programmatically obtaining result of recipe execution.

This will cause migrations to execute after features have been enabled.

.gitignore

@@ -184,6 +184,9 @@ src/TestResults/*
 src/Orchard.Web/Properties/PublishProfiles
 src/Orchard.Azure/Orchard.Azure.CloudService/Staging/
 src/Orchard.Web/Modules/Orchard.Azure.MediaServices/node_modules
+src/Orchard.Web/Modules/Orchard.Layouts/node_modules
+src/Orchard.Web/Modules/Orchard.DynamicForms/node_modules
 
 #enable all /lib artifacts
-!lib/*/*.*
+!lib/*/*.*
+*/.vs/*

ClickToBuild.cmd

@@ -1,4 +1,8 @@
-FOR %%b in ( 
+FOR %%b in (
+       "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
+       "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+       "%ProgramFiles%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 
+
        "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
        "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
        "%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" 

README.md

@@ -1,6 +1,9 @@
 # Orchard
+
 Orchard is a free, open source, community-focused Content Management System built on the ASP.NET MVC platform.
 
+[![Join the chat at https://gitter.im/OrchardCMS/Orchard](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/OrchardCMS/Orchard?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## About The Orchard Project
 
 #### Please visit our website at http://orchardproject.net for the most current information about this project.
@@ -16,8 +19,8 @@ Our mission is to empower our users and foster a dedicated and diverse community
 There are many ways you can [contribute to Orchard](http://orchardproject.net/contribution): you can [fix bugs](https://github.com/OrchardCMS/Orchard/issues), contribute modules and themes to [our gallery](http://gallery.orchardproject.net/), [write documentation](https://github.com/OrchardCMS/OrchardDoc), [translate Orchard](http://orchardproject.net/localize), or answer questions [on our forums](http://orchard.codeplex.com/discussions) and [on Stack Overflow](http://stackoverflow.com/questions/tagged/orchardcms).
 
 ## Project Status
-Orchard is currently in version 1.8.1. We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach. 
-Our 1.8.1 release is available from our Downloads page, and is easy to [Install Orchard using the Web Platform Installer](http://www.orchardproject.net/docs/Installing-Orchard.ashx). We encourage interested developers to check out the source code on the Orchard Github site and get involved with the project.
+Orchard is currently in version 1.9. We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach. 
+Our 1.9 release is available from [our Downloads page](https://github.com/OrchardCMS/Orchard/releases), and is easy to [Install Orchard using the Web Platform Installer](http://www.orchardproject.net/docs/Installing-Orchard.ashx). We encourage interested developers to check out the source code on the Orchard Github site and get involved with the project.
 
 * [Download the latest release](https://github.com/OrchardCMS/Orchard/releases)
 * [Feature roadmap](http://www.orchardproject.net/docs/feature-roadmap.ashx)

lib/aspnetmvc/Microsoft.Web.Infrastructure.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<doc>
+  <assembly>
+    <name>Microsoft.Web.Infrastructure</name>
+  </assembly>
+  <members>
+    <member name="T:Microsoft.Web.Infrastructure.HttpContextHelper"></member>
+    <member name="M:Microsoft.Web.Infrastructure.HttpContextHelper.ExecuteInNullContext(System.Action)"></member>
+    <member name="T:Microsoft.Web.Infrastructure.InfrastructureHelper"></member>
+    <member name="M:Microsoft.Web.Infrastructure.InfrastructureHelper.IsCodeDomDefinedExtension(System.String)"></member>
+    <member name="M:Microsoft.Web.Infrastructure.InfrastructureHelper.UnloadAppDomain"></member>
+    <member name="T:Microsoft.Web.Infrastructure.DynamicModuleHelper.DynamicModuleUtility"></member>
+    <member name="M:Microsoft.Web.Infrastructure.DynamicModuleHelper.DynamicModuleUtility.RegisterModule(System.Type)"></member>
+    <member name="T:Microsoft.Web.Infrastructure.DynamicValidationHelper.ValidationUtility"></member>
+    <member name="M:Microsoft.Web.Infrastructure.DynamicValidationHelper.ValidationUtility.EnableDynamicValidation(System.Web.HttpContext)"></member>
+    <member name="M:Microsoft.Web.Infrastructure.DynamicValidationHelper.ValidationUtility.GetUnvalidatedCollections(System.Web.HttpContext,System.Func`1@,System.Void)"></member>
+    <member name="M:Microsoft.Web.Infrastructure.DynamicValidationHelper.ValidationUtility.IsValidationEnabled(System.Web.HttpContext)"></member>
+  </members>
+</doc>

lib/npgsql/LICENSE.txt

@@ -0,0 +1,7 @@
+Copyright (c) 2002-2013, The Npgsql Development Team
+
+Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
+
+IN NO EVENT SHALL THE NPGSQL DEVELOPMENT TEAM BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE NPGSQL DEVELOPMENT TEAM HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+THE NPGSQL DEVELOPMENT TEAM SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE NPGSQL DEVELOPMENT TEAM HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

lib/npgsql/README.md

@@ -0,0 +1,52 @@
+Npgsql - .NET Data Provider for PostgreSQL
+=============
+
+###What Is Npgsql?
+
+Npgsql is a .Net Data Provider for PostgreSQL. It allows you to connect and interact with PostgreSQL server using .NET.
+
+
+###Project Information
+
++   [Offical Site][1]
++   [Npgsql source code @ GitHub][2]
++   [Available on NuGet Gallery][3]
++   [Wiki - Usage and other information][4]
+
+
+###Developers
+
+Developers who contributes to Npgsql currently or in past, in no particular order:
+    
++   Brar Piening
++   Francisco Figueiredo Jr.
++   Ben Clewett
++   Daniel Morgan
++   Dave Page
++   Ulrich Sprick
++   Glen Parker
++   Josh Cooley
++   Jon Asher
++   Chris Morgan
++   Thilo Utke
++   Hiroshi Saito
++   Shay Rojansky
+
+###License
+
+Refer LICENSE.txt for more information on license terms.
+
+###Code history
+
+On December 2nd, [we committed a change][5] to restructure Npgsql code. This change modified file locations and unfortunately made the complete modification history of those files to not be available anymore through GitHub interface directly. [This stackoverflow post][6] documents a way to access the history before the rename: You just need to access the object tree **before** the rename and then you can see the rest of the file history.
+In the case of this rename, this is the tree: https://github.com/npgsql/Npgsql/tree/2f8928e4dee59275767de0df2ec41a654744a3bc
+
+This will help future searches for the history of the files. Note that you stil can access the complete history of the file through command line: `git log --follow ./newflodername/file`
+
+
+[1]: http://www.npgsql.org/  "Official site"
+[2]: https://github.com/npgsql/Npgsql/  "Npgsql source code @ GitHub"
+[3]: http://www.nuget.org/packages/Npgsql/ "Npgsql @ Nuget Gallery"
+[4]: https://github.com/npgsql/Npgsql/wiki/  "Wiki"
+[5]: https://github.com/npgsql/Npgsql/commit/d7beea23f3407b38747cde05568a59ac87cdd121#diff-3b02da674650ba0f31603c365249f34f
+[6]: http://stackoverflow.com/questions/17213046/see-history-in-github-after-folder-rename

src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj

@@ -101,6 +101,7 @@
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
+      <Private>false</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -126,11 +127,11 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>

src/Orchard.Azure/Orchard.Azure.Web/Web.config

@@ -18,7 +18,7 @@
     </appSettings>
     
     <system.web.webPages.razor>
-        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
+        <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
         <pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.WebViewPage">
             <namespaces>
                 <add namespace="System.Collections.Generic"/>
@@ -60,7 +60,7 @@
                 <add extension=".csproj" type="Orchard.Environment.Extensions.Compilers.CSharpExtensionBuildProviderShim"/>
             </buildProviders>
             <assemblies>
-                <add assembly="System.Web.Mvc, Version=5..0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+                <add assembly="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
                 <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
                 <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
                 <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
@@ -147,7 +147,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.0.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
@@ -171,11 +171,11 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral"/>

src/Orchard.Core.Tests/Body/BodyPartTests.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Autofac;
-using JetBrains.Annotations;
 using Moq;
 using NUnit.Framework;
 using Orchard.Caching;
@@ -83,7 +82,6 @@ namespace Orchard.Core.Tests.Body {
             }
         }
 
-        [UsedImplicitly]
         public class ThingHandler : ContentHandler {
             public ThingHandler() {
                 Filters.Add(new ActivatingFilter<Thing>(ThingDriver.ContentTypeName));

src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Web;
 using System.Web.Routing;
 using Autofac;
-using JetBrains.Annotations;
 using Moq;
 using NUnit.Framework;
 using Orchard.Caching;
@@ -134,12 +133,12 @@ namespace Orchard.Core.Tests.Common.Providers {
             }
         }
 
-        [UsedImplicitly]
         class TestHandler : ContentHandler {
             public TestHandler() {
                 Filters.Add(new ActivatingFilter<CommonPart>("test-item"));
                 Filters.Add(new ActivatingFilter<ContentPart<CommonPartVersionRecord>>("test-item"));
                 Filters.Add(new ActivatingFilter<TestUser>("User"));
+                Filters.Add(new ActivatingFilter<AlternateTestUser>("AlternateUser"));
             }
         }
 
@@ -148,6 +147,11 @@ namespace Orchard.Core.Tests.Common.Providers {
             public string UserName { get { return "x"; } }
             public string Email { get { return "y"; } }
         }
+        class AlternateTestUser : ContentPart, IUser {
+            public new int Id { get { return 6655322; } }
+            public string UserName { get { return "y"; } }
+            public string Email { get { return "x"; } }
+        }
 
         [Test]
         public void OwnerShouldBeNullAndZeroByDefault() {
@@ -361,14 +365,22 @@ namespace Orchard.Core.Tests.Common.Providers {
         public void EditingShouldSetModifiedUtc() {
             var contentManager = _container.Resolve<IContentManager>();
 
+            var user = contentManager.New<IUser>("User");
+            _authn.Setup(x => x.GetAuthenticatedUser()).Returns(user);
+
             var createUtc = _clock.UtcNow;
             var item = contentManager.Create<ICommonPart>("test-item", VersionOptions.Draft, init => { });
             contentManager.Publish(item.ContentItem);
 
             Assert.That(item.CreatedUtc, Is.EqualTo(createUtc));
             Assert.That(item.ModifiedUtc, Is.EqualTo(createUtc));
+            Assert.That(item.VersionModifiedBy, Is.EqualTo(user.UserName));
             Assert.That(item.PublishedUtc, Is.EqualTo(createUtc));
 
+            // Switch user
+            var secondUser = contentManager.New<IUser>("AlternateUser");
+            _authn.Setup(x => x.GetAuthenticatedUser()).Returns(secondUser);
+
             _clock.Advance(TimeSpan.FromMinutes(1));
             var editUtc = _clock.UtcNow;
 
@@ -379,6 +391,7 @@ namespace Orchard.Core.Tests.Common.Providers {
             Assert.That(item.ModifiedUtc, Is.EqualTo(editUtc));
             Assert.That(item.PublishedUtc, Is.EqualTo(createUtc));
             Assert.That(updater.ModelErrors.Count, Is.EqualTo(0));
+            Assert.That(item.VersionModifiedBy, Is.EqualTo(secondUser.UserName));
         }
 
         [Test]

src/Orchard.Core.Tests/Orchard.Core.Tests.csproj

@@ -127,10 +127,12 @@
     <ProjectReference Include="..\Orchard.Web\Core\Orchard.Core.csproj">
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
+      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -154,10 +156,10 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
   -->
   <Target Name="CopySqlCeBinaries">
     <ItemGroup>

src/Orchard.Core.Tests/Properties/AssemblyInfo.cs

@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]

src/Orchard.Profile/Properties/AssemblyInfo.cs

@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]

src/Orchard.Profile/profiling-setup-commands.txt

@@ -1 +1 @@
-setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SQLServer /DatabaseConnectionString:"Data Source=.;Initial Catalog=Orchard;Integrated Security=True" /EnabledFeatures:Profiling,Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,Navigation,Reports,Scheduling,Settings,Shapes,Title,PackagingServices,Gallery,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.jQuery,Orchard.Lists,Orchard.MediaLibrary,Orchard.ContentPicker,Orchard.MediaPicker,Orchard.Modules,Orchard.Packaging,Orchard.Pages,Orchard.Recipes,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Scripting.Lightweight,Orchard.Widgets,TinyMce,TheThemeMachine,Orchard.Tokens,Orchard.Alias,Orchard.Autoroute
+setup /SiteName:Profiling /AdminUsername:admin /AdminPassword:profiling-secret /DatabaseProvider:SQLServer /DatabaseConnectionString:"Data Source=.;Initial Catalog=Orchard;Integrated Security=True" /EnabledFeatures:Profiling,Orchard.Framework,Common,Containers,Contents,Dashboard,Feeds,Navigation,Scheduling,Settings,Shapes,Title,PackagingServices,Gallery,Orchard.PublishLater,Orchard.Blogs,Orchard.Comments,Orchard.ContentTypes,Orchard.jQuery,Orchard.Lists,Orchard.MediaLibrary,Orchard.ContentPicker,Orchard.MediaPicker,Orchard.Modules,Orchard.Packaging,Orchard.Pages,Orchard.Recipes,Orchard.Roles,Orchard.Tags,Orchard.Themes,Orchard.Users,Orchard.Scripting,Orchard.Scripting.Lightweight,Orchard.Widgets,TinyMce,TheThemeMachine,Orchard.Tokens,Orchard.Alias,Orchard.Autoroute

src/Orchard.Specs/Bindings/OrchardSiteFactory.cs

@@ -25,7 +25,7 @@ namespace Orchard.Specs.Bindings {
                 virtualDirectory,
                 TableData(
                 new { extension = "Module", names = "Lucene, Markdown, Orchard.Alias, Orchard.AntiSpam, Orchard.ArchiveLater, Orchard.Autoroute, Orchard.Azure, Orchard.Blogs, Orchard.Caching, Orchard.CodeGeneration, Orchard.Comments, Orchard.ContentPermissions, Orchard.ContentPicker, Orchard.ContentTypes, Orchard.CustomForms, Orchard.DesignerTools, Orchard.Email, Orchard.Fields, Orchard.Forms, Orchard.ImageEditor, Orchard.ImportExport, Orchard.Indexing, Orchard.JobsQueue, Orchard.jQuery, Orchard.Layouts, Orchard.Lists, Orchard.Localization, Orchard.Media, Orchard.MediaLibrary, Orchard.MediaPicker, Orchard.MediaProcessing, Orchard.Migrations, Orchard.Modules, Orchard.MultiTenancy, Orchard.OutputCache, Orchard.Packaging, Orchard.Pages, Orchard.Projections, Orchard.PublishLater, Orchard.Recipes, Orchard.Roles, Orchard.Rules, Orchard.Scripting, Orchard.Scripting.CSharp, Orchard.Scripting.Dlr, Orchard.Search, Orchard.SecureSocketsLayer, Orchard.Setup, Orchard.Tags, Orchard.TaskLease, Orchard.Taxonomies, Orchard.Templates, Orchard.Themes, Orchard.Tokens, Orchard.Users, Orchard.Warmup, Orchard.Widgets, Orchard.Workflows, SysCache, TinyMce, Upgrade" },
-                new { extension = "Core", names = "Common, Containers, Contents, Dashboard, Feeds, Navigation, Reports, Scheduling, Settings, Shapes, Title, XmlRpc" },
+                new { extension = "Core", names = "Common, Containers, Contents, Dashboard, Feeds, Navigation, Scheduling, Settings, Shapes, Title, XmlRpc" },
                 new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" }));
 
             webApp.WhenIGoTo("Setup");

src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config

@@ -7,7 +7,7 @@
   <system.web>
     <compilation targetFramework="4.5">
       <assemblies>
-        <add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+        <add assembly="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
       </assemblies>
     </compilation>
     <pages>

src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config

@@ -10,11 +10,11 @@
     -->
     <pages
         validateRequest="false"
-        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
-        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
-        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <controls>
-        <add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" namespace="System.Web.Mvc" tagPrefix="mvc" />
+        <add assembly="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" namespace="System.Web.Mvc" tagPrefix="mvc" />
       </controls>
     </pages>
   </system.web>

src/Orchard.Specs/Hosting/Orchard.Web/Web.config

@@ -21,13 +21,13 @@
 
   <appSettings>
     <add key="webpages:Enabled" value="false" />
-    <add key="webpages:Version" value="3.0.0.0"/>
+    <add key="webpages:Version" value="3.0.0"/>
     <add key="log4net.Config" value="Config\log4net.config" />
     <add key="owin:AutomaticAppStartup" value="false" />
   </appSettings>
 
   <system.web.webPages.razor>
-    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+    <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
     <pages pageBaseType="Orchard.Mvc.ViewEngines.Razor.WebViewPage">
       <namespaces>
         <add namespace="System.Web.Mvc" />
@@ -62,7 +62,7 @@
         <add extension=".csproj" type="Orchard.Environment.Extensions.Compilers.CSharpExtensionBuildProviderShim"/>
       </buildProviders>
       <assemblies>
-        <add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+        <add assembly="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
         <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
         <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
         <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
@@ -150,63 +150,74 @@
     <httpErrors existingResponse="PassThrough" />
   </system.webServer>
   <runtime>
+    <gcServer enabled="true"/>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="App_Data/Dependencies"/>
+      <dependentAssembly>
+        <assemblyIdentity name="Iesi.Collections" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
         <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
         <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000"/>
       </dependentAssembly>
-
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da"/>
         <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
         <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
       </dependentAssembly>
-
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
+
 </configuration>

src/Orchard.Specs/Hosting/Simple.Web/Web.config

@@ -51,7 +51,7 @@
         <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
         <add assembly="System.Web.Abstractions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
         <add assembly="System.Web.Routing, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-        <add assembly="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+        <add assembly="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
         <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
         <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
         <add assembly="System.Data.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
@@ -140,48 +140,81 @@
       <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode"
            type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
       <add name="ScriptResource" preCondition="integratedMode" verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
-      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
       <add name="UrlRoutingHandler" preCondition="integratedMode" verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     </handlers>
   </system.webServer>
 
   <runtime>
+    <gcServer enabled="true"/>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="App_Data/Dependencies"/>
+      <dependentAssembly>
+        <assemblyIdentity name="Iesi.Collections" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.WebPages.Deployment" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35"/>
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
-
       <dependentAssembly>
-        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 
+
 </configuration>

src/Orchard.Specs/Orchard.Specs.csproj

@@ -426,6 +426,7 @@
     <ProjectReference Include="..\Orchard.Web\Core\Orchard.Core.csproj">
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\Orchard.Web\Modules\Orchard.Roles\Orchard.Roles.csproj">
       <Project>{D10AD48F-407D-4DB5-A328-173EC7CB010F}</Project>
@@ -446,6 +447,7 @@
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\Tools\Orchard\Orchard.csproj">
       <Project>{33B1BC8D-E292-4972-A363-22056B207156}</Project>
@@ -502,11 +504,11 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>

src/Orchard.Specs/Properties/AssemblyInfo.cs

@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]

src/Orchard.Specs/Setup.feature

@@ -7,7 +7,7 @@ Scenario: Root request shows setup form
     Given I have a clean site with
             | extension | names |
             | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
-            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title, Reports |
+            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
             | Theme | SafeMode |
     When I go to "/"
     Then I should see "Welcome to Orchard"
@@ -18,7 +18,7 @@ Scenario: Setup folder also shows setup form
     Given I have a clean site with
             | extension | names |
             | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
-            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title, Reports |
+            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
             | Theme | SafeMode |
     When I go to "/Setup"
     Then I should see "Welcome to Orchard"
@@ -29,7 +29,7 @@ Scenario: Some of the initial form values are required
     Given I have a clean site with
             | extension | names |
             | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
-            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title, Reports |
+            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
             | Theme | SafeMode |
     When I go to "/Setup"
         And I hit "Finish Setup"
@@ -41,7 +41,7 @@ Scenario: Calling setup on a brand new install
     Given I have a clean site with
             | extension | names |
             | Module | Orchard.Setup, Orchard.Layouts, Orchard.Pages, Orchard.ContentPicker, Orchard.Blogs, Orchard.MediaLibrary, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.ContentTypes, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce, Orchard.Recipes, Orchard.Warmup, Orchard.Alias, Orchard.Forms, Orchard.Tokens, Orchard.Autoroute, Orchard.Projections, Orchard.Fields, Orchard.MediaProcessing, Orchard.OutputCache, Orchard.Taxonomies, Orchard.Workflows, Orchard.Scripting.CSharp |
-            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title, Reports |
+            | Core | Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings, Shapes, XmlRpc, Title |
             | Theme | SafeMode, TheAdmin, TheThemeMachine |
         And I am on "/Setup"
     When I fill in 

src/Orchard.Specs/Setup.feature.cs

@@ -82,7 +82,7 @@ this.ScenarioSetup(scenarioInfo);
             table1.AddRow(new string[] {
                         "Core",
                         "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
-                            " Shapes, XmlRpc, Title, Reports"});
+                            " Shapes, XmlRpc, Title"});
             table1.AddRow(new string[] {
                         "Theme",
                         "SafeMode"});
@@ -117,7 +117,7 @@ this.ScenarioSetup(scenarioInfo);
             table2.AddRow(new string[] {
                         "Core",
                         "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
-                            " Shapes, XmlRpc, Title, Reports"});
+                            " Shapes, XmlRpc, Title"});
             table2.AddRow(new string[] {
                         "Theme",
                         "SafeMode"});
@@ -152,7 +152,7 @@ this.ScenarioSetup(scenarioInfo);
             table3.AddRow(new string[] {
                         "Core",
                         "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
-                            " Shapes, XmlRpc, Title, Reports"});
+                            " Shapes, XmlRpc, Title"});
             table3.AddRow(new string[] {
                         "Theme",
                         "SafeMode"});
@@ -189,7 +189,7 @@ this.ScenarioSetup(scenarioInfo);
             table4.AddRow(new string[] {
                         "Core",
                         "Common, Containers, Dashboard, Feeds, Navigation, Contents, Scheduling, Settings," +
-                            " Shapes, XmlRpc, Title, Reports"});
+                            " Shapes, XmlRpc, Title"});
             table4.AddRow(new string[] {
                         "Theme",
                         "SafeMode, TheAdmin, TheThemeMachine"});

src/Orchard.Tests.Modules/App.config

@@ -16,7 +16,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral"/>

src/Orchard.Tests.Modules/Comments/Services/CommentServiceTests.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using Autofac;
-using JetBrains.Annotations;
 using Moq;
 using NUnit.Framework;
 using Orchard.Caching;
@@ -188,7 +187,6 @@ namespace Orchard.Tests.Modules.Comments.Services {
         }
     }
 
-    [UsedImplicitly]
     public class CommentedItemHandler : ContentHandler {
         public CommentedItemHandler() {
             Filters.Add(new ActivatingFilter<CommentedItem>("commentedItem"));

src/Orchard.Tests.Modules/ImportExport/Services/ImportExportServiceTests.cs

@@ -56,7 +56,6 @@ namespace Orchard.Tests.Modules.ImportExport.Services {
             builder.RegisterType<RecipeHarvester>().As<IRecipeHarvester>();
             builder.RegisterType<RecipeStepExecutor>().As<IRecipeStepExecutor>();
             builder.RegisterType<StubStepQueue>().As<IRecipeStepQueue>().InstancePerLifetimeScope();
-            builder.RegisterType<StubRecipeJournal>().As<IRecipeJournal>();
             builder.RegisterType<StubRecipeScheduler>().As<IRecipeScheduler>();
             builder.RegisterType<ExtensionManager>().As<IExtensionManager>();
             builder.RegisterType<StubAppDataFolder>().As<IAppDataFolder>();

src/Orchard.Tests.Modules/Media/Services/MediaServiceTests.cs

@@ -17,7 +17,6 @@ namespace Orchard.Tests.Modules.Media.Services {
         private const string FolderName1 = "Folder1";
         private const string FolderName2 = "Folder2";
         private const string FolderName3 = "Folder3";
-        private const string FolderRecipeJournal = "RecipeJournal";
 
         private const string InnerDirectory = "MyDir";
 
@@ -54,11 +53,9 @@ namespace Orchard.Tests.Modules.Media.Services {
         [Test]
         public void GetMediaFoldersTest() {
             StorageProvider.ListFoldersPredicate = path => {
-                return string.IsNullOrEmpty(path)
-                            ? new[] {new StubStorageFolder(FolderName1)}
-                            : string.Equals(path, FolderName1)
-                                ? new[] {new StubStorageFolder(FolderName2), new StubStorageFolder(FolderName3)}
-                                : string.Equals(path, FolderRecipeJournal) ? new[] { new StubStorageFolder(FolderRecipeJournal), new StubStorageFolder(FolderName1) } : new StubStorageFolder[] { };
+                return string.IsNullOrEmpty(path) ? new[] {new StubStorageFolder(FolderName1)}
+                            : string.Equals(path, FolderName1) ? new[] {new StubStorageFolder(FolderName2), new StubStorageFolder(FolderName3)}
+                                 : new StubStorageFolder[] { };
                 };
 
             IEnumerable<MediaFolder> mediaFolders = MediaService.GetMediaFolders(null);
@@ -72,10 +69,6 @@ namespace Orchard.Tests.Modules.Media.Services {
             Assert.That(mediaFolders.Count(), Is.EqualTo(2), "Folder1 has 2 sub directories");
             Assert.That(mediaFolders.FirstOrDefault(mediaFolder => mediaFolder.Name.Equals(FolderName2)), Is.Not.Null, "Correct sub directory in root path");
             Assert.That(mediaFolders.FirstOrDefault(mediaFolder => mediaFolder.Name.Equals(FolderName3)), Is.Not.Null, "Correct sub directory in root path");
-
-            mediaFolders = MediaService.GetMediaFolders(FolderRecipeJournal);
-            Assert.That(mediaFolders.Count(), Is.EqualTo(1), "Folder that contains RecipeJournal hides the RecipeJournal directory.");
-            Assert.That(mediaFolders.FirstOrDefault(mediaFolder => mediaFolder.Name.Equals(FolderName1)), Is.Not.Null, "Correct sub directory in root path");
         }
 
         [Test]

src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj

@@ -205,6 +205,7 @@
     <ProjectReference Include="..\Orchard.Web\Core\Orchard.Core.csproj">
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\Orchard.Web\Modules\Lucene\Lucene.csproj">
       <Project>{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}</Project>
@@ -301,6 +302,7 @@
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
+      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -334,10 +336,10 @@
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
   -->
   <Target Name="CopySqlCeBinaries">
     <ItemGroup>

src/Orchard.Tests.Modules/Packaging/Services/Hello.World.csproj.txt

@@ -50,7 +50,7 @@
     <Reference Include="System.Data.DataSetExtensions">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="System.Web.Mvc, Version=5.2.3, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
     </Reference>

src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs

@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]

src/Orchard.Tests.Modules/Recipes/RecipeHandlers/ModuleRecipeHandlerTest.cs

@@ -29,6 +29,7 @@ using Orchard.Tests.Environment.Extensions;
 using Orchard.Tests.Environment.Features;
 using Orchard.Tests.Stubs;
 using IPackageManager = Orchard.Packaging.Services.IPackageManager;
+using Orchard.Tests.Modules.Recipes.Services;
 
 namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {
     [TestFixture]

src/Orchard.Tests.Modules/Recipes/Services/RecipeManagerTests.cs

@@ -70,7 +70,6 @@ namespace Orchard.Tests.Modules.Recipes.Services {
             builder.RegisterType<RecipeHarvester>().As<IRecipeHarvester>();
             builder.RegisterType<RecipeStepExecutor>().As<IRecipeStepExecutor>();
             builder.RegisterType<StubStepQueue>().As<IRecipeStepQueue>().InstancePerLifetimeScope();
-            builder.RegisterType<StubRecipeJournal>().As<IRecipeJournal>();
             builder.RegisterType<StubRecipeScheduler>().As<IRecipeScheduler>();
             builder.RegisterType<ExtensionManager>().As<IExtensionManager>();
             builder.RegisterType<StubAppDataFolder>().As<IAppDataFolder>();
@@ -152,28 +151,6 @@ namespace Orchard.Tests.Modules.Recipes.Services {
         }
     }
 
-    public class StubRecipeJournal : IRecipeJournal {
-        public void ExecutionStart(string executionId) {
-        }
-
-        public void ExecutionComplete(string executionId) {
-        }
-
-        public void ExecutionFailed(string executionId) {
-        }
-
-        public void WriteJournalEntry(string executionId, string message) {
-        }
-
-        public RecipeJournal GetRecipeJournal(string executionId) {
-            return new RecipeJournal();
-        }
-
-        public RecipeStatus GetRecipeStatus(string executionId) {
-            return RecipeStatus.Complete;
-        }
-    }
-
     public class StubStepQueue : IRecipeStepQueue {
         readonly Queue<RecipeStep> _queue = new Queue<RecipeStep>();
 

src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs

@@ -30,15 +30,17 @@ using Orchard.UI.PageClass;
 using Orchard.Users.Handlers;
 using Orchard.Users.Models;
 using Orchard.Users.Services;
+using Orchard.Services;
 
 namespace Orchard.Tests.Modules.Users.Services {
     [TestFixture]
     public class MembershipServiceTests {
+        private IMembershipValidationService _membershipValidationService;
         private IMembershipService _membershipService;
         private ISessionFactory _sessionFactory;
         private ISession _session;
         private IContainer _container;
-
+        private StubClock _clock;
 
         public class TestSessionLocator : ISessionLocator {
             private readonly ISession _session;
@@ -72,6 +74,7 @@ namespace Orchard.Tests.Modules.Users.Services {
         public void Init() {
             var builder = new ContainerBuilder();
             //builder.RegisterModule(new ImplicitCollectionSupportModule());
+            builder.RegisterType<MembershipValidationService>().As<IMembershipValidationService>();
             builder.RegisterType<MembershipService>().As<IMembershipService>();
             builder.RegisterType<DefaultContentQuery>().As<IContentQuery>();
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
@@ -88,6 +91,7 @@ namespace Orchard.Tests.Modules.Users.Services {
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
+            builder.RegisterInstance(_clock = new StubClock()).As<IClock>();
             builder.RegisterType<StubExtensionManager>().As<IExtensionManager>();
             builder.RegisterInstance(new Mock<IPageClassBuilder>().Object);
             builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
@@ -96,6 +100,7 @@ namespace Orchard.Tests.Modules.Users.Services {
             _session = _sessionFactory.OpenSession();
             builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>();
             _container = builder.Build();
+            _membershipValidationService = _container.Resolve<IMembershipValidationService>();
             _membershipService = _container.Resolve<IMembershipService>();
         }
 
@@ -152,5 +157,64 @@ namespace Orchard.Tests.Modules.Users.Services {
             Assert.That(validate2, Is.Null);
             Assert.That(validate3, Is.Not.Null);
         }
+
+        [Test]
+        public void UsersWhoHaveNeverLoggedInCanBeAuthenticated() {
+            var user = (UserPart)_membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true));
+            
+            Assert.That(_membershipValidationService.CanAuthenticateWithCookie(user), Is.True);
+        }
+
+        [Test]
+        public void UsersWhoHaveNeverLoggedOutCanBeAuthenticated() {
+            var user = (UserPart)_membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true));
+
+            user.LastLoginUtc = _clock.UtcNow;
+            _clock.Advance(TimeSpan.FromMinutes(1));
+
+            Assert.That(_membershipValidationService.CanAuthenticateWithCookie(user), Is.True);
+        }
+
+        [Test]
+        public void UsersWhoHaveLoggedOutCantBeAuthenticated() {
+            var user = (UserPart)_membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true));
+
+            user.LastLoginUtc = _clock.UtcNow;
+            _clock.Advance(TimeSpan.FromMinutes(1));
+            user.LastLogoutUtc = _clock.UtcNow;
+            _clock.Advance(TimeSpan.FromMinutes(1));
+
+            Assert.That(_membershipValidationService.CanAuthenticateWithCookie(user), Is.False);
+        }
+
+        [Test]
+        public void UsersWhoHaveLoggedInCanBeAuthenticated() {
+            var user = (UserPart)_membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true));
+
+            user.LastLogoutUtc = _clock.UtcNow;
+            _clock.Advance(TimeSpan.FromMinutes(1));
+            user.LastLoginUtc = _clock.UtcNow;
+            _clock.Advance(TimeSpan.FromMinutes(1));
+
+            Assert.That(_membershipValidationService.CanAuthenticateWithCookie(user), Is.True);
+        }
+
+        [Test]
+        public void PendingUsersCantBeAuthenticated() {
+            var user = (UserPart)_membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true));
+
+            user.RegistrationStatus = UserStatus.Pending;
+
+            Assert.That(_membershipValidationService.CanAuthenticateWithCookie(user), Is.False);
+        }
+
+        [Test]
+        public void ApprovedUsersCanBeAuthenticated() {
+            var user = (UserPart)_membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true));
+
+            user.RegistrationStatus = UserStatus.Approved;
+
+            Assert.That(_membershipValidationService.CanAuthenticateWithCookie(user), Is.True);
+        }
     }
 }

src/Orchard.Tests/App.config

@@ -16,7 +16,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.0.0" newVersion="5.2.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral"/>

src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs

@@ -471,6 +471,46 @@ namespace Orchard.Tests.ContentManagement {
             Assert.That(gamma2.Record.Versions, Has.Count.EqualTo(2));
         }
 
+        [Test]
+        public void DraftRequiredShouldAlwaysBuildNewVersionFromPublishedIfDraftNotFound()
+        {
+            Trace.WriteLine("gamma1");
+            var gamma1 = _manager.Create(DefaultGammaName, VersionOptions.Published);
+            Trace.WriteLine("flush");
+            _session.Flush();
+            _session.Clear();
+
+            Trace.WriteLine("gammaDraft1");
+            var gammaDraft1 = _manager.Get(gamma1.Id, VersionOptions.DraftRequired);
+            Assert.That(gammaDraft1.Version, Is.EqualTo(2));
+            Trace.WriteLine("flush");
+            _session.Flush();
+            _session.Clear();
+
+            Trace.WriteLine("Delete gammaDraft1");
+            var gammaDraft2 = _manager.Get(gammaDraft1.Id, VersionOptions.Draft);
+            gammaDraft2.VersionRecord.Latest = false;
+
+            Trace.WriteLine("Restore gamma1 as Latest");
+            var gamma2 = _manager.Get(gamma1.Id, VersionOptions.Published);
+            var publishedVersion = gamma2.Record.Versions.SingleOrDefault(x => x.Published);
+            if (publishedVersion != null)
+            {
+                publishedVersion.Latest = true;
+            }
+            Trace.WriteLine("flush");
+            _session.Flush();
+            _session.Clear();
+
+            Trace.WriteLine("gammaDraft3");
+            var gammaDraft3 = _manager.Get(gamma1.Id, VersionOptions.DraftRequired);
+            Assert.That(gammaDraft3.Version, Is.EqualTo(3));
+            Assert.That(gammaDraft3.Record, Is.Not.SameAs(gammaDraft2.Record));
+            Trace.WriteLine("flush");
+            _session.Flush();
+            _session.Clear();
+        }
+
         [Test]
         public void UsingGetManyDraftRequiredShouldBuildNewVersionIfLatestIsAlreadyPublished() {
             Trace.WriteLine("gamma1");

src/Orchard.Tests/ContentManagement/HqlExpressionTests.cs

@@ -59,6 +59,7 @@ namespace Orchard.Tests.ContentManagement {
             builder.RegisterInstance(new ShellSettings { Name = ShellSettings.DefaultName, DataProvider = "SqlCe" });
             builder.RegisterType<SqlCeStatementProvider>().As<ISqlStatementProvider>();
             builder.RegisterType<MySqlStatementProvider>().As<ISqlStatementProvider>();
+            builder.RegisterType<PostgreSqlStatementProvider>().As<ISqlStatementProvider>();
 
             builder.RegisterType<AlphaPartHandler>().As<IContentHandler>();
             builder.RegisterType<BetaPartHandler>().As<IContentHandler>();

src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs

@@ -12,15 +12,14 @@ using Orchard.Environment;
 using Orchard.Environment.Configuration;
 using Orchard.Environment.ShellBuilders.Models;
 using Orchard.FileSystems.AppData;
-using Orchard.Reports.Services;
 using Orchard.Tests.ContentManagement;
 using System.IO;
 using Orchard.Tests.Environment;
 using Orchard.Tests.FileSystems.AppData;
-using Orchard.Tests.Stubs;
 
-namespace Orchard.Tests.DataMigration {
-    [TestFixture]
+namespace Orchard.Tests.DataMigration
+{
+	[TestFixture]
     public class SchemaBuilderTestsBase {
         private IContainer _container;
         private ISessionFactory _sessionFactory;
@@ -45,7 +44,6 @@ namespace Orchard.Tests.DataMigration {
             builder.RegisterInstance(appDataFolder).As<IAppDataFolder>();
             builder.RegisterType<SqlCeDataServicesProvider>().As<IDataServicesProvider>();
             builder.RegisterType<DataServicesProviderFactory>().As<IDataServicesProviderFactory>();
-            builder.RegisterType<StubReportsCoordinator>().As<IReportsCoordinator>();
             builder.RegisterType<DefaultDataMigrationInterpreter>().As<IDataMigrationInterpreter>();
             builder.RegisterType<SqlCeCommandInterpreter>().As<ICommandInterpreter>();
             builder.RegisterType<SessionConfigurationCache>().As<ISessionConfigurationCache>();

src/Orchard.Tests/DataMigration/Utilities/NullInterpreter.cs

@@ -24,5 +24,10 @@ namespace Orchard.Tests.DataMigration.Utilities {
 
         public void Visit(DropForeignKeyCommand command) {
         }
+
+        public string PrefixTableName(string tableName) {
+            return tableName;
+        }
+
     }
 }

src/Orchard.Tests/DisplayManagement/Descriptors/ShapeAttributeBindingStrategyTests.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web.Routing;
 using Autofac;
-using JetBrains.Annotations;
 using Moq;
 using NUnit.Framework;
 using Orchard.DisplayManagement;
@@ -19,7 +18,7 @@ namespace Orchard.Tests.DisplayManagement.Descriptors {
     public class ShapeAttributeBindingStrategyTests : ContainerTestBase {
         private Feature _testFeature;
 
-        protected override void Register([NotNull] ContainerBuilder builder) {
+        protected override void Register(ContainerBuilder builder) {
             if (builder == null) {
                 throw new ArgumentNullException("builder");
             }

src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs

@@ -1,5 +1,6 @@
 using System.Web;
 using Autofac;
+using Moq;
 using NUnit.Framework;
 using Orchard.Environment;
 using Orchard.Mvc;
@@ -27,6 +28,13 @@ namespace Orchard.Tests.Environment {
             container.Mock<IHttpContextAccessor>()
                 .Setup(x => x.Current())
                 .Returns(() => _httpContextCurrent);
+
+            container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
+                .Returns(() => new StubHttpContext());
+
+            container.Mock<IWorkContextEvents>()
+                .Setup(x => x.Started());
         }
 
         [Test]

src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs

@@ -9,6 +9,7 @@ using Orchard.Environment.Descriptor;
 using Orchard.Environment.Descriptor.Models;
 using Orchard.Environment.ShellBuilders.Models;
 using Orchard.Mvc;
+using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.Environment.ShellBuilders {
@@ -32,6 +33,7 @@ namespace Orchard.Tests.Environment.ShellBuilders {
             var descriptor = new ShellDescriptor { SerialNumber = 6655321 };
             var blueprint = new ShellBlueprint();
             var shellLifetimeScope = _container.BeginLifetimeScope("shell");
+            var httpContext = new StubHttpContext();
 
             _container.Mock<IShellDescriptorCache>()
                 .Setup(x => x.Fetch(ShellSettings.DefaultName))
@@ -49,9 +51,16 @@ namespace Orchard.Tests.Environment.ShellBuilders {
                 .Setup(x => x.GetShellDescriptor())
                 .Returns(descriptor);
 
+            _container.Mock<IWorkContextEvents>()
+                .Setup(x => x.Started());
+
             _container.Mock<IHttpContextAccessor>()
                 .Setup(x => x.Current())
-                .Returns(default(HttpContextBase));
+                .Returns(httpContext);
+
+            _container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
+                .Returns(httpContext);
 
             var factory = _container.Resolve<IShellContextFactory>();
 

src/Orchard.Tests/Environment/State/DefaultProcessingEngineTests.cs

@@ -11,6 +11,7 @@ using Orchard.Environment.State;
 using Orchard.Environment.Descriptor.Models;
 using Orchard.Events;
 using Orchard.Mvc;
+using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.Environment.State {
@@ -34,12 +35,17 @@ namespace Orchard.Tests.Environment.State {
                 LifetimeScope = _container.BeginLifetimeScope(),
             };
 
+            var httpContext = new StubHttpContext();
+
             _container.Mock<IShellContextFactory>()
                 .Setup(x => x.CreateDescribedContext(_shellContext.Settings, _shellContext.Descriptor))
                 .Returns(_shellContext);
             _container.Mock<IHttpContextAccessor>()
                 .Setup(x=>x.Current())
-                .Returns(default(HttpContextBase));
+                .Returns(httpContext);
+            _container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
+                .Returns(httpContext);
 
         }
 

src/Orchard.Tests/Localization/LocalizationStreamParserTests.cs

@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Text;
+using NUnit.Framework;
+using Orchard.Localization.Services;
+
+namespace Orchard.Tests.Localization {
+
+    [TestFixture]
+    public class LocalizationStreamParserTests {
+
+        [Test]
+        public void ShouldTrimLeadingQuotes() {
+            var parser = new LocalizationStreamParser();
+
+            var text = new StringBuilder();
+            text.AppendLine("#: ~/Themes/MyTheme/Views/MyView.cshtml");
+            text.AppendLine("msgctxt \"~/Themes/MyTheme/Views/MyView.cshtml\"");
+            text.AppendLine("msgid \"\\\"{0}\\\" Foo\"");
+            text.AppendLine("msgstr \"\\\"{0}\\\" Foo\"");
+
+            var translations = new Dictionary<string, string>();
+            parser.ParseLocalizationStream(text.ToString(), translations, false);
+
+            Assert.AreEqual("\"{0}\" Foo", translations["~/themes/mytheme/views/myview.cshtml|\"{0}\" foo"]);
+        }
+
+        [Test]
+        public void ShouldTrimTrailingQuotes() {
+            var parser = new LocalizationStreamParser();
+
+            var text = new StringBuilder();
+            text.AppendLine("#: ~/Themes/MyTheme/Views/MyView.cshtml");
+            text.AppendLine("msgctxt \"~/Themes/MyTheme/Views/MyView.cshtml\"");
+            text.AppendLine("msgid \"Foo \\\"{0}\\\"\"");
+            text.AppendLine("msgstr \"Foo \\\"{0}\\\"\"");
+
+            var translations = new Dictionary<string, string>();
+            parser.ParseLocalizationStream(text.ToString(), translations, false);
+
+            Assert.AreEqual("Foo \"{0}\"", translations["~/themes/mytheme/views/myview.cshtml|foo \"{0}\""]);
+        }
+    }
+}

src/Orchard.Tests/Localization/TextTests.cs

@@ -0,0 +1,46 @@
+using Autofac;
+using Moq;
+using NUnit.Framework;
+using Orchard.Localization;
+using Orchard.Localization.Services;
+using Orchard.Mvc;
+using Orchard.Tests.Stubs;
+using System.Web;
+
+namespace Orchard.Tests.Localization {
+    [TestFixture]
+    public class TextTests {
+        private IContainer _container;
+        private IText _text;
+
+        [SetUp]
+        public void Init() {
+            var mockLocalizedManager = new Mock<ILocalizedStringManager>();
+            mockLocalizedManager
+                .Setup(x => x.GetLocalizedString(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+                .Returns("foo {0}");
+
+            var builder = new ContainerBuilder();
+            builder.RegisterInstance(new StubCultureSelector("fr-CA")).As<ICultureSelector>();
+            builder.RegisterInstance(new StubWorkContext()).As<WorkContext>();
+            builder.RegisterType<StubWorkContextAccessor>().As<IWorkContextAccessor>();
+            builder.RegisterInstance(mockLocalizedManager.Object);
+            builder.RegisterType<Orchard.Localization.Text>().As<IText>().WithParameter(new NamedParameter("scope", "scope"));
+            _container = builder.Build();
+            _text = _container.Resolve<IText>();
+        }
+
+        [Test]
+        public void TextHtmlEncodeAllArguments() {
+            Assert.That(_text.Get("foo {0}", "bar").Text, Is.EqualTo("foo bar"));
+            Assert.That(_text.Get("foo {0}", "<bar>").Text, Is.EqualTo("foo &lt;bar&gt;"));
+        }
+
+        [Test]
+        public void TextDoesEncodeHtmlEncodedArguments()
+        {
+            Assert.That(_text.Get("foo {0}", new HtmlString("bar")).Text, Is.EqualTo("foo bar"));
+            Assert.That(_text.Get("foo {0}", new HtmlString("<bar>")).Text, Is.EqualTo("foo <bar>"));
+        }
+    }
+}

src/Orchard.Tests/Orchard.Framework.Tests.csproj

@@ -259,6 +259,8 @@
     <Compile Include="FileSystems\Dependencies\AssemblyProbingFolderTests.cs" />
     <Compile Include="FileSystems\Dependencies\DependenciesFolderTests.cs" />
     <Compile Include="FileSystems\VirtualPath\DefaultVirtualPathProviderTests.cs" />
+    <Compile Include="Localization\LocalizationStreamParserTests.cs" />
+    <Compile Include="Localization\TextTests.cs" />
     <Compile Include="Localization\CurrentCultureWorkContextTests.cs" />
     <Compile Include="Localization\CultureManagerTests.cs" />
     <Compile Include="Localization\DateTimePartsTests.cs" />
@@ -279,7 +281,6 @@
     <Compile Include="Stubs\StubHttpContextAccessor.cs" />
     <Compile Include="Stubs\StubWorkContextAccessor.cs" />
     <Compile Include="Stubs\StubExtensionManager.cs" />
-    <Compile Include="Stubs\StubReportsCoordinator.cs" />
     <Compile Include="Stubs\StubVirtualPathProvider.cs" />
     <Compile Include="Stubs\StubFileSystem.cs" />
     <Compile Include="Stubs\StubAppDataFolder.cs" />
@@ -331,10 +332,12 @@
     <ProjectReference Include="..\Orchard.Web\Core\Orchard.Core.csproj">
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
+      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
+      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -380,10 +383,10 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
   -->
   <Target Name="CopySqlCeBinaries">
     <ItemGroup>

src/Orchard.Tests/Properties/AssemblyInfo.cs

@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]

src/Orchard.Tests/Stubs/StubHttpContextAccessor.cs

@@ -1,4 +1,5 @@
 using System.Web;
+using Autofac;
 using Orchard.Mvc;
 
 namespace Orchard.Tests.Stubs {
@@ -16,6 +17,10 @@ namespace Orchard.Tests.Stubs {
             return _httpContext;
         }
 
+        public HttpContextBase CreateContext(ILifetimeScope lifetimeScope) {
+            return _httpContext;
+        }
+
         public void Set(HttpContextBase httpContext) {
             _httpContext = httpContext;
         }

src/Orchard.Tests/Stubs/StubReportsCoordinator.cs

@@ -1,14 +0,0 @@
-using Orchard.Reports;
-using Orchard.Reports.Services;
-
-namespace Orchard.Tests.Stubs {
-    public class StubReportsCoordinator : IReportsCoordinator {
-        public void Add(string reportKey, ReportEntryType type, string message) {
-            
-        }
-
-        public int Register(string reportKey, string activityName, string title) {
-            return 0;
-        }
-    }
-}

src/Orchard.Tests/Tasks/SweepGeneratorTests.cs

@@ -3,7 +3,9 @@ using Autofac;
 using Moq;
 using NUnit.Framework;
 using Orchard.Environment;
+using Orchard.Mvc;
 using Orchard.Tasks;
+using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
 
 namespace Orchard.Tests.Tasks {
@@ -16,6 +18,19 @@ namespace Orchard.Tests.Tasks {
             builder.RegisterType<SweepGenerator>();
         }
 
+        protected override void Resolve(ILifetimeScope container) {
+            container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.Current())
+                .Returns(() => null);
+
+            container.Mock<IHttpContextAccessor>()
+                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
+                .Returns(() => new StubHttpContext());
+
+            container.Mock<IWorkContextEvents>()
+                .Setup(x => x.Started());
+        }
+
         [Test]
         public void DoWorkShouldSendHeartbeatToTaskManager() {
             var heartbeatSource = _container.Resolve<SweepGenerator>();

src/Orchard.Tests/Utility/Extensions/StringExtensionsTests.cs

@@ -282,5 +282,21 @@ namespace Orchard.Tests.Utility.Extensions {
             Assert.That("abc".Translate("d".ToCharArray(), "d".ToCharArray()), Is.StringMatching("abc"));
             Assert.That("abc".Translate("abc".ToCharArray(), "def".ToCharArray()), Is.StringMatching("def"));
         }
+
+        [Test]
+        public void ShouldEncodeToBase64() {
+            Assert.That("abc".ToBase64(), Is.EqualTo("YWJj"));
+        }
+
+        [Test]
+        public void ShouldDecodeFromBase64() {
+            Assert.That("YWJj".FromBase64(), Is.EqualTo("abc"));
+        }
+
+        [Test]
+        public void ShouldRoundtripBase64() {
+            Assert.That("abc".ToBase64().FromBase64(), Is.EqualTo("abc"));
+            Assert.That("YWJj".FromBase64().ToBase64(), Is.EqualTo("YWJj"));
+        }
     }
 }

src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj

@@ -24,6 +24,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs

@@ -32,8 +32,8 @@ using System.Security;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]
 
 // Enable web application to call this assembly in Full Trust
 [assembly: AllowPartiallyTrustedCallers]

src/Orchard.Web.Tests/Orchard.Web.Tests.csproj

@@ -96,6 +96,7 @@
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
+      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -119,11 +120,11 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
   -->
 </Project>

src/Orchard.Web.Tests/Properties/AssemblyInfo.cs

@@ -33,5 +33,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.9.0")]
-[assembly: AssemblyFileVersion("1.9.0")]
+[assembly: AssemblyVersion("1.9.1")]
+[assembly: AssemblyFileVersion("1.9.1")]

src/Orchard.Web/Config/log4net.config

@@ -1,88 +1,108 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <log4net>
 
-  <!-- If you are looking here and want more output, first thing to do is change root/priority/@value to "INFO" or "ALL". -->
+    <!-- If you are looking here and want more output, first thing to do is change root/priority/@value to "INFO" or "ALL". -->
 
-  <root>
-    <!-- Value of priority may be ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF. -->
-    <priority value="WARN" />
-    <appender-ref ref="error-file" />
-    <appender-ref ref="debug-file" />
-  </root>
+    <root>
+        <!-- Value of priority may be ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF. -->
+        <priority value="WARN" />
+        <appender-ref ref="error-file" />
+        <appender-ref ref="debug-file" />
+    </root>
 
-  <!-- Example of turning on the output from a component or namespace. -->
-  <!--
-  <logger name="Orchard.Data.SessionLocator">
-    <priority value="INFO" />
-  </logger>
-  -->
+    <!-- Example of turning on the output from a component or namespace. -->
+    <!--
+    <logger name="Orchard.Data.SessionLocator">
+        <priority value="INFO" />
+    </logger>
+    -->
 
-  <logger name="Orchard">
-    <!-- Messages coming from Orchard are sent to the attached debugger. -->
-    <appender-ref ref="debugger"/>
-    <!-- Note: if you put a ref=debugger into <root> element above and widen the priority to ALL or DEBUG,  then you will see nhibernate trace in the attached debugger as well. -->
-  </logger>
+    <logger name="Orchard.Recipes">
+        <!-- Anything recipe-related goes into a dedicated file. -->
+        <priority value="INFO" />
+        <appender-ref ref="recipes-file" />
+    </logger>
 
-  <logger name="Orchard.Localization">
-    <!-- This source is very verbose - setting priority here to avoid flooding trace if root priority is lowered. -->
-    <priority value="WARN" />
-  </logger>
+    <logger name="Orchard">
+        <!-- Messages coming from Orchard are sent to the attached debugger. -->
+        <appender-ref ref="debugger"/>
+        <!-- Note: if you put a ref=debugger into <root> element above and widen the priority to ALL or DEBUG,  then you will see nhibernate trace in the attached debugger as well. -->
+    </logger>
 
-  <logger name="NHibernate.Cache">
-    <!-- This source is very verbose - setting priority here to avoid flooding trace if root priority is lowered. -->
-    <priority value="ERROR" />
-  </logger>
+    <logger name="Orchard.Localization">
+        <!-- This source is very verbose - setting priority here to avoid flooding trace if root priority is lowered. -->
+        <priority value="WARN" />
+    </logger>
 
-  <logger name="NHibernate.AdoNet.AbstractBatcher">
-    <!-- Displays failed table statements that are otherwise intercepted and rendered when unexpected. -->
-    <priority value="OFF" />
-  </logger>
+    <logger name="NHibernate.Cache">
+        <!-- This source is very verbose - setting priority here to avoid flooding trace if root priority is lowered. -->
+        <priority value="ERROR" />
+    </logger>
 
-  <logger name="NHibernate.Util.ADOExceptionReporter">
-    <!-- Displays failed table statements that are otherwise intercepted and rendered when unexpected. -->
-    <priority value="OFF" />
-  </logger>
+    <logger name="NHibernate.AdoNet.AbstractBatcher">
+        <!-- Displays failed table statements that are otherwise intercepted and rendered when unexpected. -->
+        <priority value="OFF" />
+    </logger>
 
-  <appender name="debugger" type="log4net.Appender.DebugAppender">
-    <!-- Sends log messages to Visual Studio if attached. -->
-    <immediateFlush value="true" />
-    <layout type="log4net.Layout.SimpleLayout" />
-  </appender>
+    <logger name="NHibernate.Util.ADOExceptionReporter">
+        <!-- Displays failed table statements that are otherwise intercepted and rendered when unexpected. -->
+        <priority value="OFF" />
+    </logger>
 
-  <appender name="debug-file" type="Orchard.Logging.OrchardFileAppender">
-    <!-- Sends log messages to a file in App_Data. -->
-    <file value="App_Data/Logs/orchard-debug" />
-    <appendToFile value="true" />
-    <!-- Immediate flush on error log, to avoid data loss with sudden termination. -->
-    <immediateFlush value="true" />
-    <staticLogFileName value="false" />
-    <rollingStyle value="Date" />
-    <datepattern value="-yyyy.MM.dd'.log'" />
-    <!-- Prevents Orchard.exe from displaying locking debug messages. -->
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date [%thread] %logger - %P{Tenant} - %message%newline" />
-    </layout>
-  </appender>
+    <appender name="debugger" type="log4net.Appender.DebugAppender">
+        <!-- Sends log messages to Visual Studio if attached. -->
+        <immediateFlush value="true" />
+        <layout type="log4net.Layout.SimpleLayout" />
+    </appender>
+
+    <appender name="debug-file" type="Orchard.Logging.OrchardFileAppender">
+        <file value="App_Data/Logs/orchard-debug" />
+        <appendToFile value="true" />
+        <!-- Immediate flush on error log, to avoid data loss with sudden termination. -->
+        <immediateFlush value="true" />
+        <staticLogFileName value="false" />
+        <rollingStyle value="Date" />
+        <datepattern value="-yyyy.MM.dd'.log'" />
+        <!-- Prevents Orchard.exe from displaying locking debug messages. -->
+        <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+        <layout type="log4net.Layout.PatternLayout">
+            <conversionPattern value="%date [%thread] %logger - %P{Tenant} - %level% %message%newline" />
+        </layout>
+    </appender>
+
+    <appender name="error-file" type="Orchard.Logging.OrchardFileAppender">
+        <file value="App_Data/Logs/orchard-error" />
+        <appendToFile value="true" />
+        <!-- Immediate flush on error log, to avoid data loss with sudden termination. -->
+        <immediateFlush value="true" />
+        <staticLogFileName value="false" />
+        <rollingStyle value="Date" />
+        <datepattern value="-yyyy.MM.dd'.log'" />
+        <!-- Prevents Orchard.exe from displaying locking debug messages. -->
+        <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+        <filter type="log4net.Filter.LevelRangeFilter">
+            <!-- Only ERROR and FATAL log messages end up in this target, even if child loggers accept lower priority. -->
+            <levelMin value="ERROR" />
+        </filter>
+        <layout type="log4net.Layout.PatternLayout">
+            <conversionPattern value="%date [%thread] %logger - %P{Tenant} - %message%newline%P{Url}%newline" />
+        </layout>
+    </appender>
+
+    <appender name="recipes-file" type="Orchard.Logging.OrchardFileAppender">
+        <!-- Sends ERROR and FATAL log messages to a file in App_Data. -->
+        <file value="App_Data/Logs/orchard-recipes" />
+        <appendToFile value="true" />
+        <!-- Immediate flush on error log, to avoid data loss with sudden termination. -->
+        <immediateFlush value="true" />
+        <staticLogFileName value="false" />
+        <rollingStyle value="Date" />
+        <datepattern value="-yyyy.MM.dd'.log'" />
+        <!-- Prevents Orchard.exe from displaying locking debug messages. -->
+        <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+        <layout type="log4net.Layout.PatternLayout">
+            <conversionPattern value="%date [%thread] %logger - %P{Tenant} - %level% %message%newline" />
+        </layout>
+    </appender>
 
-  <appender name="error-file" type="Orchard.Logging.OrchardFileAppender">
-    <!-- Sends ERROR and FATAL log messages to a file in App_Data. -->
-    <file value="App_Data/Logs/orchard-error" />
-    <appendToFile value="true" />
-    <!-- Immediate flush on error log, to avoid data loss with sudden termination. -->
-    <immediateFlush value="true" />
-    <staticLogFileName value="false" />
-    <rollingStyle value="Date" />
-    <datepattern value="-yyyy.MM.dd'.log'" />
-    <!-- Prevents Orchard.exe from displaying locking debug messages. -->
-    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
-    <filter type="log4net.Filter.LevelRangeFilter">
-      <!-- Only ERROR and FATAL log messages end up in this target, even if child loggers accept lower priority. -->
-      <levelMin value="ERROR" />
-    </filter>
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date [%thread] %logger - %P{Tenant} - %message%newline %P{Url}%newline" />
-    </layout>
-  </appender>
-  
 </log4net>

src/Orchard.Web/Core/Common/DateEditor/DateEditorHandler.cs

@@ -1,10 +1,8 @@
-using JetBrains.Annotations;
 using Orchard.Core.Common.Models;
 using Orchard.ContentManagement.Handlers;
 using Orchard.Core.Common.Utilities;
 
 namespace Orchard.Core.Common.DateEditor {
-    [UsedImplicitly]
     public class DateEditorHandler : ContentHandler {
         public DateEditorHandler() {
             OnPublished<CommonPart>((context, part) => {

src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using JetBrains.Annotations;
 using Orchard.Mvc.Html;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
@@ -14,7 +13,6 @@ using System.Web.Mvc;
 using System.Web.Routing;
 
 namespace Orchard.Core.Common.Drivers {
-    [UsedImplicitly]
     public class BodyPartDriver : ContentPartDriver<BodyPart> {
         private readonly IEnumerable<IHtmlFilter> _htmlFilters;
         private readonly RequestContext _requestContext;

src/Orchard.Web/Core/Common/Drivers/IdentityPartDriver.cs

@@ -1,10 +1,8 @@
-using JetBrains.Annotations;
-using Orchard.ContentManagement.Drivers;
+using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Models;
 using Orchard.Localization;
 
 namespace Orchard.Core.Common.Drivers {
-    [UsedImplicitly]
     public class IdentityPartDriver : ContentPartDriver<IdentityPart> {
         public IdentityPartDriver() {
             T = NullLocalizer.Instance;

src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
-using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.Handlers;
@@ -12,7 +11,6 @@ using Orchard.Localization;
 using Orchard.Services;
 
 namespace Orchard.Core.Common.Drivers {
-    [UsedImplicitly]
     public class TextFieldDriver : ContentFieldDriver<TextField> {
         private readonly IEnumerable<IHtmlFilter> _htmlFilters;
 

src/Orchard.Web/Core/Common/Handlers/BodyPartHandler.cs

@@ -1,10 +1,8 @@
-using JetBrains.Annotations;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
 using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Core.Common.Handlers {
-    [UsedImplicitly]
     public class BodyPartHandler : ContentHandler {       
         public BodyPartHandler(IRepository<BodyPartRecord> bodyRepository) {
             Filters.Add(StorageFilter.For(bodyRepository));

src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using JetBrains.Annotations;
 using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
@@ -11,7 +10,6 @@ using Orchard.Security;
 using Orchard.Services;
 
 namespace Orchard.Core.Common.Handlers {
-    [UsedImplicitly]
     public class CommonPartHandler : ContentHandler {
         private readonly IClock _clock;
         private readonly IAuthenticationService _authenticationService;
@@ -77,7 +75,7 @@ namespace Orchard.Core.Common.Handlers {
         protected bool ContentTypeWithACommonPart(string typeName) {
             //Note: What about content type handlers which activate "CommonPart" in code?
             var contentTypeDefinition = _contentDefinitionManager.GetTypeDefinition(typeName);
-            
+
             if (contentTypeDefinition != null)
                 return contentTypeDefinition.Parts.Any(part => part.PartDefinition.Name == "CommonPart");
 
@@ -99,6 +97,7 @@ namespace Orchard.Core.Common.Handlers {
             part.ModifiedUtc = utcNow;
             part.VersionCreatedUtc = utcNow;
             part.VersionModifiedUtc = utcNow;
+            part.VersionModifiedBy = GetUserName();
         }
 
         private void AssignUpdateDates(UpdateEditorContext context, CommonPart part) {
@@ -106,6 +105,7 @@ namespace Orchard.Core.Common.Handlers {
 
             part.ModifiedUtc = utcNow;
             part.VersionModifiedUtc = utcNow;
+            part.VersionModifiedBy = GetUserName();
         }
 
         private void AssignRemovingDates(RemoveContentContext context, CommonPart part) {
@@ -113,15 +113,17 @@ namespace Orchard.Core.Common.Handlers {
 
             part.ModifiedUtc = utcNow;
             part.VersionModifiedUtc = utcNow;
+            part.VersionModifiedBy = GetUserName();
         }
 
         protected void AssignVersioningDates(VersionContentContext context, CommonPart existing, CommonPart building) {
             var utcNow = _clock.UtcNow;
 
-             // assign the created date
+            // assign the created date
             building.VersionCreatedUtc = utcNow;
             // assign modified date for the new version
             building.VersionModifiedUtc = utcNow;
+            building.VersionModifiedBy = GetUserName();
             // publish date should be null until publish method called
             building.VersionPublishedUtc = null;
 
@@ -136,7 +138,7 @@ namespace Orchard.Core.Common.Handlers {
 
         protected void AssignPublishingDates(PublishContentContext context, CommonPart part) {
             var utcNow = _clock.UtcNow;
-            
+
             part.PublishedUtc = utcNow;
             part.VersionPublishedUtc = utcNow;
         }
@@ -144,33 +146,37 @@ namespace Orchard.Core.Common.Handlers {
         protected void LazyLoadHandlers(CommonPart part) {
             // add handlers that will load content for id's just-in-time
             part.OwnerField.Loader(() => _contentManager.Get<IUser>(part.Record.OwnerId));
-            part.ContainerField.Loader(() => part.Record.Container == null ? null : _contentManager.Get(part.Record.Container.Id));            
+            part.ContainerField.Loader(() => part.Record.Container == null ? null : _contentManager.Get(part.Record.Container.Id));
         }
 
         protected static void PropertySetHandlers(ActivatedContentContext context, CommonPart part) {
             // add handlers that will update records when part properties are set
 
             part.OwnerField.Setter(user => {
-                                       part.Record.OwnerId = user == null
-                                           ? 0
-                                           : user.ContentItem.Id;
-                                       return user;
-                                   });
+                part.Record.OwnerId = user == null
+                    ? 0
+                    : user.ContentItem.Id;
+                return user;
+            });
 
             // Force call to setter if we had already set a value
             if (part.OwnerField.Value != null)
                 part.OwnerField.Value = part.OwnerField.Value;
 
             part.ContainerField.Setter(container => {
-                                           part.Record.Container = container == null
-                                               ? null
-                                               : container.ContentItem.Record;
-                                           return container;
-                                       });
+                part.Record.Container = container == null
+                    ? null
+                    : container.ContentItem.Record;
+                return container;
+            });
 
             // Force call to setter if we had already set a value
             if (part.ContainerField.Value != null)
                 part.ContainerField.Value = part.ContainerField.Value;
         }
+        private string GetUserName() {
+            var user = _authenticationService.GetAuthenticatedUser();
+            return user == null ? string.Empty : user.UserName;
+        }
     }
 }

src/Orchard.Web/Core/Common/Handlers/IdentityPartHandler.cs

@@ -1,12 +1,10 @@
 using System;
-using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.Core.Common.Models;
 using Orchard.Data;
 using Orchard.ContentManagement.Handlers;
 
 namespace Orchard.Core.Common.Handlers {
-    [UsedImplicitly]
     public class IdentityPartHandler : ContentHandler {
         public IdentityPartHandler(IRepository<IdentityPartRecord> identityRepository,
             IContentManager contentManager) {

src/Orchard.Web/Core/Common/Migrations.cs

@@ -15,14 +15,14 @@ namespace Orchard.Core.Common {
         }
 
         public int Create() {
-            SchemaBuilder.CreateTable("BodyPartRecord", 
+            SchemaBuilder.CreateTable("BodyPartRecord",
                 table => table
                     .ContentPartVersionRecord()
                     .Column<string>("Text", column => column.Unlimited())
                     .Column<string>("Format")
                 );
 
-            SchemaBuilder.CreateTable("CommonPartRecord", 
+            SchemaBuilder.CreateTable("CommonPartRecord",
                 table => table
                     .ContentPartRecord()
                     .Column<int>("OwnerId")
@@ -31,13 +31,14 @@ namespace Orchard.Core.Common {
                     .Column<DateTime>("ModifiedUtc")
                     .Column<int>("Container_id")
                 );
-            
-            SchemaBuilder.CreateTable("CommonPartVersionRecord", 
+
+            SchemaBuilder.CreateTable("CommonPartVersionRecord",
                 table => table
                     .ContentPartVersionRecord()
                     .Column<DateTime>("CreatedUtc")
                     .Column<DateTime>("PublishedUtc")
                     .Column<DateTime>("ModifiedUtc")
+                    .Column<string>("ModifiedBy")
                 );
 
             SchemaBuilder.CreateTable("IdentityPartRecord",
@@ -58,7 +59,7 @@ namespace Orchard.Core.Common {
                 .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 4;
+            return 5;
         }
 
         public int UpdateFrom1() {
@@ -99,13 +100,17 @@ namespace Orchard.Core.Common {
 
             foreach (var existingIdentityPart in existingIdentityParts) {
                 var updateIdentityPartRecord = _identityPartRepository.Get(existingIdentityPart.Id);
-                
+
                 updateIdentityPartRecord.Identifier = existingIdentityPart.Identifier;
-                
+
                 _identityPartRepository.Update(updateIdentityPartRecord);
             }
 
             return 4;
         }
+        public int UpdateFrom4() {
+            SchemaBuilder.AlterTable("CommonPartVersionRecord", table => table.AddColumn<string>("ModifiedBy", command => command.Nullable()));
+            return 5;
+        }
     }
 }

src/Orchard.Web/Core/Common/Models/CommonPart.cs

@@ -1,7 +1,7 @@
 using System;
-using Orchard.Core.Common.Utilities;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
+using Orchard.ContentManagement.Utilities;
 using Orchard.Security;
 
 namespace Orchard.Core.Common.Models {
@@ -54,6 +54,15 @@ namespace Orchard.Core.Common.Models {
                     PartVersionRecord.CreatedUtc = value;
             }
         }
+        public string VersionModifiedBy {
+            get {
+                return PartVersionRecord == null ? null : PartVersionRecord.ModifiedBy;
+            }
+            set {
+                if (PartVersionRecord != null)
+                    PartVersionRecord.ModifiedBy = value;
+            }
+        }
 
         public DateTime? VersionPublishedUtc {
             get {

src/Orchard.Web/Core/Common/Models/CommonPartVersionRecord.cs

@@ -6,5 +6,6 @@ namespace Orchard.Core.Common.Models {
         public virtual DateTime? CreatedUtc { get; set; }
         public virtual DateTime? PublishedUtc { get; set; }
         public virtual DateTime? ModifiedUtc { get; set; }
+        public virtual string ModifiedBy { get; set; }
     }
 }

src/Orchard.Web/Core/Common/Module.txt

@@ -2,7 +2,7 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.9.0
+Version: 1.9.1
 OrchardVersion: 1.9
 Description: The common module introduces content parts that are going to be used by most content types (common, body, identity).
 FeatureDescription: Core content parts.

src/Orchard.Web/Core/Common/Utilities/LazyField.cs

@@ -1,14 +1,15 @@
 using System;
 
 namespace Orchard.Core.Common.Utilities {
+    [Obsolete("Use Orchard.ContentManagement.Utilities.LazyField instead.")]
     public class LazyField<T> {
         private T _value;
         private Func<T> _loader;
         private Func<T, T> _setter;
 
         public T Value {
-            get {return GetValue();}
-            set {SetValue(value);}
+            get { return GetValue(); }
+            set { SetValue(value); }
         }
 
         public void Loader(Func<T> loader) {
@@ -22,7 +23,7 @@ namespace Orchard.Core.Common.Utilities {
         private T GetValue() {
             if (_loader != null) {
                 _value = _loader();
-                _loader = null;                
+                _loader = null;
             }
             return _value;
         }

src/Orchard.Web/Core/Common/Views/CommonMetadataLastModified.cshtml

@@ -0,0 +1,18 @@
+@*
+    Model:
+      ContentPart
+*@
+
+@{
+    string displayUser = null;
+    if (Model.ContentPart != null) {
+        if (!string.IsNullOrWhiteSpace(Model.ContentPart.VersionModifiedBy)) {
+            displayUser = Model.ContentPart.VersionModifiedBy;
+        }
+        else if (Model.ContentPart.Owner != null) {
+            displayUser = Model.ContentPart.Owner.UserName;
+        }
+    }
+}
+
+@T("By {0}", displayUser ?? T("unknown").ToString())

src/Orchard.Web/Core/Common/Views/CommonMetadataOwner.cshtml

@@ -1,14 +0,0 @@
-@*
-    Model:
-      ContentPart
-*@
-
-@using Orchard.ContentManagement;
-@using Orchard.Core.Common.Models;
-@using Orchard.Security;
-@{
-    CommonPart commonPart = Model.ContentPart;
-    // owner isn't really who last modified this, is it?
-    IUser owner = commonPart.As<CommonPart>() == null ? null : commonPart.As<CommonPart>().Owner;
-}
-@T("By {0}", owner == null ? T("unknown").ToString() : Convert.ToString(Html.ItemDisplayText(owner)))

src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.SummaryAdmin.cshtml

@@ -1,12 +1,10 @@
-@using Orchard.ContentManagement;
-@using Orchard.Core.Common.Models;
-@{
-    CommonPart commonPart = Model.ContentPart;
-    DateTime? modifiedUtc = commonPart.As<CommonPart>() == null ? null : commonPart.As<CommonPart>().ModifiedUtc;
+@{
+    DateTime? modifiedUtc = Model.ContentPart == null ? null : Model.ContentPart.ModifiedUtc;
 }
 <ul class="pageStatus">
-    <li>@if (modifiedUtc.HasValue) {
-        @T("Last modified: {0}", Display.DateTimeRelative(DateTimeUtc: modifiedUtc.Value))}&nbsp;&#124;&nbsp;
-    </li>
-    <li>@Display.CommonMetadataOwner(ContentPart: Model.ContentPart)</li>
-    </ul>
+    <li>
+        @if (modifiedUtc.HasValue) {
+            @T("Last modified: {0}", Display.DateTimeRelative(DateTimeUtc: modifiedUtc.Value))}&nbsp;&#124;&nbsp;
+</li>
+<li>@Display.CommonMetadataLastModified(ContentPart: Model.ContentPart)</li>
+</ul>

src/Orchard.Web/Core/Containers/Models/ContainerPart.cs

@@ -2,7 +2,7 @@
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.Records;
-using Orchard.Core.Common.Utilities;
+using Orchard.ContentManagement.Utilities;
 using Orchard.Core.Containers.Services;
 using Orchard.Core.Containers.Settings;
 using Orchard.UI.Navigation;

src/Orchard.Web/Core/Containers/Models/OrderByDirection.cs

@@ -1,6 +0,0 @@
-namespace Orchard.Core.Containers.Models {
-    public enum OrderByDirection {
-        Ascending,
-        Descending
-    }
-}

src/Orchard.Web/Core/Containers/Module.txt

@@ -2,7 +2,7 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.9.0
+Version: 1.9.1
 OrchardVersion: 1.9
 Description: The containers module introduces container and containable behaviors for content items.
 FeatureDescription: Container and containable parts to enable parent-child relationships between content items.

src/Orchard.Web/Core/Containers/ViewModels/ContainerViewModel.cs

@@ -26,8 +26,6 @@ namespace Orchard.Core.Containers.ViewModels {
 
     public enum SortDirection {
         Ascending,
-        Descending,
-        Created,
-        DisplayText
+        Descending
     }
 }

src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml

@@ -1,5 +1,4 @@
 @model Orchard.Core.Containers.ViewModels.ContainerWidgetViewModel
-@using Orchard.Core.Containers.Models;
 @{
     Script.Require("ShapesBase");
 }
@@ -25,8 +24,8 @@
         @Html.SelectOption(Model.Part.Record.OrderByProperty, "CustomPropertiesPart.CustomThree", T("Custom 3").Text)
     </select>
     <select title="@T("Order direction")" id="@Html.FieldIdFor(m => m.Part.Record.OrderByDirection)" name="@Html.FieldNameFor(m => m.Part.Record.OrderByDirection)">
-        @Html.SelectOption(Model.Part.Record.OrderByDirection, (int)OrderByDirection.Ascending, T("Ascending").Text)
-        @Html.SelectOption(Model.Part.Record.OrderByDirection, (int)OrderByDirection.Descending, T("Descending").Text)
+        @Html.SelectOption(Model.Part.Record.OrderByDirection, (int)SortDirection.Ascending, T("Ascending").Text)
+        @Html.SelectOption(Model.Part.Record.OrderByDirection, (int)SortDirection.Descending, T("Descending").Text)
     </select>
 </fieldset>
 <fieldset>

src/Orchard.Web/Core/Contents/Module.txt

@@ -2,7 +2,7 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.9.0
+Version: 1.9.1
 OrchardVersion: 1.9
 Description: The contents module enables the creation of custom content types. 
 Features:

src/Orchard.Web/Core/Contents/Security/AuthorizationEventHandler.cs

@@ -1,4 +1,3 @@
-using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.Core.Contents.Settings;
@@ -6,7 +5,6 @@ using Orchard.Security;
 using Orchard.Security.Permissions;
 
 namespace Orchard.Core.Contents.Security {
-    [UsedImplicitly]
     public class AuthorizationEventHandler : IAuthorizationServiceEventHandler {
         public void Checking(CheckAccessContext context) { }
         public void Complete(CheckAccessContext context) { }

src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml

@@ -16,8 +16,10 @@
 <div class="manage">
     @Html.ActionLink(createLinkText.Text, "Create", new { Area = "Contents", Id = (string)Model.Options.SelectedFilter }, new { @class = "button primaryAction" })
 </div>
+
 @using (Html.BeginFormAntiForgeryPost()) {
     <fieldset class="bulk-actions">
+        <label><input type="checkbox" class="check-all" />@T("Select all")</label>@T(" | ")
         <label for="publishActions">@T("Actions:")</label>
         <select id="publishActions" name="Options.BulkAction">
             @Html.SelectOption((ContentsBulkAction)Model.Options.BulkAction, ContentsBulkAction.None, T("Choose action...").ToString())

src/Orchard.Web/Core/Dashboard/Module.txt

@@ -2,7 +2,7 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.9.0
+Version: 1.9.1
 OrchardVersion: 1.9
 Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application.
 FeatureDescription: Standard admin dashboard.

src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml

@@ -26,7 +26,7 @@
     </div>
     <div class="help-item">
         <h2 class="contribute">@T("Contribute back")</h2>
-        <p>@T("Help grow Orchard. We encourage contributions of all sorts, including code submissions, documentation, translations, feature recommendations, and more.Here are some ways to  <a href=\"http://orchardproject.net/contribution\">give back to the project</a>.")</p>
+        <p>@T("Help grow Orchard. We encourage contributions of all sorts, including code submissions, documentation, translations, feature recommendations, and more. Here are some ways to <a href=\"http://orchardproject.net/contribution\">give back to the project</a>.")</p>
     </div>
 
 <div class="help-item">