Adding Multi-Tenant Commands feature

.gitignore

@@ -166,8 +166,6 @@ build/
 /artifacts
 *.sln.cache
 src/Orchard.Web/Media/*
-src/Orchard.Web/x86
-src/Orchard.Web/amd64
 log.xml
 profiling/
 *.orig

CREDITS.txt

@@ -265,18 +265,6 @@ Website:      https://github.com/sayedihashimi/package-web/
 Copyright:    Copyright 2013 Sayed Ibrahim Hashimi
 License:      Apache 2.0
 
-SQLite
------
-Website:      http://sqlite.org
-Copyright:    Public Domain
-License:      Public Domain
-
-SQLite CREATE Statement Parser for .Net
------
-Website:      https://github.com/ericschultz/SQLiteParser
-Copyright:    Copyright 2014 Outercurve Foundation
-License:      MIT
-
 SpecFlow
 -----
 Website:      http://www.specflow.org/

ClickToBuild.cmd

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

Orchard.proj

@@ -10,7 +10,6 @@
     <MsBuildTasksFolder>$(MSBuildProjectDirectory)\buildtasks</MsBuildTasksFolder>
     <ArtifactsFolder>$(MSBuildProjectDirectory)\artifacts</ArtifactsFolder>
     <SqlCeFolder>$(MSBuildProjectDirectory)\lib\sqlce</SqlCeFolder>
-	<SQLiteFolder>$(MSBuildProjectDirectory)\lib\sqlite</SQLiteFolder>
     <SourceArtifactFolder>$(ArtifactsFolder)\Source</SourceArtifactFolder>
     <MsDeployArtifactFolder>$(ArtifactsFolder)\MsDeploy</MsDeployArtifactFolder>
     <GalleryArtifactFolder>$(ArtifactsFolder)\Gallery</GalleryArtifactFolder>
@@ -28,7 +27,6 @@
 
     <BuildPlatform Condition="$(ProgramW6432) != ''">x64</BuildPlatform>
     <BuildPlatform Condition="$(BuildPlatform) == ''">x86</BuildPlatform>
-    <Configuration Condition="$(Configuration) == ''">Release</Configuration>
 
     <!-- TeamCity build number -->
     <Version>$(BUILD_NUMBER)</Version>
@@ -117,7 +115,7 @@
     <MSBuild
       Projects="$(SrcFolder)\Orchard.sln"
       Targets="Build"
-      Properties="Configuration=$(Configuration);OutputPath=$(CompileFolder)" />
+      Properties="Configuration=Release;OutputPath=$(CompileFolder)" />
     <!-- Compile to "regular" output folder for devs using VS locally -->
     <MSBuild
       Projects="$(SrcFolder)\Orchard.sln"
@@ -128,7 +126,7 @@
     <MSBuild
       Projects="$(SrcFolder)\Tools\MSBuild.Orchard.Tasks\MSBuild.Orchard.Tasks.csproj"
       Targets="Build"
-      Properties="Configuration=$(Configuration);OutputPath=$(MsBuildTasksFolder)" />
+      Properties="Configuration=Release;OutputPath=$(MsBuildTasksFolder)" />
   </Target>
 
   <Target Name="TypeScript" DependsOnTargets="CompileMsBuildTasks">
@@ -190,8 +188,6 @@
     <ItemGroup>
       <SqlCe-Native-Binaries-x86 Include="$(SqlCeFolder)\x86\**\*"/>
       <SqlCe-Native-Binaries-amd64 Include="$(SqlCeFolder)\amd64\**\*"/>
-	  <SQLite-Native-Binaries-x86 Include="$(SQLiteFolder)\x86\**\*"/>
-      <SQLite-Native-Binaries-amd64 Include="$(SQLiteFolder)\amd64\**\*"/>
       <Stage-Orchard-Web-Bins Include="$(WebSitesFolder)\Orchard.Web\bin\*"/>
       <Stage-Bin-Exclude Include="$(WebSitesFolder)\**\bin\**\*" />
       <Stage-Web Include="$(WebSitesFolder)\Orchard.Web\**\*;$(SrcFolder)\Orchard.Web\*.csproj;" Exclude="$(SrcFolder)\Orchard.Web\Orchard.Web.csproj;$(SrcFolder)\Orchard.Web\**\*.Release.config;$(SrcFolder)\Orchard.Web\**\*.Debug.config"/>
@@ -262,8 +258,6 @@
     <Copy SourceFiles="@(Stage-PoFiles)" DestinationFolder="$(StageFolder)\%(RecursiveDir)"/>
     <Copy SourceFiles="@(SqlCe-Native-Binaries-x86)" DestinationFolder="$(StageFolder)\bin\x86\%(RecursiveDir)"/>
     <Copy SourceFiles="@(SqlCe-Native-Binaries-amd64)" DestinationFolder="$(StageFolder)\bin\amd64\%(RecursiveDir)"/>
-	<Copy SourceFiles="@(SQLite-Native-Binaries-x86)" DestinationFolder="$(StageFolder)\bin\x86\%(RecursiveDir)"/>
-    <Copy SourceFiles="@(SQLite-Native-Binaries-amd64)" DestinationFolder="$(StageFolder)\bin\amd64\%(RecursiveDir)"/>
     <Copy SourceFiles="@(Stage-Core)" DestinationFolder="$(StageFolder)\Core\%(RecursiveDir)"/>
     <Copy SourceFiles="@(Stage-Modules)" DestinationFiles="@(Stage-Modules->'$(StageFolder)\Modules\%(ModuleName)\%(RecursiveDir)%(Filename)%(Extension)')"/>
     <Copy SourceFiles="@(Stage-Modules-Binaries-Unique)" DestinationFiles="@(Stage-Modules-Binaries-Unique->'$(StageFolder)\Modules\%(ModuleName)\%(RecursiveDir)%(Filename)%(Extension)')"/>
@@ -279,19 +273,19 @@
     <!-- extra processing of the staged config files -->
     <TransformXml 
       Source="$(StageFolder)\Web.Config"
-      Transform="$(SrcFolder)\Orchard.Web\Web.$(Configuration).Config"
+      Transform="$(SrcFolder)\Orchard.Web\Web.Release.Config"
       Destination="$(StageFolder)\Web.Config"
     />
 
     <TransformXml 
       Source="$(StageFolder)\Config\HostComponents.Config"
-      Transform="$(SrcFolder)\Orchard.Web\Config\HostComponents.$(Configuration).Config"
+      Transform="$(SrcFolder)\Orchard.Web\Config\HostComponents.Release.Config"
       Destination="$(StageFolder)\Config\HostComponents.Config"
     />
 
     <TransformXml 
       Source="$(StageFolder)\Config\log4net.Config"
-      Transform="$(SrcFolder)\Orchard.Web\Config\log4net.$(Configuration).Config"
+      Transform="$(SrcFolder)\Orchard.Web\Config\log4net.Release.Config"
       Destination="$(StageFolder)\Config\log4net.Config"
     />
     

README.md

@@ -1,13 +1,6 @@
 # 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.

lib/newtonsoft.json/Newtonsoft.Json.xml

@@ -403,17 +403,17 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonWriter.WriteStartObject">
             <summary>
-            Writes the beginning of a JSON object.
+            Writes the beginning of a Json object.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonWriter.WriteEndObject">
             <summary>
-            Writes the end of a JSON object.
+            Writes the end of a Json object.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonWriter.WriteStartArray">
             <summary>
-            Writes the beginning of a JSON array.
+            Writes the beginning of a Json array.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonWriter.WriteEndArray">
@@ -447,7 +447,7 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonWriter.WriteEnd">
             <summary>
-            Writes the end of the current JSON object or array.
+            Writes the end of the current Json object or array.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonWriter.WriteToken(Newtonsoft.Json.JsonReader)">
@@ -882,17 +882,17 @@
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonWriter.WriteStartArray">
             <summary>
-            Writes the beginning of a JSON array.
+            Writes the beginning of a Json array.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonWriter.WriteStartObject">
             <summary>
-            Writes the beginning of a JSON object.
+            Writes the beginning of a Json object.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Bson.BsonWriter.WritePropertyName(System.String)">
             <summary>
-            Writes the property name of a name/value pair on a JSON object.
+            Writes the property name of a name/value pair on a Json object.
             </summary>
             <param name="name">The name of the property.</param>
         </member>
@@ -1112,12 +1112,7 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonConverter.GetSchema">
             <summary>
-            <para>
             Gets the <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> of the JSON produced by the JsonConverter.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
             <returns>The <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> of the JSON produced by the JsonConverter.</returns>
         </member>
@@ -2641,13 +2636,13 @@
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.JsonConverterAttribute"/> class.
             </summary>
             <param name="converterType">Type of the converter.</param>
-            <param name="converterParameters">Parameter list to use when constructing the JsonConverter. Can be null.</param>
+            <param name="converterParameters">Parameter list to use when constructing the JsonConverter.  Can be null.</param>
         </member>
         <member name="P:Newtonsoft.Json.JsonConverterAttribute.ConverterType">
             <summary>
-            Gets the <see cref="T:System.Type"/> of the converter.
+            Gets the type of the converter.
             </summary>
-            <value>The <see cref="T:System.Type"/> of the converter.</value>
+            <value>The type of the converter.</value>
         </member>
         <member name="P:Newtonsoft.Json.JsonConverterAttribute.ConverterParameters">
             <summary>
@@ -2678,7 +2673,7 @@
         </member>
         <member name="T:Newtonsoft.Json.JsonException">
             <summary>
-            The exception thrown when an error occurs during JSON serialization or deserialization.
+            The exception thrown when an error occurs during Json serialization or deserialization.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonException.#ctor">
@@ -2887,7 +2882,7 @@
         </member>
         <member name="T:Newtonsoft.Json.JsonReaderException">
             <summary>
-            The exception thrown when an error occurs while reading JSON text.
+            The exception thrown when an error occurs while reading Json text.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonReaderException.#ctor">
@@ -2937,14 +2932,9 @@
             </summary>
             <value>The path to the JSON where the error occurred.</value>
         </member>
-        <member name="T:Newtonsoft.Json.JsonRequiredAttribute">
-            <summary>
-            Instructs the <see cref="T:Newtonsoft.Json.JsonSerializer"/> to always serialize the member, and require the member has a value.
-            </summary>
-        </member>
         <member name="T:Newtonsoft.Json.JsonSerializationException">
             <summary>
-            The exception thrown when an error occurs during JSON serialization or deserialization.
+            The exception thrown when an error occurs during Json serialization or deserialization.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializationException.#ctor">
@@ -3045,14 +3035,14 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(Newtonsoft.Json.JsonReader)">
             <summary>
-            Deserializes the JSON structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.
+            Deserializes the Json structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>.
             </summary>
             <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> that contains the JSON structure to deserialize.</param>
             <returns>The <see cref="T:System.Object"/> being deserialized.</returns>
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(System.IO.TextReader,System.Type)">
             <summary>
-            Deserializes the JSON structure contained by the specified <see cref="T:System.IO.StringReader"/>
+            Deserializes the Json structure contained by the specified <see cref="T:System.IO.StringReader"/>
             into an instance of the specified type.
             </summary>
             <param name="reader">The <see cref="T:System.IO.TextReader"/> containing the object.</param>
@@ -3061,7 +3051,7 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize``1(Newtonsoft.Json.JsonReader)">
             <summary>
-            Deserializes the JSON structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>
+            Deserializes the Json structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>
             into an instance of the specified type.
             </summary>
             <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> containing the object.</param>
@@ -3070,7 +3060,7 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Deserialize(Newtonsoft.Json.JsonReader,System.Type)">
             <summary>
-            Deserializes the JSON structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>
+            Deserializes the Json structure contained by the specified <see cref="T:Newtonsoft.Json.JsonReader"/>
             into an instance of the specified type.
             </summary>
             <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> containing the object.</param>
@@ -3079,18 +3069,18 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Serialize(System.IO.TextWriter,System.Object)">
             <summary>
-            Serializes the specified <see cref="T:System.Object"/> and writes the JSON structure
+            Serializes the specified <see cref="T:System.Object"/> and writes the Json structure
             to a <c>Stream</c> using the specified <see cref="T:System.IO.TextWriter"/>. 
             </summary>
-            <param name="textWriter">The <see cref="T:System.IO.TextWriter"/> used to write the JSON structure.</param>
+            <param name="textWriter">The <see cref="T:System.IO.TextWriter"/> used to write the Json structure.</param>
             <param name="value">The <see cref="T:System.Object"/> to serialize.</param>
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Serialize(Newtonsoft.Json.JsonWriter,System.Object,System.Type)">
             <summary>
-            Serializes the specified <see cref="T:System.Object"/> and writes the JSON structure
+            Serializes the specified <see cref="T:System.Object"/> and writes the Json structure
             to a <c>Stream</c> using the specified <see cref="T:System.IO.TextWriter"/>. 
             </summary>
-            <param name="jsonWriter">The <see cref="T:Newtonsoft.Json.JsonWriter"/> used to write the JSON structure.</param>
+            <param name="jsonWriter">The <see cref="T:Newtonsoft.Json.JsonWriter"/> used to write the Json structure.</param>
             <param name="value">The <see cref="T:System.Object"/> to serialize.</param>
             <param name="objectType">
             The type of the value being serialized.
@@ -3100,10 +3090,10 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Serialize(System.IO.TextWriter,System.Object,System.Type)">
             <summary>
-            Serializes the specified <see cref="T:System.Object"/> and writes the JSON structure
+            Serializes the specified <see cref="T:System.Object"/> and writes the Json structure
             to a <c>Stream</c> using the specified <see cref="T:System.IO.TextWriter"/>. 
             </summary>
-            <param name="textWriter">The <see cref="T:System.IO.TextWriter"/> used to write the JSON structure.</param>
+            <param name="textWriter">The <see cref="T:System.IO.TextWriter"/> used to write the Json structure.</param>
             <param name="value">The <see cref="T:System.Object"/> to serialize.</param>
             <param name="objectType">
             The type of the value being serialized.
@@ -3113,10 +3103,10 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonSerializer.Serialize(Newtonsoft.Json.JsonWriter,System.Object)">
             <summary>
-            Serializes the specified <see cref="T:System.Object"/> and writes the JSON structure
+            Serializes the specified <see cref="T:System.Object"/> and writes the Json structure
             to a <c>Stream</c> using the specified <see cref="T:Newtonsoft.Json.JsonWriter"/>. 
             </summary>
-            <param name="jsonWriter">The <see cref="T:Newtonsoft.Json.JsonWriter"/> used to write the JSON structure.</param>
+            <param name="jsonWriter">The <see cref="T:Newtonsoft.Json.JsonWriter"/> used to write the Json structure.</param>
             <param name="value">The <see cref="T:System.Object"/> to serialize.</param>
         </member>
         <member name="E:Newtonsoft.Json.JsonSerializer.Error">
@@ -3140,12 +3130,6 @@
             </summary>
             <value>The trace writer.</value>
         </member>
-        <member name="P:Newtonsoft.Json.JsonSerializer.EqualityComparer">
-            <summary>
-            Gets or sets the equality comparer used by the serializer when comparing references.
-            </summary>
-            <value>The equality comparer.</value>
-        </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.TypeNameHandling">
             <summary>
             Gets or sets how type name writing and reading is handled by the serializer.
@@ -3257,7 +3241,7 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.DateFormatString">
             <summary>
-            Get or set how <see cref="T:System.DateTime"/> and <see cref="T:System.DateTimeOffset"/> values are formatted when writing JSON text, and the expected date format when reading JSON text.
+            Get or set how <see cref="T:System.DateTime"/> and <see cref="T:System.DateTimeOffset"/> values are formatting when writing JSON text.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.Culture">
@@ -3361,24 +3345,12 @@
             </summary>
             <value>The contract resolver.</value>
         </member>
-        <member name="P:Newtonsoft.Json.JsonSerializerSettings.EqualityComparer">
-            <summary>
-            Gets or sets the equality comparer used by the serializer when comparing references.
-            </summary>
-            <value>The equality comparer.</value>
-        </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.ReferenceResolver">
             <summary>
             Gets or sets the <see cref="T:Newtonsoft.Json.Serialization.IReferenceResolver"/> used by the serializer when resolving references.
             </summary>
             <value>The reference resolver.</value>
         </member>
-        <member name="P:Newtonsoft.Json.JsonSerializerSettings.ReferenceResolverProvider">
-            <summary>
-            Gets or sets a function that creates the <see cref="T:Newtonsoft.Json.Serialization.IReferenceResolver"/> used by the serializer when resolving references.
-            </summary>
-            <value>A function that creates the <see cref="T:Newtonsoft.Json.Serialization.IReferenceResolver"/> used by the serializer when resolving references.</value>
-        </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.TraceWriter">
             <summary>
             Gets or sets the <see cref="T:Newtonsoft.Json.Serialization.ITraceWriter"/> used by the serializer when writing trace messages.
@@ -3405,7 +3377,7 @@
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.DateFormatString">
             <summary>
-            Get or set how <see cref="T:System.DateTime"/> and <see cref="T:System.DateTimeOffset"/> values are formatted when writing JSON text, and the expected date format when reading JSON text.
+            Get or set how <see cref="T:System.DateTime"/> and <see cref="T:System.DateTimeOffset"/> values are formatting when writing JSON text.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.MaxDepth">
@@ -3572,12 +3544,12 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonTextWriter.WriteStartObject">
             <summary>
-            Writes the beginning of a JSON object.
+            Writes the beginning of a Json object.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonTextWriter.WriteStartArray">
             <summary>
-            Writes the beginning of a JSON array.
+            Writes the beginning of a Json array.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonTextWriter.WriteStartConstructor(System.String)">
@@ -3594,7 +3566,7 @@
         </member>
         <member name="M:Newtonsoft.Json.JsonTextWriter.WritePropertyName(System.String)">
             <summary>
-            Writes the property name of a name/value pair on a JSON object.
+            Writes the property name of a name/value pair on a Json object.
             </summary>
             <param name="name">The name of the property.</param>
         </member>
@@ -3809,7 +3781,7 @@
         </member>
         <member name="T:Newtonsoft.Json.JsonToken">
             <summary>
-            Specifies the type of JSON token.
+            Specifies the type of Json token.
             </summary>
         </member>
         <member name="F:Newtonsoft.Json.JsonToken.None">
@@ -3904,12 +3876,7 @@
         </member>
         <member name="T:Newtonsoft.Json.JsonValidatingReader">
             <summary>
-            <para>
             Represents a reader that provides <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> validation.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonValidatingReader.#ctor(Newtonsoft.Json.JsonReader)">
@@ -4019,7 +3986,7 @@
         </member>
         <member name="T:Newtonsoft.Json.JsonWriterException">
             <summary>
-            The exception thrown when an error occurs while reading JSON text.
+            The exception thrown when an error occurs while reading Json text.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.JsonWriterException.#ctor">
@@ -6467,12 +6434,12 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteStartObject">
             <summary>
-            Writes the beginning of a JSON object.
+            Writes the beginning of a Json object.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteStartArray">
             <summary>
-            Writes the beginning of a JSON array.
+            Writes the beginning of a Json array.
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WriteStartConstructor(System.String)">
@@ -6489,7 +6456,7 @@
         </member>
         <member name="M:Newtonsoft.Json.Linq.JTokenWriter.WritePropertyName(System.String)">
             <summary>
-            Writes the property name of a name/value pair on a JSON object.
+            Writes the property name of a name/value pair on a Json object.
             </summary>
             <param name="name">The name of the property.</param>
         </member>
@@ -6839,22 +6806,12 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.Extensions">
             <summary>
-            <para>
             Contains the JSON schema extension methods.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Schema.Extensions.IsValid(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Schema.JsonSchema)">
             <summary>
-            <para>
             Determines whether the <see cref="T:Newtonsoft.Json.Linq.JToken"/> is valid.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
             <param name="source">The source <see cref="T:Newtonsoft.Json.Linq.JToken"/> to test.</param>
             <param name="schema">The schema to test with.</param>
@@ -6864,12 +6821,7 @@
         </member>
         <member name="M:Newtonsoft.Json.Schema.Extensions.IsValid(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Schema.JsonSchema,System.Collections.Generic.IList{System.String}@)">
             <summary>
-            <para>
             Determines whether the <see cref="T:Newtonsoft.Json.Linq.JToken"/> is valid.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
             <param name="source">The source <see cref="T:Newtonsoft.Json.Linq.JToken"/> to test.</param>
             <param name="schema">The schema to test with.</param>
@@ -6880,24 +6832,14 @@
         </member>
         <member name="M:Newtonsoft.Json.Schema.Extensions.Validate(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Schema.JsonSchema)">
             <summary>
-            <para>
             Validates the specified <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
             <param name="source">The source <see cref="T:Newtonsoft.Json.Linq.JToken"/> to test.</param>
             <param name="schema">The schema to test with.</param>
         </member>
         <member name="M:Newtonsoft.Json.Schema.Extensions.Validate(Newtonsoft.Json.Linq.JToken,Newtonsoft.Json.Schema.JsonSchema,Newtonsoft.Json.Schema.ValidationEventHandler)">
             <summary>
-            <para>
             Validates the specified <see cref="T:Newtonsoft.Json.Linq.JToken"/>.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
             <param name="source">The source <see cref="T:Newtonsoft.Json.Linq.JToken"/> to test.</param>
             <param name="schema">The schema to test with.</param>
@@ -6905,12 +6847,7 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.JsonSchema">
             <summary>
-            <para>
             An in-memory representation of a JSON Schema.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Schema.JsonSchema.#ctor">
@@ -7167,12 +7104,7 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.JsonSchemaException">
             <summary>
-            <para>
             Returns detailed information about the schema exception.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Schema.JsonSchemaException.#ctor">
@@ -7224,12 +7156,7 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.JsonSchemaGenerator">
             <summary>
-            <para>
             Generates a <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from a specified <see cref="T:System.Type"/>.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Schema.JsonSchemaGenerator.Generate(System.Type)">
@@ -7277,12 +7204,7 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.JsonSchemaResolver">
             <summary>
-            <para>
             Resolves <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/> from an id.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="M:Newtonsoft.Json.Schema.JsonSchemaResolver.#ctor">
@@ -7305,12 +7227,7 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.JsonSchemaType">
             <summary>
-            <para>
             The value types allowed by the <see cref="T:Newtonsoft.Json.Schema.JsonSchema"/>.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="F:Newtonsoft.Json.Schema.JsonSchemaType.None">
@@ -7360,12 +7277,7 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.UndefinedSchemaIdHandling">
             <summary>
-            <para>
             Specifies undefined schema Id handling options for the <see cref="T:Newtonsoft.Json.Schema.JsonSchemaGenerator"/>.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="F:Newtonsoft.Json.Schema.UndefinedSchemaIdHandling.None">
@@ -7385,12 +7297,7 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.ValidationEventArgs">
             <summary>
-            <para>
             Returns detailed information related to the <see cref="T:Newtonsoft.Json.Schema.ValidationEventHandler"/>.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.Schema.ValidationEventArgs.Exception">
@@ -7413,12 +7320,7 @@
         </member>
         <member name="T:Newtonsoft.Json.Schema.ValidationEventHandler">
             <summary>
-            <para>
             Represents the callback method that will handle JSON schema validation events and the <see cref="T:Newtonsoft.Json.Schema.ValidationEventArgs"/>.
-            </para>
-            <note type="caution">
-            JSON Schema validation has been moved to its own package. See <see href="http://www.newtonsoft.com/jsonschema">http://www.newtonsoft.com/jsonschema</see> for more details.
-            </note>
             </summary>
         </member>
         <member name="T:Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver">
@@ -7591,14 +7493,7 @@
             Resolves the name of the property.
             </summary>
             <param name="propertyName">Name of the property.</param>
-            <returns>Resolved name of the property.</returns>
-        </member>
-        <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.ResolveDictionaryKey(System.String)">
-            <summary>
-            Resolves the key of the dictionary. By default <see cref="M:Newtonsoft.Json.Serialization.DefaultContractResolver.ResolvePropertyName(System.String)"/> is used to resolve dictionary keys.
-            </summary>
-            <param name="dictionaryKey">Key of the dictionary.</param>
-            <returns>Resolved key of the dictionary.</returns>
+            <returns>Name of the property.</returns>
         </member>
         <member name="M:Newtonsoft.Json.Serialization.DefaultContractResolver.GetResolvedPropertyName(System.String)">
             <summary>
@@ -8117,12 +8012,6 @@
             </summary>
             <value>The property name resolver.</value>
         </member>
-        <member name="P:Newtonsoft.Json.Serialization.JsonDictionaryContract.DictionaryKeyResolver">
-            <summary>
-            Gets or sets the dictionary key resolver.
-            </summary>
-            <value>The dictionary key resolver.</value>
-        </member>
         <member name="P:Newtonsoft.Json.Serialization.JsonDictionaryContract.DictionaryKeyType">
             <summary>
             Gets the <see cref="T:System.Type"/> of the dictionary keys.
@@ -8583,7 +8472,6 @@
             <summary>
             Initializes a new instance of the <see cref="T:Newtonsoft.Json.Serialization.ReflectionAttributeProvider"/> class.
             </summary>
-            <param name="attributeProvider">The instance to get attributes for. This parameter should be a <see cref="T:System.Type"/>, <see cref="T:System.Reflection.MemberInfo"/>, <see cref="T:System.Reflection.ParameterInfo"/> or <see cref="T:System.Reflection.Assembly"/>.</param>
         </member>
         <member name="M:Newtonsoft.Json.Serialization.ReflectionAttributeProvider.GetAttributes(System.Boolean)">
             <summary>
@@ -8693,7 +8581,7 @@
         </member>
         <member name="M:Newtonsoft.Json.Utilities.CollectionUtils.IndexOf``1(System.Collections.Generic.IEnumerable{``0},``0,System.Collections.Generic.IEqualityComparer{``0})">
             <summary>
-            Returns the index of the first occurrence in a sequence by using a specified IEqualityComparer{TSource}.
+            Returns the index of the first occurrence in a sequence by using a specified IEqualityComparer.
             </summary>
             <typeparam name="TSource">The type of the elements of source.</typeparam>
             <param name="list">A sequence in which to locate a value.</param>

lib/npgsql/LICENSE.txt

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

lib/npgsql/README.md

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

lib/sqlite-createsupport/Outercurve.SQLiteCreateTree.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Outercurve.SQLiteCreateTree</name>
-    </assembly>
-    <members>
-        <member name="M:Outercurve.SQLiteCreateTree.AlterTable.NativeAlterTableProcessor.CreateSqlStatements(Outercurve.SQLiteCreateTree.AlterTable.Action.AlterTableCommand)">
-            <summary>
-            returns null if something if we don't have ones we can do natively
-            </summary>
-            <param name="command"></param>
-            <returns></returns>
-        </member>
-        <member name="P:Outercurve.SQLiteCreateTree.Nodes.ColumnConstraint.UniqueConstraintNode.ConflictClause">
-            <summary>
-            Conflict Clause is really weird, it can be empty. We treat that as null.
-            </summary>
-        </member>
-        <member name="P:Outercurve.SQLiteCreateTree.Nodes.ForeignDeferrableNode.IsDeferrable">
-            <summary>
-            NOT? 
-            </summary>
-        </member>
-        <member name="P:Outercurve.SQLiteCreateTree.Nodes.ForeignDeferrableNode.InitiallyImmediate">
-            <summary>
-            ((INITIALLY DEFERRED)| (INITIALLY IMMEDIATE))?
-            </summary>
-        </member>
-    </members>
-</doc>

lib/sqlite/System.Data.SQLite.dll.config

@@ -1,121 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *
- * System.Data.SQLite.dll.config -
- *
- * Written by Joe Mistachkin.
- * Released to the public domain, use at your own risk!
- *
--->
-<configuration>
-  <appSettings>
-    <!--
-        NOTE: If this configuration variable is set [to anything], the SQLite
-              logging subsystem may be initialized in a non-default application
-              domain.  By default, this is not allowed due to the potential
-              for application domain unloading issues.
-    -->
-    <!--
-    <add key="Force_SQLiteLog" value="1" />
-    -->
-
-    <!--
-        NOTE: If this configuration variable is set [to anything], the native
-              library pre-loading functionality will be disabled.  By default,
-              the native library pre-loading will attempt to load the native
-              SQLite library from architecture-specific (e.g. "x86", "amd64",
-              "x64") or platform-specific (e.g. "Win32") directories that
-              reside underneath the application base directory.
-    -->
-    <!--
-    <add key="No_PreLoadSQLite" value="1" />
-    -->
-
-    <!--
-        NOTE: If this configuration variable is set [to anything], the new
-              connection string parsing algorithm will not be used.  This
-              environment variable is intended for use with legacy code only.
-    -->
-    <!--
-    <add key="No_SQLiteConnectionNewParser" value="1" />
-    -->
-
-    <!--
-        NOTE: If this configuration variable is set [to anything], the initial
-              search for types in all loaded assemblies that are tagged with
-              the SQLiteFunction attribute will be skipped.  Normally, this
-              search is conducted only once per application domain by the
-              static constructor of the SQLiteFunction class; however, these
-              implementation details are subject to change.
-    -->
-    <!--
-    <add key="No_SQLiteFunctions" value="1" />
-    -->
-
-    <!--
-        NOTE: If this configuration variable is set [to anything], it will be
-              used instead of the application base directory by the native
-              library pre-loader.  This environment variable can be especially
-              useful in ASP.NET and other hosted environments where direct
-              control of the location of the managed assemblies is not under
-              the control of the application.
-    -->
-    <!--
-    <add key="PreLoadSQLite_BaseDirectory" value="" />
-    -->
-
-    <!--
-        NOTE: If this configuration variable is set [to anything], it will be
-              used instead of the processor architecture value contained in the
-              PROCESSOR_ARCHITECTURE environment variable to help build the
-              path of the native library to pre-load.
-    -->
-    <!--
-    <add key="PreLoadSQLite_ProcessorArchitecture" value="x86" />
-    -->
-
-    <!--
-        NOTE: If this environment variable is set [to anything], the native
-              library pre-loading code will skip conducting a search for the
-              native library to pre-load.  By default, the search starts in the
-              location of the currently executing assembly (i.e. the assembly
-              containing all the managed components for System.Data.SQLite) and
-              then falls back to the application domain base directory.
-    -->
-    <!--
-    <add key="PreLoadSQLite_NoSearchForDirectory" value="1" />
-    -->
-
-    <!--
-        NOTE: If this configuration variable is set [to anything], the location
-              of the currently executing assembly (i.e. the one containing all
-              the managed components for System.Data.SQLite) will be used as
-              the basis for locating the the native library to pre-load (i.e.
-              instead of using the application domain base directory).
-    -->
-    <!--
-    <add key="PreLoadSQLite_UseAssemblyDirectory" value="1" />
-    -->
-
-    <!--
-        NOTE: This configuration variable is normally set by the operating
-              system itself and should reflect the native processor
-              architecture of the current process (e.g. a 32-bit x86
-              application running on a 64-bit x64 operating system should have
-              the value "x86").
-    -->
-    <!--
-    <add key="PROCESSOR_ARCHITECTURE" value="%PROCESSOR_ARCHITECTURE%" />
-    -->
-
-    <!--
-        NOTE: If this environment variable is set [to anything], it will be
-              used by the System.Data.SQLite.SQLiteFactory class as the type
-              name containing the System.Data.Common.DbProviderServices
-              implementation that should be used.
-    -->
-    <!--
-    <add key="TypeName_SQLiteProviderServices" value="" />
-    -->
-  </appSettings>
-</configuration>

lib/windowsazure/Microsoft.Azure.Common.xml

@@ -161,237 +161,6 @@
             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

@@ -1,114 +0,0 @@
-<?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="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="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="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.Azure.CloudConfigurationManager">
+        <member name="T:Microsoft.WindowsAzure.CloudConfigurationManager">
             <summary>
-            Configuration manager for accessing Microsoft Azure settings.
+            Configuration manager for accessing Windows Azure settings.
             </summary>
         </member>
-        <member name="M:Microsoft.Azure.CloudConfigurationManager.GetSetting(System.String)">
+        <member name="M:Microsoft.WindowsAzure.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.Azure.CloudConfigurationManager.AppSettings">
+        <member name="P:Microsoft.WindowsAzure.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.Azure.AzureApplicationSettings">
+        <member name="T:Microsoft.WindowsAzure.AzureApplicationSettings">
             <summary>
-            Microsoft Azure settings.
+            Windows Azure settings.
             </summary>
         </member>
-        <member name="M:Microsoft.Azure.AzureApplicationSettings.#ctor">
+        <member name="M:Microsoft.WindowsAzure.AzureApplicationSettings.#ctor">
             <summary>
             Initializes the settings.
             </summary>
         </member>
-        <member name="M:Microsoft.Azure.AzureApplicationSettings.IsMissingSettingException(System.Exception)">
+        <member name="M:Microsoft.WindowsAzure.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.Azure.AzureApplicationSettings.GetSetting(System.String)">
+        <member name="M:Microsoft.WindowsAzure.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.Azure.AzureApplicationSettings.GetValue(System.String,System.String,System.Func{System.String,System.String})">
+        <member name="M:Microsoft.WindowsAzure.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.Azure.AzureApplicationSettings.GetServiceRuntimeSetting(System.String)">
+        <member name="M:Microsoft.WindowsAzure.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.Azure.AzureApplicationSettings.GetServiceRuntimeAssembly">
+        <member name="M:Microsoft.WindowsAzure.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.Azure.NativeMethods.GetAssemblyPath(System.String)">
+        <member name="M:Microsoft.WindowsAzure.NativeMethods.GetAssemblyPath(System.String)">
             <summary>
             Gets an assembly path from the GAC given a partial name.
             </summary>

src/Gulpfile.js

@@ -4,16 +4,16 @@ 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")
 
 /*
 ** GULP TASKS
@@ -39,17 +39,10 @@ gulp.task("rebuild", function () {
 
 // Continuous watch (each asset group is built whenever one of its inputs changes).
 gulp.task("watch", function () {
-    var pathWin32 = require("path");
     getAssetGroups().forEach(function (assetGroup) {
-        var watchPaths = assetGroup.inputPaths.concat(assetGroup.watchPaths);
-        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);
+        gulp.watch(assetGroup.inputPaths, function (event) {
+            console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding output '" + assetGroup.outputPath + "'.");
+            var task = createAssetGroupTask(assetGroup);
         });
     });
 });
@@ -74,15 +67,9 @@ function getAssetGroups() {
 function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
     assetGroup.basePath = path.dirname(assetManifestPath);
     assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) {
-        return path.resolve(path.join(assetGroup.basePath, inputPath));
+        return path.join(assetGroup.basePath, inputPath);
     });
-    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.outputPath = path.join(assetGroup.basePath, assetGroup.output);
     assetGroup.outputDir = path.dirname(assetGroup.outputPath);
     assetGroup.outputFileName = path.basename(assetGroup.output);
 }
@@ -108,7 +95,6 @@ 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,
@@ -118,7 +104,7 @@ function buildCssPipeline(assetGroup, doRebuild) {
                     ext: ".css"
                 }))))
         .pipe(plumber())
-        .pipe(gulpif(generateSourceMaps, sourcemaps.init()))
+        .pipe(sourcemaps.init())
         .pipe(gulpif("*.less", less()))
         .pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
         .pipe(autoprefixer({ browsers: ["last 2 versions"] }))
@@ -129,7 +115,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(gulpif(generateSourceMaps, sourcemaps.write()))
+        .pipe(sourcemaps.write())
         .pipe(gulp.dest(assetGroup.outputDir))
         .pipe(minify())
         .pipe(rename({
@@ -145,7 +131,6 @@ 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,
@@ -155,14 +140,14 @@ function buildJsPipeline(assetGroup, doRebuild) {
                     ext: ".js"
                 }))))
         .pipe(plumber())
-        .pipe(gulpif(generateSourceMaps, sourcemaps.init()))
+        .pipe(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" +
@@ -170,11 +155,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(gulpif(generateSourceMaps, sourcemaps.write()))
+        .pipe(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.Tests/Orchard.Azure.Tests.csproj

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

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

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>2.7</ProductVersion>
+    <ProductVersion>2.5</ProductVersion>
     <ProjectGuid>{03c5327d-4e8e-45a7-acd1-e18e7caa3c4a}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -65,7 +65,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.7\</CloudExtensionsDir>
+    <CloudExtensionsDir Condition=" '$(CloudExtensionsDir)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Windows Azure Tools\2.5\</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.cscfg

@@ -1,5 +1,5 @@
 <?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">
+<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>
@@ -15,7 +15,6 @@
       <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="2015-04.2.6">
+<ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition" schemaVersion="2014-06.2.4">
   <WebRole name="Orchard.Azure.Web">
     <Sites>
       <Site name="Web">
@@ -20,7 +20,6 @@
       <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.Web/Orchard.Azure.Web.csproj

@@ -20,7 +20,6 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <TargetFrameworkProfile />
-    <UseGlobalApplicationHostFile>true</UseGlobalApplicationHostFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -91,13 +90,13 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Diagnostics, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Diagnostics">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.Diagnostics.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.ServiceRuntime">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\windowsazure\Microsoft.WindowsAzure.ServiceRuntime.dll</HintPath>
-      <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Storage">
       <SpecificVersion>False</SpecificVersion>
@@ -182,6 +181,10 @@
       <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">

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

@@ -42,9 +42,8 @@
     <system.diagnostics>
         <trace>
             <listeners>
-                <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"
-                    name="AzureDiagnostics">
-                    <filter type="" />
+                <add type="Microsoft.WindowsAzure.Diagnostics.DiagnosticMonitorTraceListener, Microsoft.WindowsAzure.Diagnostics, Version=2.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" name="AzureDiagnostics">
+                    <filter type=""/>
                 </add>
             </listeners>
         </trace>
@@ -186,25 +185,25 @@
                 <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da"/>
                 <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
             </dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
-			</dependentAssembly>
-			<dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
+                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+            </dependentAssembly>
+            <dependentAssembly>
                 <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
             </dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
+				<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
+				<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
+				<bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.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 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.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

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

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

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

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

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

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

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

src/Orchard.Specs/Bindings/OrchardSiteFactory.cs

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

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

@@ -154,7 +154,6 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="App_Data/Dependencies"/>
       <dependentAssembly>
-        <!-- 1.0.1.0 by NHibernate.Linq, Version=0.0.0.0 -->
         <assemblyIdentity name="Iesi.Collections" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
       </dependentAssembly>
@@ -191,7 +190,6 @@
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <!-- 3.3.1.4000 by NHibernate.Linq, Version=0.0.0.0 -->
         <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.4000" newVersion="4.0.0.4000"/>
       </dependentAssembly>
@@ -200,34 +198,24 @@
         <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <!-- 2.0.0.0 by System.Data.SqlServerCe, Version=4.0.0.0 -->
-        <assemblyIdentity name="System.Transactions" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
-      </dependentAssembly>
-      <dependentAssembly>
-        <!-- 2.0.0.0 by System.Data.SqlServerCe, Version=4.0.0.0 -->
-        <assemblyIdentity name="System.Data" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.6.3.0" newVersion="5.6.3.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

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

@@ -195,7 +195,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.WindowsAzure.Storage" publicKeyToken="31bf3856ad364e35" culture="neutral"/>

src/Orchard.Specs/Orchard.Specs.csproj

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

src/Orchard.Specs/Setup.feature

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

src/Orchard.Specs/Setup.feature.cs

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

src/Orchard.Tests.Modules/App.config

@@ -24,7 +24,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da"/>

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

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

src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs

@@ -60,7 +60,7 @@ namespace Orchard.Tests.Modules {
         }
 
         [TearDown]
-        public virtual void Cleanup() {
+        public void Cleanup() {
             if(_container != null)
                 _container.Dispose();
         }
@@ -72,7 +72,7 @@ namespace Orchard.Tests.Modules {
                 return Enumerable.Empty<Type>();
             }
         }
-        
+
         protected void ClearSession() {
             Trace.WriteLine("Flush and clear session");
             _transaction.Commit();

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

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Xml.Linq;
 using Autofac;
 using Moq;
 using NHibernate;
@@ -6,6 +8,7 @@ using NUnit.Framework;
 using Orchard.Caching;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentManagement.MetaData.Services;
 using Orchard.ContentManagement.Records;
 using Orchard.Core.Settings.Metadata;
@@ -18,7 +21,6 @@ using Orchard.FileSystems.AppData;
 using Orchard.FileSystems.WebSite;
 using Orchard.ImportExport.Services;
 using Orchard.Recipes.Events;
-using Orchard.Recipes.Models;
 using Orchard.Recipes.Services;
 using Orchard.Services;
 using Orchard.Tests.ContentManagement;
@@ -42,8 +44,7 @@ namespace Orchard.Tests.Modules.ImportExport.Services {
                 databaseFileName,
                 typeof(ContentTypeRecord),
                 typeof(ContentItemRecord),
-                typeof(ContentItemVersionRecord),
-                typeof(RecipeStepResultRecord));
+                typeof(ContentItemVersionRecord));
         }
 
         [SetUp]
@@ -55,6 +56,7 @@ namespace Orchard.Tests.Modules.ImportExport.Services {
             builder.RegisterType<RecipeHarvester>().As<IRecipeHarvester>();
             builder.RegisterType<RecipeStepExecutor>().As<IRecipeStepExecutor>();
             builder.RegisterType<StubStepQueue>().As<IRecipeStepQueue>().InstancePerLifetimeScope();
+            builder.RegisterType<StubRecipeJournal>().As<IRecipeJournal>();
             builder.RegisterType<StubRecipeScheduler>().As<IRecipeScheduler>();
             builder.RegisterType<ExtensionManager>().As<IExtensionManager>();
             builder.RegisterType<StubAppDataFolder>().As<IAppDataFolder>();
@@ -83,23 +85,23 @@ namespace Orchard.Tests.Modules.ImportExport.Services {
         [Test]
         public void ImportSucceedsWhenRecipeContainsImportSteps() {
             Assert.DoesNotThrow(() => _importExportService.Import(
-@"<Orchard>
-    <Recipe>
-    <Name>MyModuleInstaller</Name>
-    </Recipe>
-    <Settings />
-</Orchard>"));
+                                                                    @"<Orchard>
+                                                                        <Recipe>
+                                                                        <Name>MyModuleInstaller</Name>
+                                                                        </Recipe>
+                                                                        <Settings />
+                                                                    </Orchard>"));
         }
 
         [Test]
-        public void ImportDoesntFailWhenRecipeContainsNonImportSteps() {
+        public void ImportDoesntFailsWhenRecipeContainsNonImportSteps() {
             Assert.DoesNotThrow(() => _importExportService.Import(
-@"<Orchard>
-    <Recipe>
-    <Name>MyModuleInstaller</Name>
-    </Recipe>
-    <Module name=""MyModule"" />
-</Orchard>"));
+                                                                    @"<Orchard>
+                                                                        <Recipe>
+                                                                        <Name>MyModuleInstaller</Name>
+                                                                        </Recipe>
+                                                                        <Module name=""MyModule"" />
+                                                                    </Orchard>"));
         }
     }
 

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

@@ -303,24 +303,5 @@ 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/Media/Services/MediaServiceTests.cs

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

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

@@ -159,10 +159,8 @@
     <Compile Include="Packaging\Services\FileBasedProjectSystemTests.cs" />
     <Compile Include="Packaging\Services\FolderUpdaterTests.cs" />
     <Compile Include="Packaging\Services\PackageInstallerTests.cs" />
-    <Compile Include="Recipes\RecipeHandlers\RecipeParserTest.cs" />
-    <Compile Include="Recipes\RecipeHandlers\RecipeExecutionStepHandlerTest.cs" />
-    <Compile Include="Recipes\RecipeHandlers\ModuleStepTest.cs" />
-    <Compile Include="Recipes\RecipeHandlers\ThemeStepTest.cs" />
+    <Compile Include="Recipes\RecipeHandlers\ModuleRecipeHandlerTest.cs" />
+    <Compile Include="Recipes\RecipeHandlers\ThemeRecipeHandlerTest.cs" />
     <Compile Include="Recipes\Services\RecipeManagerTests.cs" />
     <Compile Include="Scripting.Dlr\EvaluatorTests.cs" />
     <Compile Include="Scripting\EvaluatorTestsBase.cs" />
@@ -207,7 +205,6 @@
     <ProjectReference Include="..\Orchard.Web\Core\Orchard.Core.csproj">
       <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
       <Name>Orchard.Core</Name>
-      <Private>True</Private>
     </ProjectReference>
     <ProjectReference Include="..\Orchard.Web\Modules\Lucene\Lucene.csproj">
       <Project>{D5D447D7-EF8E-43A6-B9A4-3B025DD9F45D}</Project>
@@ -281,10 +278,6 @@
       <Project>{5D0F00F0-26C9-4785-AD61-B85710C60EB0}</Project>
       <Name>Orchard.Tags</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Orchard.Web\Modules\Orchard.TaskLease\Orchard.TaskLease.csproj">
-      <Project>{3f72a4e9-7b72-4260-b010-c16ec54f9baf}</Project>
-      <Name>Orchard.TaskLease</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Orchard.Web\Modules\Orchard.Themes\Orchard.Themes.csproj">
       <Project>{CDE24A24-01D3-403C-84B9-37722E18DFB7}</Project>
       <Name>Orchard.Themes</Name>
@@ -308,7 +301,6 @@
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
       <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
       <Name>Orchard.Framework</Name>
-      <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -341,17 +333,11 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Recipes\Services\FoldersData\Sample2\Module.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Recipes\Services\FoldersData\Sample2\Recipes\duplicate-steps.recipe.xml" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
   -->
   <Target Name="CopySqlCeBinaries">
     <ItemGroup>

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

@@ -1,250 +1,253 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Xml.Linq;
-using Autofac;
-using NuGet;
-using NUnit.Framework;
-using Orchard.Caching;
-using Orchard.Core.Settings.Descriptor;
-using Orchard.Core.Settings.Descriptor.Records;
-using Orchard.Core.Settings.State;
-using Orchard.Data.Migration;
-using Orchard.Environment.Configuration;
-using Orchard.Environment.Descriptor;
-using Orchard.Environment.Descriptor.Models;
-using Orchard.Environment.Extensions;
-using Orchard.Environment.Extensions.Folders;
-using Orchard.Environment.Extensions.Models;
-using Orchard.Environment.Features;
-using Orchard.Environment.State;
-using Orchard.Events;
-using Orchard.Packaging.GalleryServer;
-using Orchard.Packaging.Models;
-using Orchard.Packaging.Services;
-using Orchard.Recipes.Models;
-using Orchard.Recipes.Providers.Executors;
-using Orchard.Recipes.Services;
-using Orchard.Tests.Environment.Extensions;
-using Orchard.Tests.Environment.Features;
-using Orchard.Tests.Stubs;
-using IPackageManager = Orchard.Packaging.Services.IPackageManager;
-
-namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {
-    [TestFixture]
-    public class ModuleStepTest : DatabaseEnabledTestsBase {
-        private ExtensionManagerTests.StubFolders _folders;
-        private StubPackagingSourceManager _packagesInRepository;
-        private StubPackageManager _packageManager;
-
-        protected override IEnumerable<Type> DatabaseTypes {
-            get {
-                return new[] {
-                    typeof (ShellDescriptorRecord),
-                    typeof (ShellFeatureRecord),
-                    typeof (ShellParameterRecord),
-                };
-            }
-        }
-
-        public override void Register(ContainerBuilder builder) {
-            builder.RegisterInstance(new ShellSettings { Name = "Default" });
-
-            _folders = new ExtensionManagerTests.StubFolders();
-            _packagesInRepository = new StubPackagingSourceManager();
-            _packageManager = new StubPackageManager();
-            builder.RegisterInstance(_folders).As<IExtensionFolders>();
-            builder.RegisterType<RecipeExecutionLogger>().AsSelf();
-            builder.RegisterType<ExtensionManager>().As<IExtensionManager>();
-            builder.RegisterType<FeatureManager>().As<IFeatureManager>();
-            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
-            builder.RegisterType<StubParallelCacheContext>().As<IParallelCacheContext>();
-            builder.RegisterType<StubAsyncTokenProvider>().As<IAsyncTokenProvider>();
-            builder.RegisterType<ShellDescriptorManager>().As<IShellDescriptorManager>().SingleInstance();
-            builder.RegisterType<StubDataMigrationManager>().As<IDataMigrationManager>();
-            builder.RegisterInstance(_packagesInRepository).As<IPackagingSourceManager>();
-            builder.RegisterInstance(_packageManager).As<IPackageManager>();
-            builder.RegisterType<ShellStateManager>().As<IShellStateManager>().SingleInstance();
-            builder.RegisterType<StubEventBus>().As<IEventBus>().SingleInstance();
-            builder.RegisterType<ModuleStep>();
-            builder.RegisterSource(new EventsRegistrationSource());
-        }
-
-        [Test]
-        public void ExecuteRecipeStepTest() {
-            _folders.Manifests.Add("SuperWiki", @"
-Name: SuperWiki
-Version: 1.0.3
-OrchardVersion: 1
-Features:
-    SuperWiki: 
-        Description: My super wiki module for Orchard.
-");
-            _packagesInRepository.AddPublishedPackage(new PublishedPackage {
-                Id = "Orchard.Module.SuperWiki",
-                PackageType = DefaultExtensionTypes.Module,
-                Title = "SuperWiki",
-                Version = "1.0.3",
-                IsLatestVersion = true,
-            });
-
-            var shellDescriptorManager = _container.Resolve<IShellDescriptorManager>();
-            // No features enabled
-            shellDescriptorManager.UpdateShellDescriptor(
-                0,
-                Enumerable.Empty<ShellFeature>(),
-                Enumerable.Empty<ShellParameter>());
-
-            var moduleStep = _container.Resolve<ModuleStep>();
-            var recipeExecutionContext = new RecipeExecutionContext {RecipeStep = new RecipeStep(id: "1", recipeName: "Test", name: "Module", step: new XElement("SuperWiki")) };
-            recipeExecutionContext.RecipeStep.Step.Add(new XAttribute("packageId", "Orchard.Module.SuperWiki"));
-            recipeExecutionContext.RecipeStep.Step.Add(new XAttribute("repository", "test"));
-
-            var featureManager = _container.Resolve<IFeatureManager>();
-            var enabledFeatures = featureManager.GetEnabledFeatures();
-            Assert.That(enabledFeatures.Count(), Is.EqualTo(0));
-            moduleStep.Execute(recipeExecutionContext);
-
-
-            var availableFeatures = featureManager.GetAvailableFeatures().FirstOrDefault(x => x.Id == "SuperWiki");
-            Assert.That(availableFeatures.Id, Is.EqualTo("SuperWiki"));
-        }
-
-        [Test]
-        public void ExecuteRecipeStepNeedsNameTest() {
-            _folders.Manifests.Add("SuperWiki", @"
-Name: SuperWiki
-Version: 1.0.3
-OrchardVersion: 1
-Features:
-    SuperWiki: 
-        Description: My super wiki module for Orchard.
-");
-
-            var moduleStep = _container.Resolve<ModuleStep>();
-            var recipeContext = new RecipeContext { RecipeStep = new RecipeStep(id: "1", recipeName: "Test", name: "Module", step: new XElement("SuperWiki")) };
-            var recipeExecutionContext = new RecipeExecutionContext { RecipeStep = recipeContext.RecipeStep };
-            recipeContext.RecipeStep.Step.Add(new XAttribute("repository", "test"));
-
-            Assert.Throws(typeof (InvalidOperationException), () => moduleStep.Execute(recipeExecutionContext));
-        }
-
-        [Test]
-        public void ExecuteRecipeStepWithRepositoryAndVersionNotLatestTest() {
-            _packagesInRepository.AddPublishedPackage(new PublishedPackage {
-                Id = "Orchard.Module.SuperWiki",
-                PackageType = DefaultExtensionTypes.Module,
-                Title = "SuperWiki",
-                Version = "1.0.3",
-                IsLatestVersion = true,
-            });
-            _packagesInRepository.AddPublishedPackage(new PublishedPackage {
-                Id = "Orchard.Module.SuperWiki",
-                PackageType = DefaultExtensionTypes.Module,
-                Title = "SuperWiki",
-                Version = "1.0.2",
-                IsLatestVersion = false,
-            });
-
-            var moduleStep = _container.Resolve<ModuleStep>();
-            var recipeExecutionContext = new RecipeExecutionContext { RecipeStep = new RecipeStep(id: "1", recipeName: "Test", name: "Module", step: new XElement("SuperWiki")) };
-
-            recipeExecutionContext.RecipeStep.Step.Add(new XAttribute("packageId", "Orchard.Module.SuperWiki"));
-            recipeExecutionContext.RecipeStep.Step.Add(new XAttribute("repository", "test"));
-            recipeExecutionContext.RecipeStep.Step.Add(new XAttribute("version", "1.0.2"));
-
-            moduleStep.Execute(recipeExecutionContext);
-
-            var installedPackage = _packageManager.GetInstalledPackages().FirstOrDefault(info => info.ExtensionName == "Orchard.Module.SuperWiki");
-            Assert.That(installedPackage, Is.Not.Null);
-            Assert.That(installedPackage.ExtensionVersion, Is.EqualTo("1.0.2"));
-        }
-
-        internal class StubPackagingSourceManager : IPackagingSourceManager {
-            private readonly List<PublishedPackage> _publishedPackages = new List<PublishedPackage>();
-
-            public IEnumerable<PackagingSource> GetSources() {
-                return Enumerable.Empty<PackagingSource>();
-            }
-
-            public int AddSource(string feedTitle, string feedUrl) {
-                throw new NotImplementedException();
-            }
-
-            public void RemoveSource(int id) {
-                throw new NotImplementedException();
-            }
-
-            public IEnumerable<PackagingEntry> GetExtensionList(bool includeScreenshots, PackagingSource packagingSource = null, Func<IQueryable<PublishedPackage>, IQueryable<PublishedPackage>> query = null) {
-                return query(_publishedPackages.AsQueryable()).Select(package => CreatePackagingEntry(package));
-            }
-
-            public int GetExtensionCount(PackagingSource packagingSource = null, Func<IQueryable<PublishedPackage>, IQueryable<PublishedPackage>> query = null) {
-                throw new NotImplementedException();
-            }
-
-            public void AddPublishedPackage(PublishedPackage package) {
-                _publishedPackages.Add(package);
-            }
-
-            private static PackagingEntry CreatePackagingEntry(PublishedPackage package) {
-                return new PackagingEntry {
-                    PackageId = package.Id,
-                    Title = package.Title,
-                    Version = package.Version,
-                };
-            }
-        }
-
-        internal class StubPackageManager : IPackageManager {
-            private readonly IList<PackageInfo> _installedPackages = new List<PackageInfo>();
-
-            public IEnumerable<PackageInfo> GetInstalledPackages() {
-                return _installedPackages;
-            }
-
-            public PackageData Harvest(string extensionName) {
-                throw new NotImplementedException();
-            }
-
-            public PackageInfo Install(IPackage package, string location, string applicationPath) {
-                return null;
-            }
-
-            public PackageInfo Install(string packageId, string version, string location, string applicationPath) {
-                var package = new PackageInfo {
-                    ExtensionName = packageId,
-                    ExtensionVersion = version,
-                };
-                _installedPackages.Add(package);
-                return package;
-            }
-
-            public void Uninstall(string packageId, string applicationPath) {
-            }
-
-            public ExtensionDescriptor GetExtensionDescriptor(IPackage package, string extensionType) {
-                throw new NotImplementedException();
-            }
-        }
-
-        internal class StubDataMigrationManager : IDataMigrationManager {
-            public bool IsFeatureAlreadyInstalled(string feature) {
-                return true;
-            }
-
-            public IEnumerable<string> GetFeaturesThatNeedUpdate() {
-                return Enumerable.Empty<string>();
-            }
-
-            public void Update(string feature) {
-            }
-
-            public void Update(IEnumerable<string> features) {
-            }
-
-            public void Uninstall(string feature) {
-            }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+using Autofac;
+using NuGet;
+using NUnit.Framework;
+using Orchard.Caching;
+using Orchard.Core.Settings.Descriptor;
+using Orchard.Core.Settings.Descriptor.Records;
+using Orchard.Core.Settings.State;
+using Orchard.Data.Migration;
+using Orchard.Environment.Configuration;
+using Orchard.Environment.Descriptor;
+using Orchard.Environment.Descriptor.Models;
+using Orchard.Environment.Extensions;
+using Orchard.Environment.Extensions.Folders;
+using Orchard.Environment.Extensions.Models;
+using Orchard.Environment.Features;
+using Orchard.Environment.State;
+using Orchard.Events;
+using Orchard.Packaging.GalleryServer;
+using Orchard.Packaging.Models;
+using Orchard.Packaging.Services;
+using Orchard.Recipes.Models;
+using Orchard.Recipes.RecipeHandlers;
+using Orchard.Recipes.Services;
+using Orchard.Tests.Environment.Extensions;
+using Orchard.Tests.Environment.Features;
+using Orchard.Tests.Stubs;
+using IPackageManager = Orchard.Packaging.Services.IPackageManager;
+using Orchard.Tests.Modules.Recipes.Services;
+
+namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {
+    [TestFixture]
+    public class ModuleRecipeHandlerTest : DatabaseEnabledTestsBase {
+        private ExtensionManagerTests.StubFolders _folders;
+        private StubPackagingSourceManager _packagesInRepository;
+        private StubPackageManager _packageManager;
+
+        protected override IEnumerable<Type> DatabaseTypes {
+            get {
+                return new[] {
+                    typeof (ShellDescriptorRecord),
+                    typeof (ShellFeatureRecord),
+                    typeof (ShellParameterRecord),
+                };
+            }
+        }
+
+        public override void Register(ContainerBuilder builder) {
+            builder.RegisterInstance(new ShellSettings { Name = "Default" });
+
+            _folders = new ExtensionManagerTests.StubFolders();
+            _packagesInRepository = new StubPackagingSourceManager();
+            _packageManager = new StubPackageManager();
+            builder.RegisterInstance(_folders).As<IExtensionFolders>();
+            builder.RegisterType<ExtensionManager>().As<IExtensionManager>();
+            builder.RegisterType<FeatureManager>().As<IFeatureManager>();
+            builder.RegisterType<StubCacheManager>().As<ICacheManager>();
+            builder.RegisterType<StubParallelCacheContext>().As<IParallelCacheContext>();
+            builder.RegisterType<StubAsyncTokenProvider>().As<IAsyncTokenProvider>();
+            builder.RegisterType<ShellDescriptorManager>().As<IShellDescriptorManager>().SingleInstance();
+            builder.RegisterType<StubDataMigrationManager>().As<IDataMigrationManager>();
+            builder.RegisterInstance(_packagesInRepository).As<IPackagingSourceManager>();
+            builder.RegisterInstance(_packageManager).As<IPackageManager>();
+            builder.RegisterType<ShellStateManager>().As<IShellStateManager>().SingleInstance();
+            builder.RegisterType<StubEventBus>().As<IEventBus>().SingleInstance();
+            builder.RegisterType<ModuleRecipeHandler>();
+            builder.RegisterType<StubRecipeJournal>().As<IRecipeJournal>();
+            builder.RegisterSource(new EventsRegistrationSource());
+        }
+
+        [Test]
+        public void ExecuteRecipeStepTest() {
+            _folders.Manifests.Add("SuperWiki", @"
+Name: SuperWiki
+Version: 1.0.3
+OrchardVersion: 1
+Features:
+    SuperWiki: 
+        Description: My super wiki module for Orchard.
+");
+            _packagesInRepository.AddPublishedPackage(new PublishedPackage {
+                Id = "Orchard.Module.SuperWiki",
+                PackageType = DefaultExtensionTypes.Module,
+                Title = "SuperWiki",
+                Version = "1.0.3",
+                IsLatestVersion = true,
+            });
+
+            IShellDescriptorManager shellDescriptorManager = _container.Resolve<IShellDescriptorManager>();
+            // No features enabled
+            shellDescriptorManager.UpdateShellDescriptor(0,
+                                                         Enumerable.Empty<ShellFeature>(),
+                                                         Enumerable.Empty<ShellParameter>());
+
+            ModuleRecipeHandler moduleRecipeHandler = _container.Resolve<ModuleRecipeHandler>();
+
+            RecipeContext recipeContext = new RecipeContext { RecipeStep = new RecipeStep { Name = "Module", Step = new XElement("SuperWiki") } };
+            recipeContext.RecipeStep.Step.Add(new XAttribute("packageId", "Orchard.Module.SuperWiki"));
+            recipeContext.RecipeStep.Step.Add(new XAttribute("repository", "test"));
+
+            IFeatureManager featureManager = _container.Resolve<IFeatureManager>();
+            IEnumerable<FeatureDescriptor> enabledFeatures = featureManager.GetEnabledFeatures();
+            Assert.That(enabledFeatures.Count(), Is.EqualTo(0));
+            moduleRecipeHandler.ExecuteRecipeStep(recipeContext);
+
+
+            var availableFeatures = featureManager.GetAvailableFeatures().Where(x => x.Id == "SuperWiki").FirstOrDefault();
+            Assert.That(availableFeatures.Id, Is.EqualTo("SuperWiki"));
+            Assert.That(recipeContext.Executed, Is.True);
+        }
+
+        [Test]
+        public void ExecuteRecipeStepNeedsNameTest() {
+            _folders.Manifests.Add("SuperWiki", @"
+Name: SuperWiki
+Version: 1.0.3
+OrchardVersion: 1
+Features:
+    SuperWiki: 
+        Description: My super wiki module for Orchard.
+");
+
+            ModuleRecipeHandler moduleRecipeHandler = _container.Resolve<ModuleRecipeHandler>();
+
+            RecipeContext recipeContext = new RecipeContext { RecipeStep = new RecipeStep { Name = "Module", Step = new XElement("SuperWiki") } };
+            recipeContext.RecipeStep.Step.Add(new XAttribute("repository", "test"));
+
+            Assert.Throws(typeof (InvalidOperationException), () => moduleRecipeHandler.ExecuteRecipeStep(recipeContext));
+        }
+
+        [Test]
+        public void ExecuteRecipeStepWithRepositoryAndVersionNotLatestTest() {
+            _packagesInRepository.AddPublishedPackage(new PublishedPackage {
+                Id = "Orchard.Module.SuperWiki",
+                PackageType = DefaultExtensionTypes.Module,
+                Title = "SuperWiki",
+                Version = "1.0.3",
+                IsLatestVersion = true,
+            });
+            _packagesInRepository.AddPublishedPackage(new PublishedPackage {
+                Id = "Orchard.Module.SuperWiki",
+                PackageType = DefaultExtensionTypes.Module,
+                Title = "SuperWiki",
+                Version = "1.0.2",
+                IsLatestVersion = false,
+            });
+
+            ModuleRecipeHandler moduleRecipeHandler = _container.Resolve<ModuleRecipeHandler>();
+
+            RecipeContext recipeContext = new RecipeContext { RecipeStep = new RecipeStep { Name = "Module", Step = new XElement("SuperWiki") } };
+            recipeContext.RecipeStep.Step.Add(new XAttribute("packageId", "Orchard.Module.SuperWiki"));
+            recipeContext.RecipeStep.Step.Add(new XAttribute("repository", "test"));
+            recipeContext.RecipeStep.Step.Add(new XAttribute("version", "1.0.2"));
+
+            moduleRecipeHandler.ExecuteRecipeStep(recipeContext);
+
+            var installedPackage = _packageManager.GetInstalledPackages().FirstOrDefault(info => info.ExtensionName == "Orchard.Module.SuperWiki");
+            Assert.That(installedPackage, Is.Not.Null);
+            Assert.That(installedPackage.ExtensionVersion, Is.EqualTo("1.0.2"));
+            Assert.That(recipeContext.Executed, Is.True);
+        }
+
+        internal class StubPackagingSourceManager : IPackagingSourceManager {
+            private List<PublishedPackage> _publishedPackages = new List<PublishedPackage>();
+
+            public IEnumerable<PackagingSource> GetSources() {
+                return Enumerable.Empty<PackagingSource>();
+            }
+
+            public int AddSource(string feedTitle, string feedUrl) {
+                throw new NotImplementedException();
+            }
+
+            public void RemoveSource(int id) {
+                throw new NotImplementedException();
+            }
+
+            public IEnumerable<PackagingEntry> GetExtensionList(bool includeScreenshots, PackagingSource packagingSource = null, Func<IQueryable<PublishedPackage>, IQueryable<PublishedPackage>> query = null) {
+                return query(_publishedPackages.AsQueryable()).Select(package => CreatePackagingEntry(package));
+            }
+
+            public int GetExtensionCount(PackagingSource packagingSource = null, Func<IQueryable<PublishedPackage>, IQueryable<PublishedPackage>> query = null) {
+                throw new NotImplementedException();
+            }
+
+            public void AddPublishedPackage(PublishedPackage package) {
+                _publishedPackages.Add(package);
+            }
+
+            private static PackagingEntry CreatePackagingEntry(PublishedPackage package) {
+                return new PackagingEntry {
+                    PackageId = package.Id,
+                    Title = package.Title,
+                    Version = package.Version,
+                };
+            }
+        }
+
+        internal class StubPackageManager : IPackageManager {
+            private IList<PackageInfo> _installedPackages = new List<PackageInfo>();
+
+            public IEnumerable<PackageInfo> GetInstalledPackages() {
+                return _installedPackages;
+            }
+
+            public PackageData Harvest(string extensionName) {
+                throw new NotImplementedException();
+            }
+
+            public PackageInfo Install(IPackage package, string location, string applicationPath) {
+                return null;
+            }
+
+            public PackageInfo Install(string packageId, string version, string location, string applicationPath) {
+                var package = new PackageInfo {
+                    ExtensionName = packageId,
+                    ExtensionVersion = version,
+                };
+                _installedPackages.Add(package);
+                return package;
+            }
+
+            public void Uninstall(string packageId, string applicationPath) {
+            }
+
+            public ExtensionDescriptor GetExtensionDescriptor(IPackage package, string extensionType) {
+                throw new NotImplementedException();
+            }
+        }
+
+        internal class StubDataMigrationManager : IDataMigrationManager {
+            public bool IsFeatureAlreadyInstalled(string feature) {
+                return true;
+            }
+
+            public IEnumerable<string> GetFeaturesThatNeedUpdate() {
+                return Enumerable.Empty<string>();
+            }
+
+            public void Update(string feature) {
+            }
+
+            public void Update(IEnumerable<string> features) {
+            }
+
+            public void Uninstall(string feature) {
+            }
+        }
+    }
+}

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

@@ -1,57 +0,0 @@
-using System.Xml.Linq;
-using Autofac;
-using NUnit.Framework;
-using Orchard.Recipes.Models;
-using Orchard.Recipes.Providers.RecipeHandlers;
-using Orchard.Recipes.Services;
-using Orchard.Tests.Stubs;
-
-namespace Orchard.Tests.Modules.Recipes.RecipeHandlers {
-    [TestFixture]
-    public class RecipeExecutionStepHandlerTest {
-        protected IContainer _container;
-
-        [SetUp]
-        public void Init() {
-            var builder = new ContainerBuilder();
-            builder.RegisterType<RecipeExecutionLogger>().AsSelf();
-            builder.RegisterType<StubRecipeExecutionStep>().As<IRecipeExecutionStep>().AsSelf().SingleInstance();
-            builder.RegisterType<RecipeExecutionStepHandler>().SingleInstance();
-
-            _container = builder.Build();
-        }
-
-        [Test]
-        public void ExecuteRecipeExecutionStepHandlerTest() {
-            var handlerUnderTest = _container.Resolve<RecipeExecutionStepHandler>();
-            var fakeRecipeStep = _container.Resolve<StubRecipeExecutionStep>();
-
-            var context = new RecipeContext {
-                RecipeStep = new RecipeStep (id: "1", recipeName: "FakeRecipe",  name: "FakeRecipeStep", step: new XElement("FakeRecipeStep")),
-                ExecutionId = "12345"
-            };
-
-            handlerUnderTest.ExecuteRecipeStep(context);
-
-            Assert.That(fakeRecipeStep.IsExecuted, Is.True);
-            Assert.That(context.Executed, Is.True);
-        }
-    }
-
-    public class StubRecipeExecutionStep : RecipeExecutionStep {
-
-        public StubRecipeExecutionStep(
-            RecipeExecutionLogger logger) : base(logger) {
-        }
-
-        public override string Name {
-            get { return "FakeRecipeStep"; }
-        }
-
-        public bool IsExecuted { get; set; }
-
-        public override void Execute(RecipeExecutionContext context) {
-            IsExecuted = true;
-        }
-    }
-}