Upgrading Lucene dll

Resolves #5878 : URL Field for Dynamic Forms

Orchard.proj

@@ -27,6 +27,7 @@
 
     <BuildPlatform Condition="$(ProgramW6432) != ''">x64</BuildPlatform>
     <BuildPlatform Condition="$(BuildPlatform) == ''">x86</BuildPlatform>
+    <Configuration Condition="$(Configuration) == ''">Release</Configuration>
 
     <!-- TeamCity build number -->
     <Version>$(BUILD_NUMBER)</Version>
@@ -115,7 +116,7 @@
     <MSBuild
       Projects="$(SrcFolder)\Orchard.sln"
       Targets="Build"
-      Properties="Configuration=Release;OutputPath=$(CompileFolder)" />
+      Properties="Configuration=$(Configuration);OutputPath=$(CompileFolder)" />
     <!-- Compile to "regular" output folder for devs using VS locally -->
     <MSBuild
       Projects="$(SrcFolder)\Orchard.sln"
@@ -126,7 +127,7 @@
     <MSBuild
       Projects="$(SrcFolder)\Tools\MSBuild.Orchard.Tasks\MSBuild.Orchard.Tasks.csproj"
       Targets="Build"
-      Properties="Configuration=Release;OutputPath=$(MsBuildTasksFolder)" />
+      Properties="Configuration=$(Configuration);OutputPath=$(MsBuildTasksFolder)" />
   </Target>
 
   <Target Name="TypeScript" DependsOnTargets="CompileMsBuildTasks">
@@ -155,7 +156,7 @@
       <Output TaskParameter="Include" ItemName="TestAssemblies" />
     </CreateItem>
 
-    <NUnit Assemblies="@(TestAssemblies)" ToolPath="$(LibFolder)\nunit" WorkingDirectory="$(CompileFolder)" OutputXmlFile="$(BuildFolder)\Orchard.Tests.xml" />
+    <NUnit Assemblies="@(TestAssemblies)" ToolPath="$(LibFolder)\nunit" WorkingDirectory="$(CompileFolder)" OutputXmlFile="$(BuildFolder)\Orchard.Tests.xml" ExcludeCategory="longrunning" />
   </Target>
 
   <Target Name ="Spec" DependsOnTargets="Package-Stage">
@@ -273,19 +274,19 @@
     <!-- extra processing of the staged config files -->
     <TransformXml 
       Source="$(StageFolder)\Web.Config"
-      Transform="$(SrcFolder)\Orchard.Web\Web.Release.Config"
+      Transform="$(SrcFolder)\Orchard.Web\Web.$(Configuration).Config"
       Destination="$(StageFolder)\Web.Config"
     />
 
     <TransformXml 
       Source="$(StageFolder)\Config\HostComponents.Config"
-      Transform="$(SrcFolder)\Orchard.Web\Config\HostComponents.Release.Config"
+      Transform="$(SrcFolder)\Orchard.Web\Config\HostComponents.$(Configuration).Config"
       Destination="$(StageFolder)\Config\HostComponents.Config"
     />
 
     <TransformXml 
       Source="$(StageFolder)\Config\log4net.Config"
-      Transform="$(SrcFolder)\Orchard.Web\Config\log4net.Release.Config"
+      Transform="$(SrcFolder)\Orchard.Web\Config\log4net.$(Configuration).Config"
       Destination="$(StageFolder)\Config\log4net.Config"
     />
     

README.md

@@ -1,6 +1,13 @@
 # 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)
+
+You can try it for free on [DotNest.com](https://dotnest.com) or on Microsoft Azure by clicking on this button
+
+[![Deploy to Azure](https://azuredeploy.net/deploybutton.png)](https://ms.portal.azure.com/#create/OutercurveFoundation.OrchardCMS.0.5.9)
+
 ## About The Orchard Project
 
 #### Please visit our website at http://orchardproject.net for the most current information about this project.
@@ -13,26 +20,29 @@ Orchard is delivered under the [.NET Foundation](http://www.dotnetfoundation.org
 
 Our mission is to empower our users and foster a dedicated and diverse community that builds the CMS that we all want to use.
 
-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.2. 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.2 release is available from our Downloads page, and is easy to [Install Orchard using the Web Platform Installer](http://docs.orchardproject.net/Documentation/Installing-Orchard). 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)
+* [Feature roadmap](http://docs.orchardproject.net/Documentation/feature-roadmap)
 * [Docs and designs/specs](http://www.orchardproject.net/docs)
 * [About us](http://www.orchardproject.net/about)
 * [Contact us](mailto:ofeedbk@microsoft.com)
 
 ## How To Get Involved
-We hope that by engaging with the community in the very early stages of the project that we will be able to shape Orchard into a valuable set of tools and applications for the community.  The Orchard team is committed to open community participation and accepts code contributions today.  We encourage community participation at all levels from general project feedback to bug fixes and patches.  
+We hope that by engaging with the community we will continue to shape Orchard into a valuable set of tools and applications. The Orchard team is committed to open community participation and accepts code contributions.  We encourage community participation at all levels from general project feedback to bug fixes and patches.  
+
+There are many ways you can [contribute to Orchard](http://orchardproject.net/contribution):
 
 * [Check out the code](https://github.com/OrchardCMS/Orchard)
-* [Check out the docs](http://orchardproject.net/docs)
+* [Write documentation](https://github.com/OrchardCMS/OrchardDoc)
 * [Find and file a bug](https://github.com/OrchardCMS/Orchard/issues)
 * [Propose a feature idea](http://orchard.uservoice.com)
-* [Ask and answer questions](http://www.orchardproject.net/discussions)
+* [Ask and answer questions in our forums](http://www.orchardproject.net/discussions) and [on Stack Overflow](http://stackoverflow.com/questions/tagged/orchardcms)
+* [Participate in our gitter.im chatroom](https://gitter.im/OrchardCMS/Orchard)
 * [Participate in forum discussions](http://orchard.codeplex.com/discussions)
-* [Submit a patch](http://www.orchardproject.net/docs/Contributing-patches.ashx)
+* [Submit a pull request](http://docs.orchardproject.net/Documentation/Contributing-patches)
+* [Translate Orchard](http://orchardproject.net/localize)
+* [Contribute modules and themes to our gallery](http://gallery.orchardproject.net/)
 * [Send us feedback](mailto:ofeedbk@microsoft.com)

lib/lucene.net/patch.txt

@@ -1 +0,0 @@
-This is a modified version including a [assembly: SecutiryTransparent] attribute in AssemblyInfo.cs

lib/msdeploy/createlogin.sql

@@ -0,0 +1,9 @@
+/**********************************************************************/
+/* Install.SQL                                                        */
+/* Creates a login and makes the user a member of db roles            */
+/*                                                                    */
+/*           Modifications for SQL AZURE  - ON MASTER                 */
+/**********************************************************************/
+
+
+CREATE LOGIN PlaceHolderForUser WITH PASSWORD = 'PlaceHolderForPassword'

lib/msdeploy/createuser.sql

@@ -0,0 +1,15 @@
+/**********************************************************************/
+/* CreateUser.SQL */
+/* Creates a user and makes the user a member of db roles */
+/* This script runs against the User database and requires connection string */
+/* Supports SQL Server and SQL AZURE */
+/**********************************************************************/
+
+-- Create database user and map to login
+-- and add user to the datareader, datawriter, ddladmin and securityadmin roles
+--
+
+CREATE USER PlaceHolderForUser FOR LOGIN PlaceHolderForUser;
+GO
+EXEC sp_addrolemember 'db_owner', PlaceHolderForUser;
+GO

lib/msdeploy/install.sql

@@ -1,45 +0,0 @@
-/**********************************************************************/
-/* Install.SQL                                                        */
-/* Creates a login and makes the user a member of db roles            */
-/*                                                                    */
-/**********************************************************************/
-
--- Declare variables for database name, username and password
-DECLARE @dbName sysname,
-      @dbUser sysname,
-      @dbPwd nvarchar(max);
-
--- Set variables for database name, username and password
-SET @dbName = 'PlaceHolderForDb';
-SET @dbUser = 'PlaceHolderForUser';
-SET @dbPwd = 'PlaceHolderForPassword';
-
-DECLARE @cmd nvarchar(max)
-
--- Create login
-IF( SUSER_SID(@dbUser) is null )
-BEGIN
-    print '-- Creating login '
-    SET @cmd = N'CREATE LOGIN ' + quotename(@dbUser) + N' WITH PASSWORD ='''+ replace(@dbPwd, '''', '''''') + N''''
-    EXEC(@cmd)
-END
-
--- Create database user and map to login
--- and add user to the datareader, datawriter, ddladmin and securityadmin roles
---
-SET @cmd = N'USE ' + quotename(@DBName) + N'; 
-IF( NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = ''' + replace(@dbUser, '''', '''''') + N'''))
-BEGIN
-    print ''-- Creating user'';
-    CREATE USER ' + quotename(@dbUser) + N' FOR LOGIN ' + quotename(@dbUser) + N';
-    print ''-- Adding user'';
-    EXEC sp_addrolemember ''db_ddladmin'', ''' + replace(@dbUser, '''', '''''') + N''';
-    print ''-- Adding user'';
-    EXEC sp_addrolemember ''db_securityadmin'', ''' + replace(@dbUser, '''', '''''') + N''';
-    print ''-- Adding user'';
-    EXEC sp_addrolemember ''db_datareader'', ''' + replace(@dbUser, '''', '''''') + N''';
-    print ''-- Adding user'';
-    EXEC sp_addrolemember ''db_datawriter'', ''' + replace(@dbUser, '''', '''''') + N''';
-END'
-EXEC(@cmd)
-GO

lib/msdeploy/manifest.xml

@@ -1,7 +1,13 @@
 <MSDeploy.iisApp>
-  <iisapp path="Orchard" managedRuntimeVersion="v4.0" />
+	<iisapp path="Orchard" managedRuntimeVersion="v4.0" />
 	<setAcl path="Orchard/App_Data" setAclAccess="Modify" />
 	<setAcl path="Orchard/Media" setAclAccess="Modify" />
 	<setAcl path="Orchard/bin/HostRestart" setAclAccess="Modify" />
-	<dbFullSql path="install.sql" />
-</MSDeploy.iisApp>
+
+	<!-- Runs SQL script to create login and assign permissions, requires transacted="false" 
+		This script runs as the database administrator provided in parameters.xml 
+  	-->
+	<dbfullsql path="createlogin.sql" transacted="false" />
+	<dbfullsql path="createuser.sql" transacted="false" />
+
+</MSDeploy.iisApp>

lib/msdeploy/parameters.xml

@@ -23,19 +23,20 @@
 
 	<!-- Prompts for the database name and fills it into the database scripts -->
 	<parameter name="Database Name" description="Name of the database for Orchard." defaultValue="orchard" tags="SQL, dbName">
-		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForDb" />
+		
 	</parameter>	
 
         <!-- Prompts for the database username and fills it into the database scripts.
 	The SQL tag indicates it is a parameter required for SQL, the DbUsername tag indicates this is a Db username -->
 	<parameter name="Database Username" description="User name to access you application database." defaultValue="orcharduser" tags="SQL, DbUsername">
-		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForUser" />
+		<parameterEntry type="TextFile" scope="createuser.sql" match="PlaceHolderForUser" />
+		<parameterEntry type="TextFile" scope="createlogin.sql" match="PlaceHolderForUser" />
 	</parameter>
 
         <!-- Prompts for the database password and fills it into the database scripts.
 	The SQL tag indicates it is a parameter required for SQL, the DbUserPassword tag indicates this is a Db password -->
 	<parameter name="Database Password" description="Password for the Database Username." tags="New, Password, SQL, DbUserPassword">
-		<parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForPassword" />
+		<parameterEntry type="TextFile" scope="createlogin.sql" match="PlaceHolderForPassword" />
 	</parameter>
 
 	<!-- Prompts for the admin creds and uses it for the administrator connection string. This is used to create a login and assign permissions. 
@@ -47,19 +48,17 @@
 	<!-- Prompts for the admin password and uses it for the administrator connection string.  
         This is use to create a login and assign permissions. The SQL tag indicates it is a parameter required for SQL. 
         The DbAdminPassword tag indicates it should be used when the user is creating a new database. If they're not, it can be filled in with the DbUserPassword value. -->
-	<parameter name="Database Administrator Password" description="Password for the database administrator account." tags="New, Password, SQL, dbAdminPassword">
+	<parameter name="Database Administrator Password" description="Password for the database administrator account." tags="Password, SQL, dbAdminPassword">
 	</parameter>
 	
-	<parameter name="Admin Connection String SqlServer" 
-	tags="SQLConnectionString, AdminConnectionString, Hidden, Validate" description="Automatically sets the connection string for the connection request." 
-	defaultValue="Data Source={Database Server};Initial Catalog={Database Name};User Id={Database Administrator};Password={Database Administrator Password}">
-		<parameterEntry type="ProviderPath" scope="dbfullsql" match="install.sql" /> 
+	<parameter name="Admin Connection String SqlServer1" tags="SQLConnectionString, sql, Hidden" description="Automatically sets the connection string for the connection request." defaultValue="Data Source={Database Server};Initial Catalog=MASTER;User Id={Database Administrator};Password={Database Administrator Password}">
+		<parameterEntry type="ProviderPath" scope="dbfullsql" match="createlogin.sql" />
 	</parameter>
 	
-	<parameter name="Non-Admin Connection String SqlServer" 
-	tags="SQLConnectionString, UserConnectionString, Hidden" description="Automatically sets the connection string for the connection request." 
-	defaultValue="Data Source={Database Server};Initial Catalog={Database Name};User Id={Database Username};Password={Database Password}">
+	<parameter name="Admin Connection String SqlServer2" tags="SQLConnectionString, SQL, Hidden" description="Automatically sets the connection string for the connection request." defaultValue="Data Source={Database Server};Initial Catalog={Database Name};User Id={Database Administrator};Password={Database Administrator Password}">
+		<parameterEntry type="ProviderPath" scope="dbfullsql" match="createuser.sql" />
 	</parameter>
+
 	
 	<parameter name="Orchard Connection String" friendlyName="Orchard Connection String" description="Orchard SQL Data Connection String Setting" defaultValue="" tags="Sql, SqlCE, SingleLineConnectionString, Hidden">
 		<parameterEntry kind="TextFile" scope="\\Settings\.txt$" match="(?&lt;=\s*DataConnectionString:\s+)[^\s].*[^\r\n]" /> 

lib/windowsazure/Microsoft.Azure.Common.xml

@@ -161,6 +161,237 @@
             asynchronous request failed.
             </summary>
         </member>
+        <member name="T:Microsoft.Azure.ResourceBase">
+            <summary>
+            Resource information.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.ResourceBase.#ctor">
+            <summary>
+            Initializes a new instance of the ResourceBase class.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.ResourceBase.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the ResourceBase class with required
+            arguments.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceBase.Location">
+            <summary>
+            Required. Gets or sets the location of the resource.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceBase.Tags">
+            <summary>
+            Optional. Gets or sets the tags attached to the resource.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Azure.ResourceBaseExtended">
+            <summary>
+            Resource information with extended details.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.ResourceBaseExtended.#ctor">
+            <summary>
+            Initializes a new instance of the ResourceBaseExtended class.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.ResourceBaseExtended.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the ResourceBaseExtended class with
+            required arguments.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceBaseExtended.Id">
+            <summary>
+            Optional. Gets or sets the ID of the resource.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceBaseExtended.Name">
+            <summary>
+            Optional. Gets or sets the name of the resource.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceBaseExtended.Type">
+            <summary>
+            Optional. Gets or sets the type of the resource.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Azure.ResourceIdentity">
+            <summary>
+            Resource identity.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.ResourceIdentity.#ctor">
+            <summary>
+            Initializes a new instance of the ResourceIdentity class.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.ResourceIdentity.#ctor(System.String,System.String,System.String)">
+            <summary>
+            Initializes a new instance of the ResourceIdentity class.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.ResourceIdentity.GetProviderFromResourceType(System.String)">
+            <summary>
+            Returns provider string from resource type.
+            </summary>
+            <param name="resourceType">Resource type.</param>
+            <returns>Provider</returns>
+        </member>
+        <member name="M:Microsoft.Azure.ResourceIdentity.GetTypeFromResourceType(System.String)">
+            <summary>
+            Returns type string from resource type.
+            </summary>
+            <param name="resourceType">Resource type.</param>
+            <returns>Type</returns>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceIdentity.ParentResourcePath">
+            <summary>
+            Optional. Gets or sets parent resource path (optional).
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceIdentity.ResourceName">
+            <summary>
+            Required. Gets or sets resource name.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceIdentity.ResourceProviderApiVersion">
+            <summary>
+            Required. Gets or sets API version of the resource provider.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceIdentity.ResourceProviderNamespace">
+            <summary>
+            Required. Gets or sets namespace of the resource provider.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.ResourceIdentity.ResourceType">
+            <summary>
+            Required. Gets or sets resource type.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Azure.Common.OData.FilterParameterAttribute">
+            <summary>
+            Parameter attribute used with OData filters.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.FilterParameterAttribute.#ctor(System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Azure.Common.OData.FilterParameterAttribute"/> class.
+            </summary>
+            <param name="name">Property name to use in the filter.</param>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.FilterParameterAttribute.#ctor(System.String,System.String)">
+            <summary>
+            Initializes a new instance of the <see cref="T:Microsoft.Azure.Common.OData.FilterParameterAttribute"/> class.
+            </summary>
+            <param name="name">Property name to use in the filter.</param>
+            <param name="format">Format of the value.</param>
+        </member>
+        <member name="P:Microsoft.Azure.Common.OData.FilterParameterAttribute.Name">
+            <summary>
+            Property name to use in the filter.
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.Common.OData.FilterParameterAttribute.Format">
+            <summary>
+            Format of the value.
+            </summary>
+        </member>
+        <member name="T:Microsoft.Azure.Common.OData.FilterString">
+            <summary>
+            Handles OData filter generation.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.FilterString.Generate``1(System.Linq.Expressions.Expression{System.Func{``0,System.Boolean}})">
+            <summary>
+            Generates an OData filter from a specified Linq expression.
+            </summary>
+            <typeparam name="T">Filter type</typeparam>
+            <param name="filter">Entity to use for filter generation</param>
+            <returns></returns>
+        </member>
+        <member name="T:Microsoft.Azure.Common.OData.UrlExpressionVisitor">
+            <summary>
+            Expression visitor class that generates OData style $filter parameter.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitBinary(System.Linq.Expressions.BinaryExpression)">
+            <summary>
+            Visits binary expression like ==, &amp;&amp;, >, etc.
+            </summary>
+            <param name="node">Node to visit.</param>
+            <returns>Original node.</returns>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitUnary(System.Linq.Expressions.UnaryExpression)">
+            <summary>
+            Visits binary expression !foo.
+            </summary>
+            <param name="node">Node to visit.</param>
+            <returns>Original node.</returns>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitConditional(System.Linq.Expressions.ConditionalExpression)">
+            <summary>
+            Visits conditional expression foo == true ? bar : fee. Throws NotSupportedException.
+            </summary>
+            <param name="node">Node to visit.</param>
+            <returns>Throws NotSupportedException.</returns>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitNew(System.Linq.Expressions.NewExpression)">
+            <summary>
+            Visits new object expression like new DateTime().
+            </summary>
+            <param name="node">Node to visit.</param>
+            <returns>Original node.</returns>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitConstant(System.Linq.Expressions.ConstantExpression)">
+            <summary>
+            Visits constants like 'a' or 123.
+            </summary>
+            <param name="node">Node to visit.</param>
+            <returns>Original node.</returns>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitMember(System.Linq.Expressions.MemberExpression)">
+            <summary>
+            Visits object members like p.Foo or dateTime.Hour.
+            </summary>
+            <param name="node">Node to visit.</param>
+            <returns>Original node.</returns>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.VisitMethodCall(System.Linq.Expressions.MethodCallExpression)">
+            <summary>
+            Visits method calls like Contains, StartsWith, etc. Methods that are not supported will throw an exception.
+            </summary>
+            <param name="node">Node to visit.</param>
+            <returns>Original node.</returns>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.closeUnaryBooleanOperator">
+            <summary>
+            Appends 'eq true' to Boolean unary operators.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.PrintConstant(System.Object)">
+            <summary>
+            Helper method to print constant.
+            </summary>
+            <param name="val">Object to print.</param>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.GetPropertyName(System.Reflection.PropertyInfo)">
+            <summary>
+            Helper method to generate property name.
+            </summary>
+            <param name="property">Property to examine.</param>
+            <returns>Property name or value specified in the FilterParameterAttribute.</returns>
+        </member>
+        <member name="M:Microsoft.Azure.Common.OData.UrlExpressionVisitor.GetPropertyFormat(System.Reflection.PropertyInfo)">
+            <summary>
+            Helper method to retrieve format from the FilterParameterAttribute.
+            </summary>
+            <param name="property">Property to examine.</param>
+            <returns>Format from FilterParameterAttribute or null.</returns>
+        </member>
         <member name="T:Microsoft.Azure.Common.Properties.Resources">
             <summary>
               A strongly-typed resource class, for looking up localized strings, etc.

lib/windowsazure/Microsoft.Azure.KeyVault.Core.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Microsoft.Azure.KeyVault.Core</name>
+    </assembly>
+    <members>
+        <member name="T:Microsoft.Azure.KeyVault.Core.IKey">
+            <summary>
+            Interface for Keys
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.KeyVault.Core.IKey.DecryptAsync(System.Byte[],System.Byte[],System.Byte[],System.Byte[],System.String,System.Threading.CancellationToken)">
+            <summary>
+            Decrypts the specified cipher text.
+            </summary>
+            <param name="ciphertext">The cipher text to decrypt</param>
+            <param name="iv">The initialization vector</param>
+            <param name="authenticationData">The authentication data</param>
+            <param name="algorithm">The algorithm to use</param>
+            <param name="token">Cancellation token</param>
+            <returns>The plain text</returns>
+            <remarks>If algorithm is not specified, an implementation should use its default algorithm.
+            Not all algorithms require, or support, all parameters.</remarks>
+        </member>
+        <member name="M:Microsoft.Azure.KeyVault.Core.IKey.EncryptAsync(System.Byte[],System.Byte[],System.Byte[],System.String,System.Threading.CancellationToken)">
+            <summary>
+            Encrypts the specified plain text.
+            </summary>
+            <param name="plaintext">The plain text to encrypt</param>
+            <param name="iv">The initialization vector</param>
+            <param name="authenticationData">The authentication data</param>
+            <param name="algorithm">The algorithm to use</param>
+            <param name="token">Cancellation token</param>
+            <returns>A Tuple consisting of the cipher text, the authentication tag (if applicable), the algorithm used</returns>
+            <remarks>If the algorithm is not specified, an implementation should use its default algorithm.
+            Not all algorithyms require, or support, all parameters.</remarks>
+        </member>
+        <member name="M:Microsoft.Azure.KeyVault.Core.IKey.WrapKeyAsync(System.Byte[],System.String,System.Threading.CancellationToken)">
+            <summary>
+            Encrypts the specified key material.
+            </summary>
+            <param name="key">The key material to encrypt</param>
+            <param name="algorithm">The algorithm to use</param>
+            <param name="token">Cancellation token</param>
+            <returns>A Tuple consisting of the encrypted key and the algorithm used</returns>
+            <remarks>If the algorithm is not specified, an implementation should use its default algorithm</remarks>
+        </member>
+        <member name="M:Microsoft.Azure.KeyVault.Core.IKey.UnwrapKeyAsync(System.Byte[],System.String,System.Threading.CancellationToken)">
+            <summary>
+            Decrypts the specified key material.
+            </summary>
+            <param name="encryptedKey">The encrypted key material</param>
+            <param name="algorithm">The algorithm to use</param>
+            <param name="token">Cancellation token</param>
+            <returns>The decrypted key material</returns>
+            <remarks>If the algorithm is not specified, an implementation should use its default algorithm</remarks>
+        </member>
+        <member name="M:Microsoft.Azure.KeyVault.Core.IKey.SignAsync(System.Byte[],System.String,System.Threading.CancellationToken)">
+            <summary>
+            Signs the specified digest.
+            </summary>
+            <param name="digest">The digest to sign</param>
+            <param name="algorithm">The algorithm to use</param>
+            <param name="token">Cancellation token</param>
+            <returns>A Tuple consisting of the signature and the algorithm used</returns>
+            <remarks>If the algorithm is not specified, an implementation should use its default algorithm</remarks>
+        </member>
+        <member name="M:Microsoft.Azure.KeyVault.Core.IKey.VerifyAsync(System.Byte[],System.Byte[],System.String,System.Threading.CancellationToken)">
+            <summary>
+            Verifies the specified signature value
+            </summary>
+            <param name="digest">The digest</param>
+            <param name="signature">The signature value</param>
+            <param name="algorithm">The algorithm to use</param>
+            <param name="token">Cancellation token</param>
+            <returns>A bool indicating whether the signature was successfully verified</returns>
+        </member>
+        <member name="P:Microsoft.Azure.KeyVault.Core.IKey.DefaultEncryptionAlgorithm">
+            <summary>
+            The default encryption algorithm for this key
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.KeyVault.Core.IKey.DefaultKeyWrapAlgorithm">
+            <summary>
+            The default key wrap algorithm for this key
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.KeyVault.Core.IKey.DefaultSignatureAlgorithm">
+            <summary>
+            The default signature algorithm for this key
+            </summary>
+        </member>
+        <member name="P:Microsoft.Azure.KeyVault.Core.IKey.Kid">
+            <summary>
+            The key identifier
+            </summary>
+        </member>
+        <member name="T:Microsoft.Azure.KeyVault.Core.IKeyResolver">
+            <summary>
+            Interface for key resolvers.
+            </summary>
+        </member>
+        <member name="M:Microsoft.Azure.KeyVault.Core.IKeyResolver.ResolveKeyAsync(System.String,System.Threading.CancellationToken)">
+            <summary>
+            Provides an IKey implementation for the specified key identifier.
+            </summary>
+            <param name="kid">The key identifier to resolve</param>
+            <param name="token">Cancellation token</param>
+            <returns>The resolved IKey implementation or null</returns>
+            <remarks>Implementations should check the format of the kid to ensure that it is recognized. Null, rather than 
+            an exception, should be returned for unrecognized key identifiers to enable chaining of key resolvers.</remarks>
+        </member>
+    </members>
+</doc>

lib/windowsazure/Microsoft.Data.OData.xml

@@ -40443,7 +40443,7 @@
             <param name="model">The model to use.</param>
             <param name="messageReaderSettings">The message reader settings to use.</param>
             <param name="version">The version of the payload being read.</param>
-            <param name="typeKindFromPayloadFunc">A func to compute the type kind from the payload shape if it could not be determined from the expected type or the payload type.</param>
+            <param name="typeKindPeekedFromPayloadFunc">A func to compute the type kind from the payload shape if it could not be determined from the expected type or the payload type.</param>
             <param name="targetTypeKind">The target type kind to be used to read the payload.</param>
             <param name="serializationTypeNameAnnotation">Potentially non-null instance of an annotation to put on the value reported from the reader.</param>
             <returns>

lib/windowsazure/Microsoft.WindowsAzure.Configuration.xml

@@ -4,19 +4,19 @@
         <name>Microsoft.WindowsAzure.Configuration</name>
     </assembly>
     <members>
-        <member name="T:Microsoft.WindowsAzure.CloudConfigurationManager">
+        <member name="T:Microsoft.Azure.CloudConfigurationManager">
             <summary>
-            Configuration manager for accessing Windows Azure settings.
+            Configuration manager for accessing Microsoft Azure settings.
             </summary>
         </member>
-        <member name="M:Microsoft.WindowsAzure.CloudConfigurationManager.GetSetting(System.String)">
+        <member name="M:Microsoft.Azure.CloudConfigurationManager.GetSetting(System.String)">
             <summary>
             Gets a setting with the given name.
             </summary>
             <param name="name">Setting name.</param>
             <returns>Setting value or null if not found.</returns>
         </member>
-        <member name="P:Microsoft.WindowsAzure.CloudConfigurationManager.AppSettings">
+        <member name="P:Microsoft.Azure.CloudConfigurationManager.AppSettings">
             <summary>
             Gets application settings.
             </summary>
@@ -42,17 +42,17 @@
               Looks up a localized string similar to Argument &quot;{0}&quot; cannot be an empty string..
             </summary>
         </member>
-        <member name="T:Microsoft.WindowsAzure.AzureApplicationSettings">
+        <member name="T:Microsoft.Azure.AzureApplicationSettings">
             <summary>
-            Windows Azure settings.
+            Microsoft Azure settings.
             </summary>
         </member>
-        <member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.#ctor">
+        <member name="M:Microsoft.Azure.AzureApplicationSettings.#ctor">
             <summary>
             Initializes the settings.
             </summary>
         </member>
-        <member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.IsMissingSettingException(System.Exception)">
+        <member name="M:Microsoft.Azure.AzureApplicationSettings.IsMissingSettingException(System.Exception)">
             <summary>
             Checks whether the given exception represents an exception throws
             for a missing setting.
@@ -60,14 +60,14 @@
             <param name="e">Exception</param>
             <returns>True for the missing setting exception.</returns>
         </member>
-        <member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.GetSetting(System.String)">
+        <member name="M:Microsoft.Azure.AzureApplicationSettings.GetSetting(System.String)">
             <summary>
             Gets a setting with the given name.
             </summary>
             <param name="name">Setting name.</param>
             <returns>Setting value or null if such setting does not exist.</returns>
         </member>
-        <member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.GetValue(System.String,System.String,System.Func{System.String,System.String})">
+        <member name="M:Microsoft.Azure.AzureApplicationSettings.GetValue(System.String,System.String,System.Func{System.String,System.String})">
             <summary>
             Gets setting's value from the given provider.
             </summary>
@@ -76,21 +76,21 @@
             <param name="getValue">Method to obtain given setting.</param>
             <returns>Setting value, or null if not found.</returns>
         </member>
-        <member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.GetServiceRuntimeSetting(System.String)">
+        <member name="M:Microsoft.Azure.AzureApplicationSettings.GetServiceRuntimeSetting(System.String)">
             <summary>
             Gets a configuration setting from the service runtime.
             </summary>
             <param name="name">Setting name.</param>
             <returns>Setting value or null if not found.</returns>
         </member>
-        <member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.GetServiceRuntimeAssembly">
+        <member name="M:Microsoft.Azure.AzureApplicationSettings.GetServiceRuntimeAssembly">
             <summary>
             Loads and returns the latest available version of the service 
             runtime assembly.
             </summary>
             <returns>Loaded assembly, if any.</returns>
         </member>
-        <member name="M:Microsoft.WindowsAzure.NativeMethods.GetAssemblyPath(System.String)">
+        <member name="M:Microsoft.Azure.NativeMethods.GetAssemblyPath(System.String)">
             <summary>
             Gets an assembly path from the GAC given a partial name.
             </summary>

src/Gulpfile.js

@@ -4,16 +4,17 @@ var glob = require("glob"),
     gulpif = require("gulp-if"),
     gulp = require("gulp"),
     newer = require("gulp-newer"),
-	plumber = require("gulp-plumber"),
+    plumber = require("gulp-plumber"),
     sourcemaps = require("gulp-sourcemaps"),
     less = require("gulp-less"),
-	autoprefixer = require("gulp-autoprefixer"),
-	minify = require("gulp-minify-css"),
+    autoprefixer = require("gulp-autoprefixer"),
+    minify = require("gulp-minify-css"),
     typescript = require("gulp-typescript"),
-	uglify = require("gulp-uglify"),
-	rename = require("gulp-rename"),
+    uglify = require("gulp-uglify"),
+    rename = require("gulp-rename"),
     concat = require("gulp-concat"),
-	header = require("gulp-header")
+    header = require("gulp-header"),
+    fs = require("fs");
 
 /*
 ** GULP TASKS
@@ -37,25 +38,53 @@ gulp.task("rebuild", function () {
     return merge(assetGroupTasks);
 });
 
-// Continuous watch (each asset group is built whenever one of its inputs changes).
+
+// Set "Watchers" as sub-processes in order to restart the task when Assets.json changes.
 gulp.task("watch", function () {
-    getAssetGroups().forEach(function (assetGroup) {
-        gulp.watch(assetGroup.inputPaths, function (event) {
-            console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding output '" + assetGroup.outputPath + "'.");
-            var task = createAssetGroupTask(assetGroup);
+    var watchers;
+    function restart() {
+        if (watchers) {
+            watchers.forEach(function (w) {
+                w.remove();
+                w.end();
+            });
+        }
+        watchers = [];
+        // Continuous watch (each asset group is built whenever one of its inputs changes).
+        getAssetGroups().forEach(function (assetGroup) {
+            var watchPaths = assetGroup.inputPaths.concat(assetGroup.watchPaths);
+            var watcher = gulp.watch(watchPaths, function (event) {
+                var isConcat = path.basename(assetGroup.outputFileName, path.extname(assetGroup.outputFileName)) !== "@";
+                if (isConcat)
+                    console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding asset group with output '" + assetGroup.outputPath + "'.");
+                else
+                    console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding asset group.");
+                var doRebuild = true;
+                var task = createAssetGroupTask(assetGroup, doRebuild);
+            });
+            watchers.push(watcher);
         });
+    }
+    var p;
+    if (p) { p.exit(); }
+    p = gulp.watch("Orchard.Web/{Core,Modules,Themes}/*/Assets.json", function (event) {
+        console.log("Asset file '" + event.path + "' was " + event.type + ", resetting asset watchers.");
+        restart();
     });
+    restart();
 });
 
+
 /*
 ** ASSET GROUPS
 */
-
 function getAssetGroups() {
-    var assetManifestPaths = glob.sync("Orchard.Web/{Core,Modules,Themes}/*/Assets.json");
+    var assetManifestPaths = glob.sync("Orchard.Web/{Core,Modules,Themes}/*/Assets.json", {});
     var assetGroups = [];
     assetManifestPaths.forEach(function (assetManifestPath) {
-        var assetManifest = require("./" + assetManifestPath);
+        var file = './' + assetManifestPath;
+        var json = fs.readFileSync(file, 'utf8');
+        assetManifest = eval(json);
         assetManifest.forEach(function (assetGroup) {
             resolveAssetGroupPaths(assetGroup, assetManifestPath);
             assetGroups.push(assetGroup);
@@ -67,9 +96,15 @@ function getAssetGroups() {
 function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
     assetGroup.basePath = path.dirname(assetManifestPath);
     assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) {
-        return path.join(assetGroup.basePath, inputPath);
+        return path.resolve(path.join(assetGroup.basePath, inputPath));
     });
-    assetGroup.outputPath = path.join(assetGroup.basePath, assetGroup.output);
+    assetGroup.watchPaths = [];
+    if (!!assetGroup.watch) {
+        assetGroup.watchPaths = assetGroup.watch.map(function (watchPath) {
+            return path.resolve(path.join(assetGroup.basePath, watchPath));
+        });
+    }  
+    assetGroup.outputPath = path.resolve(path.join(assetGroup.basePath, assetGroup.output));
     assetGroup.outputDir = path.dirname(assetGroup.outputPath);
     assetGroup.outputFileName = path.basename(assetGroup.output);
 }
@@ -95,6 +130,7 @@ function buildCssPipeline(assetGroup, doRebuild) {
             throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'.";
     });
     var doConcat = path.basename(assetGroup.outputFileName, ".css") !== "@";
+    var generateSourceMaps = assetGroup.hasOwnProperty("generateSourceMaps") ? assetGroup.generateSourceMaps : true;
     return gulp.src(assetGroup.inputPaths)
         .pipe(gulpif(!doRebuild,
             gulpif(doConcat,
@@ -104,7 +140,7 @@ function buildCssPipeline(assetGroup, doRebuild) {
                     ext: ".css"
                 }))))
         .pipe(plumber())
-        .pipe(sourcemaps.init())
+        .pipe(gulpif(generateSourceMaps, sourcemaps.init()))
         .pipe(gulpif("*.less", less()))
         .pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
         .pipe(autoprefixer({ browsers: ["last 2 versions"] }))
@@ -115,7 +151,7 @@ function buildCssPipeline(assetGroup, doRebuild) {
         //    "** Any changes made directly to this file will be overwritten next time the Gulp compilation runs.\n" +
         //    "** For more information, see the Readme.txt file in the Gulp solution folder.\n" +
         //    "*/\n\n"))
-        .pipe(sourcemaps.write())
+        .pipe(gulpif(generateSourceMaps, sourcemaps.write()))
         .pipe(gulp.dest(assetGroup.outputDir))
         .pipe(minify())
         .pipe(rename({
@@ -131,6 +167,7 @@ function buildJsPipeline(assetGroup, doRebuild) {
             throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'.";
     });
     var doConcat = path.basename(assetGroup.outputFileName, ".js") !== "@";
+    var generateSourceMaps = assetGroup.hasOwnProperty("generateSourceMaps") ? assetGroup.generateSourceMaps : true;
     return gulp.src(assetGroup.inputPaths)
         .pipe(gulpif(!doRebuild,
             gulpif(doConcat,
@@ -140,14 +177,14 @@ function buildJsPipeline(assetGroup, doRebuild) {
                     ext: ".js"
                 }))))
         .pipe(plumber())
-        .pipe(sourcemaps.init())
+        .pipe(gulpif(generateSourceMaps, sourcemaps.init()))
         .pipe(gulpif("*.ts", typescript({
             declaration: false,
             //noImplicitAny: true,
             noEmitOnError: true,
             sortOutput: true,
         }).js))
-		.pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
+	.pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
         // TODO: Start using below whenever gulp-header supports sourcemaps.
         //.pipe(header(
         //    "/*\n" +
@@ -155,11 +192,11 @@ function buildJsPipeline(assetGroup, doRebuild) {
         //    "** Any changes made directly to this file will be overwritten next time the Gulp compilation runs.\n" +
         //    "** For more information, see the Readme.txt file in the Gulp solution folder.\n" +
         //    "*/\n\n"))
-        .pipe(sourcemaps.write())
+        .pipe(gulpif(generateSourceMaps, sourcemaps.write()))
         .pipe(gulp.dest(assetGroup.outputDir))
-		.pipe(uglify())
-		.pipe(rename({
-		    suffix: ".min"
-		}))
-		.pipe(gulp.dest(assetGroup.outputDir));
-}
+	.pipe(uglify())
+	.pipe(rename({
+	    suffix: ".min"
+	}))
+	.pipe(gulp.dest(assetGroup.outputDir));
+}

src/Orchard.Azure/Orchard.Azure.CloudService/Orchard.Azure.CloudService.ccproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>2.5</ProductVersion>
+    <ProductVersion>2.7</ProductVersion>
     <ProjectGuid>{03c5327d-4e8e-45a7-acd1-e18e7caa3c4a}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -35,8 +35,9 @@
   </PropertyGroup>
   <!-- Items for the project -->
   <ItemGroup>
+    <ServiceConfiguration Include="ServiceConfiguration.Local.cscfg" />
     <ServiceDefinition Include="ServiceDefinition.csdef" />
-    <ServiceConfiguration Include="ServiceConfiguration.cscfg" />
+    <ServiceConfiguration Include="ServiceConfiguration.Cloud.cscfg" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Orchard.Azure.Web\Orchard.Azure.Web.csproj">
@@ -65,7 +66,7 @@
   <!-- Import the target files for this project template -->
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.5\</CloudExtensionsDir>
+    <CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.7\</CloudExtensionsDir>
   </PropertyGroup>
   <Import Project="$(CloudExtensionsDir)Microsoft.WindowsAzure.targets" />
   <!-- The BeforeAddRoleContent override ensures that content in themes and modules get added

src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Cloud.cscfg

@@ -1,20 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ServiceConfiguration serviceName="OrchardCloudService" osFamily="4" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" schemaVersion="2014-06.2.4">
-  <Role name="Orchard.Azure.Web">
-    <Instances count="1" />
-    <ConfigurationSettings>
-      <Setting name="Orchard.Azure.Media.StorageConnectionString" value="UseDevelopmentStorage=true" />
-      <Setting name="Orchard.Azure.Settings.StorageConnectionString" value="UseDevelopmentStorage=true" />
-      <Setting name="Orchard.Azure.OutputCache.HostIdentifier" value="Orchard.Azure.Web" />
-      <Setting name="Orchard.Azure.OutputCache.CacheName" value="OutputCache" />
-      <Setting name="Orchard.Azure.OutputCache.AuthorizationToken" value="" />
-      <Setting name="Orchard.Azure.DatabaseCache.HostIdentifier" value="Orchard.Azure.Web" />
-      <Setting name="Orchard.Azure.DatabaseCache.CacheName" value="DatabaseCache" />
-      <Setting name="Orchard.Azure.DatabaseCache.AuthorizationToken" value="" />
-      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.NamedCaches" value="{&quot;caches&quot;:[{&quot;name&quot;:&quot;default&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:10,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;SessionStateCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:60,&quot;isExpirable&quot;:true,&quot;type&quot;:2},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;OutputCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:5,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;DatabaseCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:5,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0}]}" />
-      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.DiagnosticLevel" value="1" />
-      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage" value="30" />
-      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString" value="UseDevelopmentStorage=true" />
-    </ConfigurationSettings>
-  </Role>
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceConfiguration serviceName="OrchardCloudService" osFamily="4" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" schemaVersion="2015-04.2.6">
+  <Role name="Orchard.Azure.Web">
+    <Instances count="1" />
+    <ConfigurationSettings>
+      <Setting name="Orchard.Azure.Media.StorageConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="Orchard.Azure.Settings.StorageConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="Orchard.Azure.OutputCache.HostIdentifier" value="Orchard.Azure.Web" />
+      <Setting name="Orchard.Azure.OutputCache.CacheName" value="OutputCache" />
+      <Setting name="Orchard.Azure.OutputCache.AuthorizationToken" value="" />
+      <Setting name="Orchard.Azure.DatabaseCache.HostIdentifier" value="Orchard.Azure.Web" />
+      <Setting name="Orchard.Azure.DatabaseCache.CacheName" value="DatabaseCache" />
+      <Setting name="Orchard.Azure.DatabaseCache.AuthorizationToken" value="" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.NamedCaches" value="{&quot;caches&quot;:[{&quot;name&quot;:&quot;default&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:10,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;SessionStateCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:60,&quot;isExpirable&quot;:true,&quot;type&quot;:2},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;OutputCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:5,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;DatabaseCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:5,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0}]}" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.DiagnosticLevel" value="1" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage" value="30" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+    </ConfigurationSettings>
+  </Role>
 </ServiceConfiguration>

src/Orchard.Azure/Orchard.Azure.CloudService/ServiceConfiguration.Local.cscfg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceConfiguration serviceName="OrchardCloudService" osFamily="4" osVersion="*" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceConfiguration" schemaVersion="2015-04.2.6">
+  <Role name="Orchard.Azure.Web">
+    <Instances count="1" />
+    <ConfigurationSettings>
+      <Setting name="Orchard.Azure.Media.StorageConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="Orchard.Azure.Settings.StorageConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="Orchard.Azure.OutputCache.HostIdentifier" value="Orchard.Azure.Web" />
+      <Setting name="Orchard.Azure.OutputCache.CacheName" value="OutputCache" />
+      <Setting name="Orchard.Azure.OutputCache.AuthorizationToken" value="" />
+      <Setting name="Orchard.Azure.DatabaseCache.HostIdentifier" value="Orchard.Azure.Web" />
+      <Setting name="Orchard.Azure.DatabaseCache.CacheName" value="DatabaseCache" />
+      <Setting name="Orchard.Azure.DatabaseCache.AuthorizationToken" value="" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.NamedCaches" value="{&quot;caches&quot;:[{&quot;name&quot;:&quot;default&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:10,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;SessionStateCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:60,&quot;isExpirable&quot;:true,&quot;type&quot;:2},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;OutputCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:5,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0},{&quot;name&quot;:&quot;DatabaseCache&quot;,&quot;policy&quot;:{&quot;eviction&quot;:{&quot;type&quot;:0},&quot;expiration&quot;:{&quot;defaultTTL&quot;:5,&quot;isExpirable&quot;:true,&quot;type&quot;:1},&quot;serverNotification&quot;:{&quot;isEnabled&quot;:false}},&quot;secondaries&quot;:0}]}" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.DiagnosticLevel" value="1" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.CacheSizePercentage" value="30" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Caching.ConfigStoreConnectionString" value="UseDevelopmentStorage=true" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+    </ConfigurationSettings>
+  </Role>
+</ServiceConfiguration>

src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2014-06.2.4">
+<ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2015-04.2.6">
   <WebRole name="Orchard.Azure.Web">
     <Sites>
       <Site name="Web">
@@ -20,6 +20,7 @@
       <Setting name="Orchard.Azure.DatabaseCache.HostIdentifier" />
       <Setting name="Orchard.Azure.DatabaseCache.CacheName" />
       <Setting name="Orchard.Azure.DatabaseCache.AuthorizationToken" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
     </ConfigurationSettings>
     <Endpoints>
       <InputEndpoint name="HttpIn" protocol="http" port="80" />

src/Orchard.Azure/Orchard.Azure.CloudService/ecf/Orchard.Azure.WebContent/diagnostics.wadcfgx

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DiagnosticsConfiguration xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
+  <PublicConfig xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
+    <WadCfg>
+      <DiagnosticMonitorConfiguration overallQuotaInMB="4096">
+        <DiagnosticInfrastructureLogs scheduledTransferPeriod="PT1M" scheduledTransferLogLevelFilter="Warning" />
+        <Directories scheduledTransferPeriod="PT1M">
+          <IISLogs containerName="wad-iis-logfiles" />
+        </Directories>
+        <PerformanceCounters>
+          <PerformanceCounterConfiguration counterSpecifier="\Memory\Available MBytes" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\Web Service(_Total)\ISAPI Extension Requests/sec" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\Web Service(_Total)\Bytes Total/Sec" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\ASP.NET Applications(__Total__)\Requests/Sec" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\ASP.NET Applications(__Total__)\Errors Total/Sec" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\ASP.NET\Requests Queued" sampleRate="PT3M" />
+          <PerformanceCounterConfiguration counterSpecifier="\ASP.NET\Requests Rejected" sampleRate="PT3M" />
+        </PerformanceCounters>
+        <WindowsEventLog scheduledTransferPeriod="PT1M">
+          <DataSource name="Application!*" />
+        </WindowsEventLog>
+        <Logs scheduledTransferPeriod="PT1M" scheduledTransferLogLevelFilter="Warning" />
+      </DiagnosticMonitorConfiguration>
+    </WadCfg>
+    <StorageAccount>devstoreaccount1</StorageAccount>
+  </PublicConfig>
+  <PrivateConfig xmlns="http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration">
+    <StorageAccount name="devstoreaccount1" key="Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==" />
+  </PrivateConfig>
+  <IsEnabled>true</IsEnabled>
+</DiagnosticsConfiguration>

src/Orchard.Azure/Orchard.Azure.Web/Config/HostComponents.config

@@ -1,98 +1,110 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <HostComponents>
-	<Components>
+  <Components>
 
-		<Component Type="Orchard.Environment.Extensions.ExtensionMonitoringCoordinator">
-			<Properties>
-				<!-- Set Value="true" to disable new extensions monitoring -->
-				<Property Name="Disabled" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.Environment.Extensions.ExtensionMonitoringCoordinator">
+      <Properties>
+        <!-- Set Value="true" to disable new extensions monitoring -->
+        <Property Name="Disabled" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy.PlacementFileParser">
-			<Properties>
-				<!-- Set Value="true" to disable Placement files monitoring (Placement.info) -->
-				<Property Name="DisableMonitoring" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy.PlacementFileParser">
+      <Properties>
+        <!-- Set Value="true" to disable Placement files monitoring (Placement.info) -->
+        <Property Name="DisableMonitoring" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy.ShapeTemplateBindingStrategy">
-			<Properties>
-				<!-- Set Value="true" to disable template views monitoring (Views\*.cshtml) -->
-				<Property Name="DisableMonitoring" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy.ShapeTemplateBindingStrategy">
+      <Properties>
+        <!-- Set Value="true" to disable template views monitoring (Views\*.cshtml) -->
+        <Property Name="DisableMonitoring" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.Environment.Extensions.Folders.ExtensionHarvester">
-			<Properties>
-				<!-- Set Value="true" to disable extension folders monitoring (new files in modules and themes) -->
-				<Property Name="DisableMonitoring" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.Environment.Extensions.Folders.ExtensionHarvester">
+      <Properties>
+        <!-- Set Value="true" to disable extension folders monitoring (new files in modules and themes) -->
+        <Property Name="DisableMonitoring" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.Environment.Extensions.Compilers.DefaultProjectFileParser">
-			<Properties>
-				<!-- Set Value="true" to disable project files monitoring (/Modules/**/*.csproj) -->
-				<Property Name="DisableMonitoring" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.Environment.Extensions.Compilers.DefaultProjectFileParser">
+      <Properties>
+        <!-- Set Value="true" to disable project files monitoring (/Modules/**/*.csproj) -->
+        <Property Name="DisableMonitoring" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.Environment.Extensions.Loaders.DynamicExtensionLoader">
-			<Properties>
-				<!-- Set Value="true" to disable source files monitoring -->
-				<Property Name="DisableMonitoring" Value="true"/>
-				<!-- Set Value="true" to completely disable the Dynamic Extension Loader -->
-				<Property Name="Disabled" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.Environment.Extensions.Loaders.DynamicExtensionLoader">
+      <Properties>
+        <!-- Set Value="true" to disable source files monitoring -->
+        <Property Name="DisableMonitoring" Value="true"/>
+        <!-- Set Value="true" to completely disable the Dynamic Extension Loader -->
+        <Property Name="Disabled" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.Environment.Extensions.Loaders.PrecompiledExtensionLoader">
-			<Properties>
-				<!-- Set Value="true" to disable pre-compiled files monitoring (~/Modules/**/bin/*.dll) -->
-				<Property Name="DisableMonitoring" Value="false"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.Environment.Extensions.Loaders.PrecompiledExtensionLoader">
+      <Properties>
+        <!-- Set Value="true" to disable pre-compiled files monitoring (~/Modules/**/bin/*.dll) -->
+        <Property Name="DisableMonitoring" Value="false"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.FileSystems.Dependencies.DefaultDependenciesFolder">
-			<Properties>
-				<!-- Set Value="true" to disable the dependencies folder monitoring -->
-				<Property Name="DisableMonitoring" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.FileSystems.Dependencies.DefaultDependenciesFolder">
+      <Properties>
+        <!-- Set Value="true" to disable the dependencies folder monitoring -->
+        <Property Name="DisableMonitoring" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.FileSystems.Dependencies.DefaultExtensionDependenciesManager">
-			<Properties>
-				<!-- Set Value="true" to disable compiled dependencides files monitoring -->
-				<Property Name="DisableMonitoring" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.FileSystems.Dependencies.DefaultExtensionDependenciesManager">
+      <Properties>
+        <!-- Set Value="true" to disable compiled dependencides files monitoring -->
+        <Property Name="DisableMonitoring" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.Localization.Services.DefaultLocalizedStringManager">
-			<Properties>
-				<!-- Set Value="true" to disable localization files monitoring (*.po) -->
-				<Property Name="DisableMonitoring" Value="true"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.Localization.Services.DefaultLocalizedStringManager">
+      <Properties>
+        <!-- Set Value="true" to disable localization files monitoring (*.po) -->
+        <Property Name="DisableMonitoring" Value="true"/>
+      </Properties>
+    </Component>
 
-		<Component Type="Orchard.Caching.DefaultParallelCacheContext">
-			<Properties>
-				<!-- Set Value="true" to disable parallel cache resolution -->
-				<Property Name="Disabled" Value="false"/>
-			</Properties>
-		</Component>
+    <Component Type="Orchard.Caching.DefaultParallelCacheContext">
+      <Properties>
+        <!-- Set Value="true" to disable parallel cache resolution -->
+        <Property Name="Disabled" Value="false"/>
+      </Properties>
+    </Component>
 
-        <Component Type="Orchard.Data.SessionConfigurationCache">
-            <Properties>
-                <!-- Set Value="true" to disable session configuration cache (mappings.bin). Recommended when using multiple instances. -->
-                <Property Name="Disabled" Value="false"/>
-            </Properties>
-        </Component>
+    <Component Type="Orchard.Data.SessionConfigurationCache">
+      <Properties>
+        <!-- Set Value="true" to disable session configuration cache (mappings.bin). Recommended when using multiple instances. -->
+        <Property Name="Disabled" Value="false"/>
+      </Properties>
+    </Component>
 
-        <Component Type="Orchard.Alias.Implementation.Updater">
-            <Properties>
-                <Property Name="Disabled" Value="false"/>
-            </Properties>
-        </Component>
-        
-    </Components>
+    <Component Type="Orchard.Environment.Descriptor.ShellDescriptorCache">
+      <Properties>
+        <!-- Set Value="true" to disable shell descriptors cache (cache.dat). Recommended when using multiple instances. -->
+        <Property Name="Disabled" Value="true"/>
+      </Properties>
+    </Component>
+
+    <Component Type="Orchard.Services.ClientAddressAccessor">
+      <Properties>
+        <!-- Set Value="true" to read the client host address from the specified HTTP header. -->
+        <Property Name="EnableClientHostAddressHeader" Value="false"/>
+
+        <!-- Set Value to the HTTP header name from which to read the client host address. Only used when EnableClientHostAddressHeader="true".
+                     If the specified header was not found, the system will fall back to the client host address as provided by the Request object.-->
+        <Property Name="ClientHostAddressHeaderName" Value="X-Forwarded-For"/>
+      </Properties>
+    </Component>
+    
+  </Components>
 </HostComponents>

src/Orchard.Azure/Orchard.Azure.Web/Config/Sites.config

@@ -1,31 +1,50 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 
-	<configSections>
-		<section name="autofac" type="Autofac.Configuration.SectionHandler, Autofac.Configuration"/>
-	</configSections>
+  <configSections>
+    <section name="autofac" type="Autofac.Configuration.SectionHandler, Autofac.Configuration"/>
+  </configSections>
+
+  <autofac defaultAssembly="Orchard.Framework">
 
-	<autofac defaultAssembly="Orchard.Framework">
-    
     <!-- 
-      To create tenant specific configurations, copy this file to ~/Congig/Sites.{tenant}.config 
+      To create tenant specific configurations, copy this file to ~/Config/Sites.{tenant}.config 
       where {tenant} is the technical name of the targetted tenant
+      
+      Allowed scopes: per-dependency, single-instance or per-lifetime-scope
+
     -->
+
+
     <components>
       <!-- 
-        Uncomment to use ReadUncommitted as the default isolation level. Please not that
-        Sql Server Ce doesn't support ReadUncommitted.
-      -->
-      <!--
-      <component instance-scope="per-lifetime-scope"
-                   type="Orchard.Data.SessionLocator, Orchard.Framework"
-                   service="Orchard.Data.ISessionLocator">
-        <properties>
-          <property name="IsolationLevel" value="ReadUncommitted" />
-        </properties>
-      </component>
-      -->
-    </components>
-	</autofac>
+                Uncomment to use ReadUncommitted as the default isolation level. Please not that
+                Sql Server Ce doesn't support ReadUncommitted.
 
-</configuration>
+                Isolation level for all database transaction. 
+                See http://msdn.microsoft.com/en-us/library/system.transactions.isolationlevel.aspx 
+            -->
+      <!--
+            <component instance-scope="per-lifetime-scope"
+                       type="Orchard.Data.SessionLocator, Orchard.Framework"
+                       service="Orchard.Data.ISessionLocator">
+                <properties>
+                    <property name="IsolationLevel" value="ReadUncommitted" />
+                </properties>
+            </component>
+            -->
+
+      <!-- 
+                Delay between background services executions
+            <component instance-scope="single-instance"
+                       type="Orchard.Tasks.SweepGenerator"
+                       service="Orchard.Tasks.ISweepGenerator">
+                <properties>
+                    <property name="Interval" value="00:01:00" />
+                </properties>
+            </component>
+             -->
+    </components>
+  </autofac>
+
+</configuration>

src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj

@@ -20,6 +20,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <TargetFrameworkProfile />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -90,13 +91,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Diagnostics">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Diagnostics.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime">
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
       <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.ServiceRuntime.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage">
       <SpecificVersion>False</SpecificVersion>
@@ -181,10 +182,6 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="WebMatrix.Data">
-      <HintPath>..\..\..\lib\aspnetmvc\WebMatrix.Data.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Global.asax.cs">
@@ -564,6 +561,23 @@
   <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
     <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
   </Target>
+  <Target Name="DeleteDebugFiles" AfterTargets="AfterBuild">
+    <RemoveDir Directories="Themes;Core;Modules" />
+  </Target>
+  <Target Name="CopyDebugFiles" AfterTargets="DeleteDebugFiles" Condition="'$(Configuration)' == 'Debug'">
+    <PropertyGroup>
+      <SrcFolder>..\..</SrcFolder>
+    </PropertyGroup>
+    <ItemGroup>
+      <Excluded Include="$(SrcFolder)\**\bin\**\*;$(SrcFolder)\**\obj\**\*;$(SrcFolder)\**\*.user;$(SrcFolder)\**\*.cs;$(SrcFolder)\**\*.csproj;$(SrcFolder)\**\.hg\**\*" />
+      <Src-Themes Include="$(SrcFolder)\Orchard.Web\Themes\**\*" Exclude="@(Excluded)" />
+      <Src-Core Include="$(SrcFolder)\Orchard.Web\Core\**\*" Exclude="@(Excluded)" />
+      <Src-Modules Include="$(SrcFolder)\Orchard.Web\Modules\**\*" Exclude="@(Excluded)" />
+    </ItemGroup>
+    <Copy SourceFiles="@(Src-Themes)" DestinationFolder="Themes\%(RecursiveDir)" />
+    <Copy SourceFiles="@(Src-Core)" DestinationFolder="Core\%(RecursiveDir)" />
+    <Copy SourceFiles="@(Src-Modules)" DestinationFolder="Modules\%(RecursiveDir)" />
+  </Target>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -583,6 +597,11 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <PropertyGroup>
+    <PreBuildEvent>del "$(TargetDir)\Modules"
+del "$(TargetDir)\Themes"
+del "$(TargetDir)\Media"</PreBuildEvent>
+  </PropertyGroup>
   <!-- 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">

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

@@ -42,8 +42,9 @@
     <system.diagnostics>
         <trace>
             <listeners>
-                <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" name="AzureDiagnostics">
-                    <filter type=""/>
+                <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
+                    name="AzureDiagnostics">
+                    <filter type="" />
                 </add>
             </listeners>
         </trace>
@@ -191,19 +192,19 @@
             </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"/>
+                <bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.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"/>
+				<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.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"/>
+				<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.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"/>
+				<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
 			</dependentAssembly>
 		</assemblyBinding>
     </runtime>

src/Orchard.Azure/Orchard.Azure.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E3DE014-9B28-4B32-8AC1-B2BE404E9B2D}"
 EndProject

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

@@ -20,6 +20,7 @@ using Orchard.DisplayManagement.Implementation;
 using Orchard.Environment;
 using Orchard.Environment.Extensions;
 using Orchard.Security;
+using Orchard.Tests.ContentManagement;
 using Orchard.Tests.Modules;
 using Orchard.Tests.Stubs;
 using Orchard.UI.Notify;
@@ -35,7 +36,6 @@ namespace Orchard.Core.Tests.Body {
             builder.RegisterType<Signals>().As<ISignals>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
-            builder.RegisterInstance(new Mock<ITransactionManager>().Object);
             builder.RegisterInstance(new Mock<IAuthorizer>().Object);
             builder.RegisterInstance(new Mock<INotifier>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);

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

@@ -85,6 +85,7 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Data" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath>
       <Private>True</Private>

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.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]

src/Orchard.Core.Tests/Scheduling/ScheduledTaskExecutorTests.cs

@@ -35,7 +35,6 @@ namespace Orchard.Core.Tests.Scheduling {
         public override void Register(ContainerBuilder builder) {
             _handler = new StubTaskHandler();
             builder.RegisterInstance(new Mock<IOrchardServices>().Object);
-            builder.RegisterInstance(new Mock<ITransactionManager>().Object);
             builder.RegisterType<DefaultContentManager>().As<IContentManager>();
             builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<Signals>().As<ISignals>();

src/Orchard.Core.Tests/Settings/Metadata/ContentDefinitionManagerTests.cs

@@ -13,6 +13,7 @@ using Orchard.Core.Settings.Metadata;
 using Orchard.Core.Settings.Metadata.Records;
 using Orchard.Data;
 using Orchard.Tests;
+using Orchard.Tests.ContentManagement;
 using Orchard.Tests.Stubs;
 using Orchard.Tests.Utility;
 
@@ -23,6 +24,7 @@ namespace Orchard.Core.Tests.Settings.Metadata {
         private ISessionFactory _sessionFactory;
         private ISession _session;
         private IContainer _container;
+        private ITransactionManager _transactionManager;
 
         [TestFixtureSetUp]
         public void InitFixture() {
@@ -39,6 +41,17 @@ namespace Orchard.Core.Tests.Settings.Metadata {
 
         [SetUp]
         public void Init() {
+            _session = _sessionFactory.OpenSession();
+            foreach (var killType in new[] { typeof(ContentTypeDefinitionRecord), typeof(ContentPartDefinitionRecord), typeof(ContentFieldDefinitionRecord) }) {
+                foreach (var killRecord in _session.CreateCriteria(killType).List()) {
+                    _session.Delete(killRecord);
+                }
+            }
+            _session.Flush();
+            _session.Close();
+            _session.Dispose();
+            _session = _sessionFactory.OpenSession();
+
             var builder = new ContainerBuilder();
             builder.RegisterAutoMocking();
             builder.RegisterType<ContentDefinitionManager>().As<IContentDefinitionManager>();
@@ -48,25 +61,15 @@ namespace Orchard.Core.Tests.Settings.Metadata {
             builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterType<StubParallelCacheContext>().As<IParallelCacheContext>();
 
+            _session = _sessionFactory.OpenSession();
+            builder.RegisterInstance(_transactionManager = new TestTransactionManager(_session)).As<ITransactionManager>();
+
             _container = builder.Build();
 
-            _container.Mock<ISessionLocator>()
-                .Setup(x => x.For(It.IsAny<Type>()))
-                .Returns(() => _session);
-
-            _session = _sessionFactory.OpenSession();
-            foreach (var killType in new[] { typeof(ContentTypeDefinitionRecord), typeof(ContentPartDefinitionRecord), typeof(ContentFieldDefinitionRecord) }) {
-                foreach (var killRecord in _session.CreateCriteria(killType).List()) {
-                    _session.Delete(killRecord);
-                }
-            }
-            _session.Flush();
         }
 
         void ResetSession() {
-            _session.Flush();
-            _session.Dispose();
-            _session = _sessionFactory.OpenSession();
+            _transactionManager.RequireNew();
         }
 
         [TearDown]

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.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]

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

@@ -203,7 +203,7 @@
       </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"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>

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

@@ -199,7 +199,7 @@
       </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"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.0.2.0" newVersion="5.0.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>

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.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]

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

@@ -51,7 +51,6 @@ namespace Orchard.Tests.Modules.Comments.Services {
             builder.RegisterType<Signals>().As<ISignals>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
-            builder.RegisterInstance(new Mock<ITransactionManager>().Object);
             builder.RegisterInstance(new Mock<IAuthorizer>().Object);
             builder.RegisterInstance(new Mock<INotifier>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);

src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs

@@ -12,6 +12,7 @@ using Orchard.ContentManagement.Handlers;
 using Orchard.Data;
 using Orchard.Environment.Configuration;
 using Orchard.Services;
+using Orchard.Tests.ContentManagement;
 using Orchard.Tests.Data;
 using Orchard.Tests.Stubs;
 
@@ -52,6 +53,7 @@ namespace Orchard.Tests.Modules {
             builder.RegisterInstance(_clock).As<IClock>();
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
             builder.RegisterInstance(new ShellSettings { Name = ShellSettings.DefaultName, DataProvider = "SqlCe" });
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
             Register(builder);
             _container = builder.Build();
 
@@ -61,11 +63,6 @@ namespace Orchard.Tests.Modules {
         public void Cleanup() {
             if(_container != null)
                 _container.Dispose();
-
-            _transaction.Commit();
-
-            if(_session != null)
-                _session.Close();
         }
 
         public abstract void Register(ContainerBuilder builder);

src/Orchard.Tests.Modules/DesignerTools/Services/ObjectDumperTests.cs

@@ -264,9 +264,6 @@ namespace Orchard.Tests.Modules.DesignerTools.Services
                         new JProperty("name", "TestingPart"),
                         new JProperty("value", "ContentPart"),
                         new JProperty("children", new JArray(
-                            new JObject(
-                                new JProperty("name", "Zones"),
-                                new JProperty("value", "ZoneCollection")),
                             new JObject(
                                 new JProperty("name", "Id"),
                                 new JProperty("value", "0")),
@@ -327,9 +324,6 @@ namespace Orchard.Tests.Modules.DesignerTools.Services
                         new JProperty("name", "TestingPart"),
                         new JProperty("value", "ContentPart"),
                         new JProperty("children", new JArray(
-                            new JObject(
-                                new JProperty("name", "Zones"),
-                                new JProperty("value", "ZoneCollection")),
                             new JObject(
                                 new JProperty("name", "Id"),
                                 new JProperty("value", "0")),

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

@@ -76,7 +76,7 @@ namespace Orchard.Tests.Modules.ImportExport.Services {
             builder.RegisterInstance(new Mock<ISettingsFormatter>().Object);
             builder.RegisterInstance(new Mock<IRecipeExecuteEventHandler>().Object);
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
 
             _container = builder.Build();
             _importExportService = _container.Resolve<IImportExportService>();

src/Orchard.Tests.Modules/Indexing/IndexingTaskExecutorTests.cs

@@ -75,7 +75,6 @@ namespace Orchard.Tests.Modules.Indexing {
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
 
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
-            builder.RegisterInstance(new Mock<ITransactionManager>().Object);
             builder.RegisterInstance(new Mock<IAuthorizer>().Object);
             builder.RegisterType<OrchardServices>().As<IOrchardServices>();
 

src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs

@@ -303,5 +303,24 @@ namespace Orchard.Tests.Modules.Indexing {
             _provider.Store("default", _provider.New(1).Add("field", "value2"));
             Assert.That(searchBuilder.WithField("id", "1").Count(), Is.EqualTo(1));
         }
+
+        [Test]
+        public void IndexProviderShouldDeleteMoreThanMaxTermsCount() {
+            _provider.CreateIndex("default");
+
+            var documents = Enumerable.Range(1, 1025).Select(i => _provider.New(i).Add("field", "value1"));
+            _provider.Store("default", documents);
+            
+            var searchBuilder = _provider.CreateSearchBuilder("default");
+
+            Assert.That(searchBuilder.Count(), Is.EqualTo(1025));
+            Assert.That(searchBuilder.Get(1).ContentItemId, Is.EqualTo(1));
+            Assert.That(searchBuilder.Get(1025).ContentItemId, Is.EqualTo(1025));
+
+            _provider.Delete("default", Enumerable.Range(1, 1025));
+
+
+            Assert.That(searchBuilder.Count(), Is.EqualTo(0));
+        }
     }
 }

src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs

@@ -94,7 +94,7 @@ namespace Orchard.Tests.Modules.Migrations {
             builder.RegisterType<StubHostEnvironment>().As<IHostEnvironment>();
 
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
 
             builder.RegisterInstance(new ShellBlueprint());
 

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.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]

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

@@ -98,23 +98,23 @@ namespace Orchard.Tests.Modules.Recipes.Services {
 
         [Test]
         public void HarvestRecipesFailsToFindRecipesWhenCalledWithNotExistingExtension() {
-            var recipes = (List<Recipe>) _recipeHarvester.HarvestRecipes("cantfindme");
+            var recipes = _recipeHarvester.HarvestRecipes("cantfindme");
 
-            Assert.That(recipes.Count, Is.EqualTo(0));
+            Assert.That(recipes.Count(), Is.EqualTo(0));
         }
 
         [Test]
         public void HarvestRecipesShouldHarvestRecipeXmlFiles() {
-            var recipes = (List<Recipe>)_recipeHarvester.HarvestRecipes("Sample1");
-            Assert.That(recipes.Count, Is.EqualTo(1));
+            var recipes = _recipeHarvester.HarvestRecipes("Sample1");
+            Assert.That(recipes.Count(), Is.EqualTo(1));
         }
 
         [Test]
         public void ParseRecipeLoadsRecipeMetaDataIntoModel() {
-            var recipes = (List<Recipe>) _recipeHarvester.HarvestRecipes("Sample1");
-            Assert.That(recipes.Count, Is.EqualTo(1));
+            var recipes = _recipeHarvester.HarvestRecipes("Sample1");
+            Assert.That(recipes.Count(), Is.EqualTo(1));
 
-            var sampleRecipe = recipes[0];
+            var sampleRecipe = recipes.First();
             Assert.That(sampleRecipe.Name, Is.EqualTo("cms"));
             Assert.That(sampleRecipe.Description, Is.EqualTo("a sample Orchard recipe describing a cms"));
             Assert.That(sampleRecipe.Author, Is.EqualTo("orchard"));

src/Orchard.Tests.Modules/Users/Controllers/AccountControllerTests.cs

@@ -74,7 +74,6 @@ namespace Orchard.Tests.Modules.Users.Controllers {
             builder.RegisterType<UserPartHandler>().As<IContentHandler>();
             builder.RegisterType<OrchardServices>().As<IOrchardServices>();
 
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ITransactionManager>();
             builder.RegisterInstance(new Work<IEnumerable<IShapeTableEventHandler>>(resolve => _container.Resolve<IEnumerable<IShapeTableEventHandler>>())).AsSelf();
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();

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

@@ -30,6 +30,7 @@ using Orchard.UI.PageClass;
 using Orchard.Users.Handlers;
 using Orchard.Users.Models;
 using Orchard.Users.Services;
+using Orchard.Tests.ContentManagement;
 
 namespace Orchard.Tests.Modules.Users.Services {
     [TestFixture]
@@ -39,19 +40,6 @@ namespace Orchard.Tests.Modules.Users.Services {
         private ISession _session;
         private IContainer _container;
 
-
-        public class TestSessionLocator : ISessionLocator {
-            private readonly ISession _session;
-
-            public TestSessionLocator(ISession session) {
-                _session = session;
-            }
-
-            public ISession For(Type entityType) {
-                return _session;
-            }
-        }
-
         [TestFixtureSetUp]
         public void InitFixture() {
             var databaseFileName = System.IO.Path.GetTempFileName();
@@ -94,11 +82,18 @@ namespace Orchard.Tests.Modules.Users.Services {
             builder.RegisterType<InfosetHandler>().As<IContentHandler>();
 
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
+
             _container = builder.Build();
             _membershipService = _container.Resolve<IMembershipService>();
         }
 
+        [TearDown]
+        public void Cleanup() {
+            if (_container != null)
+                _container.Dispose();
+        }
+
         [Test]
         public void CreateUserShouldAllocateModelAndCreateRecords() {
             var user = _membershipService.CreateUser(new CreateUserParams("a", "b", "c", null, null, true));

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

@@ -34,6 +34,7 @@ using Orchard.Users.Services;
 using Orchard.Services;
 using Orchard.Tests.Messaging;
 using Orchard.Tests.Modules.Stubs;
+using Orchard.Tests.ContentManagement;
 
 namespace Orchard.Tests.Modules.Users.Services {
     [TestFixture]
@@ -47,19 +48,6 @@ namespace Orchard.Tests.Modules.Users.Services {
         private IContainer _container;
         private CultureInfo _currentCulture;
 
-
-        public class TestSessionLocator : ISessionLocator {
-            private readonly ISession _session;
-
-            public TestSessionLocator(ISession session) {
-                _session = session;
-            }
-
-            public ISession For(Type entityType) {
-                return _session;
-            }
-        }
-
         [TestFixtureSetUp]
         public void InitFixture() {
             _currentCulture = Thread.CurrentThread.CurrentCulture;
@@ -109,9 +97,8 @@ namespace Orchard.Tests.Modules.Users.Services {
             builder.RegisterInstance(ShellSettingsUtility.CreateEncryptionEnabled());
 
             _session = _sessionFactory.OpenSession();
-            _session.BeginTransaction();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
 
-            builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>();
             _container = builder.Build();
             _membershipService = _container.Resolve<IMembershipService>();
             _userService = _container.Resolve<IUserService>();
@@ -119,8 +106,8 @@ namespace Orchard.Tests.Modules.Users.Services {
 
         [TearDown]
         public void TearDown() {
-            _session.Transaction.Commit();
-            _session.Transaction.Dispose();
+            if (_container != null)
+                _container.Dispose();
         }
 
         [Test]

src/Orchard.Tests.Modules/Widgets/Services/WidgetsServiceTest.cs

@@ -93,7 +93,6 @@ namespace Orchard.Tests.Modules.Widgets.Services {
             builder.RegisterType<Signals>().As<ISignals>();
             builder.RegisterType<DefaultContentManagerSession>().As<IContentManagerSession>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
-            builder.RegisterInstance(new Mock<ITransactionManager>().Object);
             builder.RegisterInstance(new Mock<IAuthorizer>().Object);
             builder.RegisterInstance(new Mock<INotifier>().Object);
             builder.RegisterInstance(mockFeatureManager.Object);

src/Orchard.Tests/Caching/CacheTests.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using System.Threading;
 using Autofac;
 using NUnit.Framework;
 using Orchard.Caching;
@@ -78,6 +80,42 @@ namespace Orchard.Tests.Caching {
                 Is.Not.SameAs(c2.CacheManager.GetCache<string, string>()));
         }
 
+        [Test]
+        public void CacheManagerIsNotBlocking() {
+            var hits = 0;
+            string result = "";
+
+            Enumerable.Range(0, 5).AsParallel().ForAll(x =>
+                result = _cacheManager.Get("testItem", ctx => {
+                    // by waiting for 100ms we expect all the calls to Get
+                    // to enter this lambda
+                    Thread.Sleep(100);
+                    hits++;
+                    return "testResult";
+                })
+            );
+
+            Assert.That(result, Is.EqualTo("testResult"));
+            Assert.That(hits, Is.GreaterThan(1));
+        }
+
+        [Test]
+        public void CacheManagerIsBlocking() {
+            var hits = 0;
+            string result = "";
+
+            Enumerable.Range(0, 5).AsParallel().ForAll(x =>
+                result = _cacheManager.Get("testItem", true, ctx => {
+                    Thread.Sleep(100);
+                    hits++;
+                    return "testResult";
+                })
+            );
+
+            Assert.That(result, Is.EqualTo("testResult"));
+            Assert.That(hits, Is.EqualTo(1));
+        }
+
         class ComponentOne {
             public ICacheManager CacheManager { get; set; }
 

src/Orchard.Tests/ContentManagement/ContentQueryTests.cs

@@ -29,6 +29,7 @@ namespace Orchard.Tests.ContentManagement {
         private IContentManager _manager;
         private ISessionFactory _sessionFactory;
         private ISession _session;
+        private ITransactionManager _transactionManager;
 
         [TestFixtureSetUp]
         public void InitFixture() {
@@ -74,7 +75,7 @@ namespace Orchard.Tests.ContentManagement {
             builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
 
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(_transactionManager = new TestTransactionManager(_session)).As<ITransactionManager>();
 
             _session.Delete(string.Format("from {0}", typeof(GammaRecord).FullName));
             _session.Delete(string.Format("from {0}", typeof(DeltaRecord).FullName));
@@ -82,14 +83,19 @@ namespace Orchard.Tests.ContentManagement {
             _session.Delete(string.Format("from {0}", typeof(ContentItemVersionRecord).FullName));
             _session.Delete(string.Format("from {0}", typeof(ContentItemRecord).FullName));
             _session.Delete(string.Format("from {0}", typeof(ContentTypeRecord).FullName));
-            _session.Flush();
-            _session.Clear();
+            _transactionManager.RequireNew();
 
             _container = builder.Build();
             _manager = _container.Resolve<IContentManager>();
 
         }
 
+        [TearDown]
+        public void Cleanup() {
+            if (_container != null)
+                _container.Dispose();
+        }
+
         private List<IContent> AddSampleData() {
             var items = new List<IContent> {
                 _manager.Create<AlphaPart>("alpha", init => { }),
@@ -98,7 +104,7 @@ namespace Orchard.Tests.ContentManagement {
                 _manager.Create<DeltaPart>("delta", init => { init.Record.Quux = "the quux value"; })
             };
 
-            _session.Flush();
+            _transactionManager.RequireNew();
 
             return items;
         }
@@ -212,7 +218,7 @@ namespace Orchard.Tests.ContentManagement {
             var twoId = _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; }).ContentItem.Id;
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
             var fourId = _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; }).ContentItem.Id;
-            _session.Flush();
+            _transactionManager.RequireNew();
 
 
             var two = _manager.Query()
@@ -239,7 +245,7 @@ namespace Orchard.Tests.ContentManagement {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
-            _session.Flush();
+            _transactionManager.RequireNew();
 
             var twoOrFour = _manager.Query<GammaPart, GammaRecord>()
                 .Where(x => x.Frap == "one" || x.Frap == "four")
@@ -271,8 +277,7 @@ namespace Orchard.Tests.ContentManagement {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
-            _session.Flush();
-            _session.Clear();
+            _transactionManager.RequireNew();
 
             var ascending = _manager.Query("gamma")
                 .OrderBy<GammaRecord>(x => x.Frap)
@@ -282,7 +287,7 @@ namespace Orchard.Tests.ContentManagement {
             Assert.That(ascending.First().Record.Frap, Is.EqualTo("four"));
             Assert.That(ascending.Last().Record.Frap, Is.EqualTo("two"));
 
-            _session.Clear();
+            _transactionManager.RequireNew();
 
             var descending = _manager.Query<GammaPart, GammaRecord>()
                 .OrderByDescending(x => x.Frap)
@@ -300,7 +305,7 @@ namespace Orchard.Tests.ContentManagement {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
-            _session.Flush();
+            _transactionManager.RequireNew();
 
             var reverseById = _manager.Query()
                 .OrderByDescending<GammaRecord>(x => x.Id)
@@ -346,8 +351,7 @@ namespace Orchard.Tests.ContentManagement {
                 init.Record.Frap = "four";
                 init.As<EpsilonPart>().Record.Quad = "4";
             });
-            _session.Flush();
-            _session.Clear();
+            _transactionManager.RequireNew();
 
             var results = _manager.Query<EpsilonPart, EpsilonRecord>()
                 .Where(x => x.Quad == "2" || x.Quad == "3")
@@ -365,21 +369,18 @@ namespace Orchard.Tests.ContentManagement {
                 init.As<GammaPart>().Record.Frap = "one";
                 init.As<EpsilonPart>().Record.Quad = "v1";
             });
-            _session.Flush();
-            _session.Clear();
+            _transactionManager.RequireNew();
 
             var gamma2 = _manager.Get(gamma1.Id, VersionOptions.DraftRequired);
             gamma2.As<GammaPart>().Record.Frap = "two";
             gamma2.As<EpsilonPart>().Record.Quad = "v2";
-            _session.Flush();
-            _session.Clear();
+            _transactionManager.RequireNew();
 
             var gamma3 = _manager.Create<ContentItem>("gamma", init => {
                 init.As<GammaPart>().Record.Frap = "three";
                 init.As<EpsilonPart>().Record.Quad = "v3";
             });
-            _session.Flush();
-            _session.Clear();
+            _transactionManager.RequireNew();
         }
 
         [Test]
@@ -562,7 +563,7 @@ namespace Orchard.Tests.ContentManagement {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
-            _session.Flush();
+            _transactionManager.RequireNew();
 
             var result = _manager.Query<GammaPart, GammaRecord>()
                 .Where(x => x.Frap.StartsWith("t"))
@@ -579,7 +580,7 @@ namespace Orchard.Tests.ContentManagement {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
-            _session.Flush();
+            _transactionManager.RequireNew();
 
             var result = _manager.Query<GammaPart, GammaRecord>()
                 .Where(x => x.Frap.EndsWith("e"))
@@ -596,7 +597,7 @@ namespace Orchard.Tests.ContentManagement {
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "two"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "three"; });
             _manager.Create<GammaPart>("gamma", init => { init.Record.Frap = "four"; });
-            _session.Flush();
+            _transactionManager.RequireNew();
 
             var result = _manager.Query<GammaPart, GammaRecord>()
                 .Where(x => x.Frap.Contains("o"))

src/Orchard.Tests/ContentManagement/DefaultContentManagerTests.cs

@@ -86,84 +86,16 @@ namespace Orchard.Tests.ContentManagement {
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
 
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
 
             _container = builder.Build();
             _manager = _container.Resolve<IContentManager>();
         }
 
-        public class TestSessionLocator : ISessionLocator, ITransactionManager, IDisposable {
-            private readonly ISession _session;
-            private ITransaction _transaction;
-            private bool _cancelled;
-
-            public TestSessionLocator(ISession session) {
-                _session = session;
-            }
-
-            public ISession For(Type entityType) {
-                return _session;
-            }
-
-            void ITransactionManager.Demand() {
-                EnsureSession();
-
-                if (_transaction == null) {
-                    _transaction = _session.BeginTransaction(IsolationLevel.ReadCommitted);
-                }
-            }
-
-            void ITransactionManager.RequireNew() {
-                ((ITransactionManager)this).RequireNew(IsolationLevel.ReadCommitted);
-            }
-
-            void ITransactionManager.RequireNew(IsolationLevel level) {
-                EnsureSession();
-
-                if (_cancelled) {
-                    _transaction.Rollback();
-                    _transaction.Dispose();
-                    _transaction = null;
-                }
-                else {
-                    if (_transaction != null) {
-                        _transaction.Commit();
-                    }
-                }
-
-                _transaction = _session.BeginTransaction(level);
-            }
-
-            void ITransactionManager.Cancel() {
-                _cancelled = true;
-            }
-
-            void IDisposable.Dispose() {
-                if (_transaction != null) {
-                    try {
-                        if (!_cancelled) {
-                            _transaction.Commit();
-                        }
-                        else {
-                            _transaction.Rollback();
-                        }
-
-                        _transaction.Dispose();
-                    }
-                    catch {
-                    }
-                    finally {
-                        _transaction = null;
-                        _cancelled = false;
-                    }
-                }
-            }
-
-            private void EnsureSession() {
-                if (_session != null) {
-                    return;
-                }
-            }
+        [TearDown]
+        public void Cleanup() {
+            if (_container != null)
+                _container.Dispose();
         }
 
         [Test]

src/Orchard.Tests/ContentManagement/DynamicContentItemTests.cs

@@ -76,5 +76,39 @@ namespace Orchard.Tests.ContentManagement {
 
             Assert.That((object)testingPartDynamic, Is.AssignableTo<IEnumerable<ContentPart>>());
         }
+
+
+        [Test]
+        public void NullCheckingCanBeDoneOnProperties() {
+            var contentItem = new ContentItem();
+            var contentPart = new ContentPart { TypePartDefinition = new ContentTypePartDefinition(new ContentPartDefinition("FooPart"), new SettingsDictionary()) };
+            var contentField = new ContentField { PartFieldDefinition = new ContentPartFieldDefinition(new ContentFieldDefinition("FooType"), "FooField", new SettingsDictionary()) };
+
+            dynamic item = contentItem;
+            dynamic part = contentPart;
+
+            Assert.That(item.FooPart == null, Is.True);
+            Assert.That(item.FooPart != null, Is.False);
+
+            contentItem.Weld(contentPart);
+
+            Assert.That(item.FooPart == null, Is.False);
+            Assert.That(item.FooPart != null, Is.True);
+            Assert.That(item.FooPart, Is.SameAs(contentPart));
+
+            Assert.That(part.FooField == null, Is.True);
+            Assert.That(part.FooField != null, Is.False);
+            Assert.That(item.FooPart.FooField == null, Is.True);
+            Assert.That(item.FooPart.FooField != null, Is.False);
+
+            contentPart.Weld(contentField);
+
+            Assert.That(part.FooField == null, Is.False);
+            Assert.That(part.FooField != null, Is.True);
+            Assert.That(item.FooPart.FooField == null, Is.False);
+            Assert.That(item.FooPart.FooField != null, Is.True);
+            Assert.That(part.FooField, Is.SameAs(contentField));
+            Assert.That(item.FooPart.FooField, Is.SameAs(contentField));
+        }
     }
 }

src/Orchard.Tests/ContentManagement/DynamicContentQueryTests.cs

@@ -72,7 +72,7 @@ namespace Orchard.Tests.ContentManagement {
             builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
 
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
 
             _session.Delete(string.Format("from {0}", typeof(GammaRecord).FullName));
             _session.Delete(string.Format("from {0}", typeof(DeltaRecord).FullName));
@@ -88,6 +88,12 @@ namespace Orchard.Tests.ContentManagement {
 
         }
 
+        [TearDown]
+        public void Cleanup() {
+            if (_container != null)
+                _container.Dispose();
+        }
+
         private void AddSampleData() {
             _manager.Create<AlphaPart>("alpha", init => { });
             _manager.Create<BetaPart>("beta", init => { });

src/Orchard.Tests/ContentManagement/HqlExpressionTests.cs

@@ -79,7 +79,7 @@ namespace Orchard.Tests.ContentManagement {
             builder.RegisterType<DefaultContentDisplay>().As<IContentDisplay>();
 
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
 
             _session.Delete(string.Format("from {0}", typeof(GammaRecord).FullName));
             _session.Delete(string.Format("from {0}", typeof(DeltaRecord).FullName));
@@ -97,6 +97,12 @@ namespace Orchard.Tests.ContentManagement {
 
         }
 
+        [TearDown]
+        public void Cleanup() {
+            if (_container != null)
+                _container.Dispose();
+        }
+
         [Test]
         public void AllDataTypesCanBeQueried() {
             var dt = DateTime.Now;

src/Orchard.Tests/ContentManagement/TestTransactionManager.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Data;
+using NHibernate;
+using Orchard.Data;
+
+namespace Orchard.Tests.ContentManagement {
+    public class TestTransactionManager : ITransactionManager, IDisposable {
+        private ISession _session;
+        private ITransaction _transaction;
+        private bool _cancelled;
+
+        public TestTransactionManager(ISession session) {
+            _session = session;
+            RequireNew();
+        }
+
+        public void Demand() {
+            EnsureSession();
+        }
+
+        public void RequireNew() {
+            RequireNew(IsolationLevel.ReadCommitted);
+        }
+
+        public void RequireNew(IsolationLevel level) {
+            EnsureSession();
+
+            if (_cancelled) {
+                _transaction.Rollback();
+                _transaction.Dispose();
+                _transaction = null;
+            }
+            else {
+                if (_transaction != null) {
+                    _transaction.Commit();
+                }
+            }
+
+            _transaction = _session.BeginTransaction(level);
+        }
+
+        public void Cancel() {
+            _cancelled = true;
+        }
+
+        public void Dispose() {
+            if (_transaction != null) {
+                try {
+                    if (!_cancelled) {
+                        _transaction.Commit();
+                    }
+                    else {
+                        _transaction.Rollback();
+                    }
+
+                    _transaction.Dispose();
+                }
+                catch {
+                }
+                finally {
+                    _transaction = null;
+                    _cancelled = false;
+                }
+            }
+
+            _session.Close();
+            _session.Dispose();
+            _session = null;
+        }
+
+        private void EnsureSession() {
+            if (_session == null) {
+                throw new ArgumentNullException("Session can't be null, ever");
+            }
+        }
+
+        public ISession GetSession() {
+            EnsureSession();
+
+            return _session;
+        }
+    }
+}

src/Orchard.Tests/Data/RepositoryTests.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using NHibernate;
 using NUnit.Framework;
 using Orchard.Data;
+using Orchard.Tests.ContentManagement;
 using Orchard.Tests.Records;
 
 namespace Orchard.Tests.Data {
@@ -22,7 +23,7 @@ namespace Orchard.Tests.Data {
             _databaseFilePath = Path.GetTempFileName();
             _sessionFactory = DataUtility.CreateSessionFactory(_databaseFilePath, typeof(FooRecord));
             _session = _sessionFactory.OpenSession();
-            _fooRepos = new Repository<FooRecord>(new StubLocator(_session));
+            _fooRepos = new Repository<FooRecord>(new TestTransactionManager(_session));
         }
 
         [TearDown]

src/Orchard.Tests/DataMigration/DataMigrationTests.cs

@@ -45,16 +45,22 @@ namespace Orchard.Tests.DataMigration {
                 typeof(ContentTypeRecord));
         }
 
-        [TearDown]
         public void InitDb() {
             foreach ( var record in _repository.Fetch(m => m != null) ) {
                 _repository.Delete(record);
             }
-            _repository.Flush();
+
+            _transactionManager.RequireNew();
+        }
+
+        [TearDown]
+        public void CleanUp() {
+            if (_container != null)
+                _container.Dispose();
         }
 
         public void Init(IEnumerable<Type> dataMigrations) {
-           
+                      
             var builder = new ContainerBuilder();
             _folders = new StubFolders();
             var contentDefinitionManager = new Mock<IContentDefinitionManager>().Object;
@@ -73,7 +79,7 @@ namespace Orchard.Tests.DataMigration {
             builder.RegisterType<StubParallelCacheContext>().As<IParallelCacheContext>();
             builder.RegisterType<StubAsyncTokenProvider>().As<IAsyncTokenProvider>();
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>().As<ITransactionManager>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
             foreach(var type in dataMigrations) {
                 builder.RegisterType(type).As<IDataMigration>();
             }

src/Orchard.Tests/DataMigration/SchemaBuilderTests.cs

@@ -52,7 +52,7 @@ namespace Orchard.Tests.DataMigration {
             builder.RegisterType<SessionFactoryHolder>().As<ISessionFactoryHolder>();
             builder.RegisterType<DefaultDatabaseCacheConfiguration>().As<IDatabaseCacheConfiguration>();
             builder.RegisterType<StubHostEnvironment>().As<IHostEnvironment>();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
             builder.RegisterInstance(new ShellBlueprint { Records = Enumerable.Empty<RecordBlueprint>() }).As<ShellBlueprint>();
             builder.RegisterInstance(new ShellSettings { Name = "temp", DataProvider = "SqlCe", DataTablePrefix = "TEST" }).As<ShellSettings>();
             builder.RegisterModule(new DataModule());

src/Orchard.Tests/DatabaseEnabledTestsBase.cs

@@ -11,6 +11,7 @@ using Orchard.ContentManagement.Handlers;
 using Orchard.Data;
 using Orchard.Environment.Configuration;
 using Orchard.Services;
+using Orchard.Tests.ContentManagement;
 using Orchard.Tests.Data;
 using Orchard.Tests.Stubs;
 
@@ -48,7 +49,8 @@ namespace Orchard.Tests {
             builder.RegisterInstance(_clock).As<IClock>();
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
             builder.RegisterInstance(new ShellSettings { Name = ShellSettings.DefaultName, DataProvider = "SqlCe" });
-            
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
+
             Register(builder);
             _container = builder.Build();
         }
@@ -57,9 +59,6 @@ namespace Orchard.Tests {
         public void Cleanup() {
             if(_container != null)
                 _container.Dispose();
-
-            if(_session != null)
-                _session.Close();
         }
 
         public abstract void Register(ContainerBuilder builder);

src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs

@@ -28,13 +28,6 @@ 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/Extensions/ExtensionManagerTests.cs

@@ -512,7 +512,7 @@ Features:
         Dependencies: Beta
 ");
 
-            moduleExtensionFolder.Manifests.Add("Classic", @"
+            themeExtensionFolder.Manifests.Add("Classic", @"
 Name: Classic
 Version: 1.0.3
 OrchardVersion: 1

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

@@ -160,6 +160,38 @@ namespace Orchard.Tests.Environment.ShellBuilders {
         public class TestDependency : ITestDependency {
         }
 
+        [Test]
+        public void ComponentsImplementingMultipleContractsAreResolvableOnce() {
+            var settings = CreateSettings();
+            var blueprint = CreateBlueprint(
+                WithDependency<MultipleDependency>()
+            );
+
+            var factory = _container.Resolve<IShellContainerFactory>();
+            var shellContainer = factory.CreateContainer(settings, blueprint);
+
+            var multipleDependency1 = shellContainer.Resolve<IMultipleDependency1>();
+            var multipleDependency2 = shellContainer.Resolve<IMultipleDependency2>();
+
+            Assert.That(multipleDependency1, Is.Not.Null);
+            Assert.That(multipleDependency2, Is.Not.Null);
+
+            Assert.That(multipleDependency1, Is.InstanceOf<MultipleDependency>());
+            Assert.That(multipleDependency2, Is.InstanceOf<MultipleDependency>());
+
+            Assert.True(multipleDependency1 == multipleDependency2);
+        }
+
+        public interface IMultipleDependency1 : IDependency {
+
+        }
+        public interface IMultipleDependency2 : IDependency {
+
+        }
+        public class MultipleDependency : IMultipleDependency1, IMultipleDependency2 {
+
+        }
+
         [Test]
         public void ExtraInformationCanDropIntoProperties() {
             var settings = CreateSettings();

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

@@ -56,11 +56,7 @@ namespace Orchard.Tests.Environment.ShellBuilders {
 
             _container.Mock<IHttpContextAccessor>()
                 .Setup(x => x.Current())
-                .Returns(httpContext);
-
-            _container.Mock<IHttpContextAccessor>()
-                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
-                .Returns(httpContext);
+                .Returns(default(HttpContextBase));
 
             var factory = _container.Resolve<IShellContextFactory>();
 

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

@@ -43,10 +43,6 @@ namespace Orchard.Tests.Environment.State {
             _container.Mock<IHttpContextAccessor>()
                 .Setup(x=>x.Current())
                 .Returns(httpContext);
-            _container.Mock<IHttpContextAccessor>()
-                .Setup(x => x.CreateContext(It.IsAny<ILifetimeScope>()))
-                .Returns(httpContext);
-
         }
 
         [TearDown]

src/Orchard.Tests/Localization/CultureManagerTests.cs

@@ -46,7 +46,6 @@ namespace Orchard.Tests.Localization {
             builder.RegisterType<DefaultShapeTableManager>().As<IShapeTableManager>();
             builder.RegisterType<DefaultShapeFactory>().As<IShapeFactory>();
             builder.RegisterInstance(new Mock<IContentDefinitionManager>().Object);
-            builder.RegisterInstance(new Mock<ITransactionManager>().Object);
             builder.RegisterInstance(new Mock<IAuthorizer>().Object);
             builder.RegisterInstance(new Mock<INotifier>().Object);
             builder.RegisterInstance(new Mock<IContentDisplay>().Object);
@@ -60,7 +59,7 @@ namespace Orchard.Tests.Localization {
             builder.RegisterType<StubCacheManager>().As<ICacheManager>();
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
             _session = _sessionFactory.OpenSession();
-            builder.RegisterInstance(new DefaultContentManagerTests.TestSessionLocator(_session)).As<ISessionLocator>();
+            builder.RegisterInstance(new TestTransactionManager(_session)).As<ITransactionManager>();
             _container = builder.Build();
             _cultureManager = _container.Resolve<ICultureManager>();
         }

src/Orchard.Tests/Localization/DateTimePartsTests.cs

@@ -4,7 +4,7 @@ using Orchard.Localization.Models;
 
 namespace Orchard.Tests.Localization {
 
-    [TestFixture]
+    [TestFixture()]
     public class DateTimePartsTests {
 
         [Test]

src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
@@ -13,7 +12,8 @@ using Orchard.Localization.Services;
 
 namespace Orchard.Tests.Localization {
 
-    [TestFixture]
+    [TestFixture()]
+	[Category("longrunning")]
     public class DefaultDateFormatterTests {
 
         [SetUp]
@@ -87,9 +87,16 @@ namespace Orchard.Tests.Localization {
                 var container = TestHelpers.InitializeContainer(culture.Name, "GregorianCalendar", TimeZoneInfo.Utc);
                 var formats = container.Resolve<IDateTimeFormatProvider>();
                 var target = container.Resolve<IDateFormatter>();
+                var hoursToTest = new[] { 0, 6, 12, 18 };
+
+                // Fix for some cultures on Windows 10 where both designators for some reason
+                // are empty strings. A 24-hour time cannot possibly be round-tripped without any
+                // way to distinguish AM from PM, so for these cases test only 12-hour time.
+                if (culture.DateTimeFormat.AMDesignator == culture.DateTimeFormat.PMDesignator)
+                    hoursToTest = new[] { 1, 6, 9, 12 };
 
                 foreach (var dateTimeFormat in formats.AllDateTimeFormats) { // All date and time formats supported by the culture.
-                    foreach (var hour in new[] { 0, 6, 12, 18 }) { // Enough hours to cover all code paths (AM/PM, 12<->00, etc).
+                    foreach (var hour in hoursToTest) { // Enough hours to cover all code paths (AM/PM, 12<->00, etc).
 
                         DateTime dateTime = new DateTime(1998, 1, 1, hour, 30, 30, DateTimeKind.Utc);
 
@@ -320,9 +327,16 @@ namespace Orchard.Tests.Localization {
                 var container = TestHelpers.InitializeContainer(culture.Name, null, TimeZoneInfo.Utc);
                 var formats = container.Resolve<IDateTimeFormatProvider>();
                 var target = container.Resolve<IDateFormatter>();
+                var hoursToTest = Enumerable.Range(0, 23);
+
+                // Fix for some cultures on Windows 10 where both designators for some reason
+                // are empty strings. A 24-hour time cannot possibly be round-tripped without any
+                // way to distinguish AM from PM, so for these cases test only 12-hour time.
+                if (culture.DateTimeFormat.AMDesignator == culture.DateTimeFormat.PMDesignator)
+                    hoursToTest = Enumerable.Range(1, 12);
 
                 foreach (var timeFormat in formats.AllTimeFormats) { // All time formats supported by the culture.
-                    for (var hour = 0; hour <= 23; hour++) { // All hours in the day.
+                    foreach (var hour in hoursToTest) { // All hours in the day.
 
                         DateTime time = new DateTime(1998, 1, 1, hour, 30, 30);
                         var timeString = time.ToString(timeFormat, culture);

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

@@ -208,6 +208,7 @@
     <Compile Include="ContentManagement\Records\GammaRecord.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="ContentManagement\TestTransactionManager.cs" />
     <Compile Include="ContentManagement\XmlHelperTests.cs" />
     <Compile Include="DatabaseEnabledTestsBase.cs" />
     <Compile Include="DataMigration\SchemaBuilderTests.cs" />

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.1")]
-[assembly: AssemblyFileVersion("1.9.1")]
+[assembly: AssemblyVersion("1.9.2")]
+[assembly: AssemblyFileVersion("1.9.2")]