Adding Multi-Tenant Commands feature

For consistency with other services using Redis

.deployment

@@ -0,0 +1,3 @@
+[config]
+command = deploy.cmd
+SCM_COMMAND_IDLE_TIMEOUT = 3600

.gitignore

@@ -96,6 +96,7 @@ publish/
 
 # Publish Web Output
 *.Publish.xml
+*.pubxml
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
@@ -164,13 +165,14 @@ build/
 /buildtasks
 /artifacts
 *.sln.cache
-#src/Orchard.Web/Media/*
+src/Orchard.Web/Media/*
 log.xml
 profiling/
 *.orig
 src/Orchard.Web/Modules-temp/*
 src/Backup/*
 src/packages/*
+src/node_modules
 src/UpgradeLog.*
 *.itrace.csdef
 *.build.csdef
@@ -182,14 +184,7 @@ src/Orchard.Web/Orchard.Web.Publish.xml
 src/TestResults/*
 src/Orchard.Web/Properties/PublishProfiles
 src/Orchard.Azure/Orchard.Azure.CloudService/Staging/
-node_modules/
 
-# Enable all /lib artifacts
+#enable all /lib artifacts
 !lib/*/*.*
-
-# Enable version control of some IDeliverable specifics.
-src/Orchard.Web/Media/Default/RecipeJournal/*
-src/Orchard.Web/Media/Default/_Profiles/*
-
-# Enable "IDeliverable/Packaging/" folder.
-!src/IDeliverable/Packaging/*/*.*
+*/.vs/*

README.md

@@ -16,8 +16,8 @@ Our mission is to empower our users and foster a dedicated and diverse community
 There are many ways you can [contribute to Orchard](http://orchardproject.net/contribution): you can [fix bugs](https://github.com/OrchardCMS/Orchard/issues), contribute modules and themes to [our gallery](http://gallery.orchardproject.net/), [write documentation](https://github.com/OrchardCMS/OrchardDoc), [translate Orchard](http://orchardproject.net/localize), or answer questions [on our forums](http://orchard.codeplex.com/discussions) and [on Stack Overflow](http://stackoverflow.com/questions/tagged/orchardcms).
 
 ## Project Status
-Orchard is currently in version 1.8.1. We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach. 
-Our 1.8.1 release is available from our Downloads page, and is easy to [Install Orchard using the Web Platform Installer](http://www.orchardproject.net/docs/Installing-Orchard.ashx). We encourage interested developers to check out the source code on the Orchard Github site and get involved with the project.
+Orchard is currently in version 1.9.1. We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach. 
+Our 1.9.1 release is available from our Downloads page, and is easy to [Install Orchard using the Web Platform Installer](http://www.orchardproject.net/docs/Installing-Orchard.ashx). We encourage interested developers to check out the source code on the Orchard Github site and get involved with the project.
 
 * [Download the latest release](https://github.com/OrchardCMS/Orchard/releases)
 * [Feature roadmap](http://www.orchardproject.net/docs/feature-roadmap.ashx)

deploy.cmd

@@ -0,0 +1,114 @@
+@if "%SCM_TRACE_LEVEL%" NEQ "4" @echo off
+
+:: ----------------------
+:: KUDU Deployment Script
+:: Version: 0.1.11
+:: ----------------------
+
+:: Prerequisites
+:: -------------
+
+:: Verify node.js installed
+where node 2>nul >nul
+IF %ERRORLEVEL% NEQ 0 (
+  echo Missing node.js executable, please install node.js, if already installed make sure it can be reached from current environment.
+  goto error
+)
+
+:: Setup
+:: -----
+
+setlocal enabledelayedexpansion
+
+SET ARTIFACTS=%~dp0%..\artifacts
+
+IF NOT DEFINED DEPLOYMENT_SOURCE (
+  SET DEPLOYMENT_SOURCE=%~dp0%.
+)
+
+IF NOT DEFINED DEPLOYMENT_TARGET (
+  SET DEPLOYMENT_TARGET=%ARTIFACTS%\wwwroot
+)
+
+IF NOT DEFINED NEXT_MANIFEST_PATH (
+  SET NEXT_MANIFEST_PATH=%ARTIFACTS%\manifest
+
+  IF NOT DEFINED PREVIOUS_MANIFEST_PATH (
+    SET PREVIOUS_MANIFEST_PATH=%ARTIFACTS%\manifest
+  )
+)
+
+IF NOT DEFINED KUDU_SYNC_CMD (
+  :: Install kudu sync
+  echo Installing Kudu Sync
+  call npm install kudusync -g --silent
+  IF !ERRORLEVEL! NEQ 0 goto error
+
+  :: Locally just running "kuduSync" would also work
+  SET KUDU_SYNC_CMD=%appdata%\npm\kuduSync.cmd
+)
+IF NOT DEFINED DEPLOYMENT_TEMP (
+  SET DEPLOYMENT_TEMP=%temp%\___deployTemp%random%
+  SET CLEAN_LOCAL_DEPLOYMENT_TEMP=true
+)
+
+IF DEFINED CLEAN_LOCAL_DEPLOYMENT_TEMP (
+  IF EXIST "%DEPLOYMENT_TEMP%" rd /s /q "%DEPLOYMENT_TEMP%"
+  mkdir "%DEPLOYMENT_TEMP%"
+)
+
+IF NOT DEFINED MSBUILD_PATH (
+  SET MSBUILD_PATH=%WINDIR%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe
+)
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:: Deployment
+:: ----------
+
+echo Handling .NET Web Application deployment.
+
+:: 1. Restore NuGet packages
+IF /I "" NEQ "" (
+  call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\"
+  IF !ERRORLEVEL! NEQ 0 goto error
+)
+
+:: 2. Build to the temporary path
+call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Orchard.proj" /t:Precompiled /v:m
+IF !ERRORLEVEL! NEQ 0 goto error
+
+:: 3. KuduSync
+call :ExecuteCmd "%KUDU_SYNC_CMD%" -v 50 -f "%DEPLOYMENT_SOURCE%\build\Precompiled" -t "%DEPLOYMENT_TARGET%" -n "%NEXT_MANIFEST_PATH%" -p "%PREVIOUS_MANIFEST_PATH%" -i ".git;.hg;.deployment;deploy.cmd"
+IF !ERRORLEVEL! NEQ 0 goto error
+
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+:: Post deployment stub
+IF DEFINED POST_DEPLOYMENT_ACTION call "%POST_DEPLOYMENT_ACTION%"
+IF !ERRORLEVEL! NEQ 0 goto error
+
+goto end
+
+:: Execute command routine that will echo out when error
+:ExecuteCmd
+setlocal
+set _CMD_=%*
+call %_CMD_%
+if "%ERRORLEVEL%" NEQ "0" echo Failed exitCode=%ERRORLEVEL%, command=%_CMD_%
+exit /b %ERRORLEVEL%
+
+:error
+endlocal
+echo An error has occurred during web site deployment.
+call :exitSetErrorLevel
+call :exitFromFunction 2>nul
+
+:exitSetErrorLevel
+exit /b 1
+
+:exitFromFunction
+()
+
+:end
+endlocal
+echo Finished successfully.

src/Gulpfile.js

@@ -0,0 +1,165 @@
+var glob = require("glob"),
+    path = require("path-posix"),
+    merge = require("merge-stream"),
+    gulpif = require("gulp-if"),
+    gulp = require("gulp"),
+    newer = require("gulp-newer"),
+	plumber = require("gulp-plumber"),
+    sourcemaps = require("gulp-sourcemaps"),
+    less = require("gulp-less"),
+	autoprefixer = require("gulp-autoprefixer"),
+	minify = require("gulp-minify-css"),
+    typescript = require("gulp-typescript"),
+	uglify = require("gulp-uglify"),
+	rename = require("gulp-rename"),
+    concat = require("gulp-concat"),
+	header = require("gulp-header")
+
+/*
+** GULP TASKS
+*/
+
+// Incremental build (each asset group is built only if one or more inputs are newer than the output).
+gulp.task("build", function () {
+    var assetGroupTasks = getAssetGroups().map(function (assetGroup) {
+        var doRebuild = false;
+        return createAssetGroupTask(assetGroup, doRebuild);
+    });
+    return merge(assetGroupTasks);
+});
+
+// Full rebuild (all assets groups are built regardless of timestamps).
+gulp.task("rebuild", function () {
+    var assetGroupTasks = getAssetGroups().map(function (assetGroup) {
+        var doRebuild = true;
+        return createAssetGroupTask(assetGroup, doRebuild);
+    });
+    return merge(assetGroupTasks);
+});
+
+// Continuous watch (each asset group is built whenever one of its inputs changes).
+gulp.task("watch", function () {
+    getAssetGroups().forEach(function (assetGroup) {
+        gulp.watch(assetGroup.inputPaths, function (event) {
+            console.log("Asset file '" + event.path + "' was " + event.type + ", rebuilding output '" + assetGroup.outputPath + "'.");
+            var task = createAssetGroupTask(assetGroup);
+        });
+    });
+});
+
+/*
+** ASSET GROUPS
+*/
+
+function getAssetGroups() {
+    var assetManifestPaths = glob.sync("Orchard.Web/{Core,Modules,Themes}/*/Assets.json");
+    var assetGroups = [];
+    assetManifestPaths.forEach(function (assetManifestPath) {
+        var assetManifest = require("./" + assetManifestPath);
+        assetManifest.forEach(function (assetGroup) {
+            resolveAssetGroupPaths(assetGroup, assetManifestPath);
+            assetGroups.push(assetGroup);
+        });
+    });
+    return assetGroups;
+}
+
+function resolveAssetGroupPaths(assetGroup, assetManifestPath) {
+    assetGroup.basePath = path.dirname(assetManifestPath);
+    assetGroup.inputPaths = assetGroup.inputs.map(function (inputPath) {
+        return path.join(assetGroup.basePath, inputPath);
+    });
+    assetGroup.outputPath = path.join(assetGroup.basePath, assetGroup.output);
+    assetGroup.outputDir = path.dirname(assetGroup.outputPath);
+    assetGroup.outputFileName = path.basename(assetGroup.output);
+}
+
+function createAssetGroupTask(assetGroup, doRebuild) {
+    var outputExt = path.extname(assetGroup.output).toLowerCase();
+    switch (outputExt) {
+        case ".css":
+            return buildCssPipeline(assetGroup, doRebuild);
+        case ".js":
+            return buildJsPipeline(assetGroup, doRebuild);
+    }
+}
+
+/*
+** PROCESSING PIPELINES
+*/
+
+function buildCssPipeline(assetGroup, doRebuild) {
+    assetGroup.inputPaths.forEach(function (inputPath) {
+        var ext = path.extname(inputPath).toLowerCase();
+        if (ext !== ".less" && ext !== ".css")
+            throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'.";
+    });
+    var doConcat = path.basename(assetGroup.outputFileName, ".css") !== "@";
+    return gulp.src(assetGroup.inputPaths)
+        .pipe(gulpif(!doRebuild,
+            gulpif(doConcat,
+                newer(assetGroup.outputPath),
+                newer({
+                    dest: assetGroup.outputDir,
+                    ext: ".css"
+                }))))
+        .pipe(plumber())
+        .pipe(sourcemaps.init())
+        .pipe(gulpif("*.less", less()))
+        .pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
+        .pipe(autoprefixer({ browsers: ["last 2 versions"] }))
+        // TODO: Start using below whenever gulp-header supports sourcemaps.
+        //.pipe(header(
+        //    "/*\n" +
+        //    "** NOTE: This file is generated by Gulp compilation and should not be edited directly!\n" +
+        //    "** Any changes made directly to this file will be overwritten next time the Gulp compilation runs.\n" +
+        //    "** For more information, see the Readme.txt file in the Gulp solution folder.\n" +
+        //    "*/\n\n"))
+        .pipe(sourcemaps.write())
+        .pipe(gulp.dest(assetGroup.outputDir))
+        .pipe(minify())
+        .pipe(rename({
+            suffix: ".min"
+        }))
+        .pipe(gulp.dest(assetGroup.outputDir));
+}
+
+function buildJsPipeline(assetGroup, doRebuild) {
+    assetGroup.inputPaths.forEach(function (inputPath) {
+        var ext = path.extname(inputPath).toLowerCase();
+        if (ext !== ".ts" && ext !== ".js")
+            throw "Input file '" + inputPath + "' is not of a valid type for output file '" + assetGroup.outputPath + "'.";
+    });
+    var doConcat = path.basename(assetGroup.outputFileName, ".js") !== "@";
+    return gulp.src(assetGroup.inputPaths)
+        .pipe(gulpif(!doRebuild,
+            gulpif(doConcat,
+                newer(assetGroup.outputPath),
+                newer({
+                    dest: assetGroup.outputDir,
+                    ext: ".js"
+                }))))
+        .pipe(plumber())
+        .pipe(sourcemaps.init())
+        .pipe(gulpif("*.ts", typescript({
+            declaration: false,
+            //noImplicitAny: true,
+            noEmitOnError: true,
+            sortOutput: true,
+        }).js))
+		.pipe(gulpif(doConcat, concat(assetGroup.outputFileName)))
+        // TODO: Start using below whenever gulp-header supports sourcemaps.
+        //.pipe(header(
+        //    "/*\n" +
+        //    "** NOTE: This file is generated by Gulp compilation and should not be edited directly!\n" +
+        //    "** Any changes made directly to this file will be overwritten next time the Gulp compilation runs.\n" +
+        //    "** For more information, see the Readme.txt file in the Gulp solution folder.\n" +
+        //    "*/\n\n"))
+        .pipe(sourcemaps.write())
+        .pipe(gulp.dest(assetGroup.outputDir))
+		.pipe(uglify())
+		.pipe(rename({
+		    suffix: ".min"
+		}))
+		.pipe(gulp.dest(assetGroup.outputDir));
+}

src/IDeliverable/IDeliverable.Licensing.Orchard/IDeliverable.Licensing.Orchard.csproj

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F1467A6B-2397-447B-BE90-766D192EC3D9}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>IDeliverable.Licensing.Orchard</RootNamespace>
-    <AssemblyName>IDeliverable.Licensing.Orchard</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\autofac\Autofac.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Http, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\aspnetwebapi\System.Web.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ILicensedProductManifest.cs" />
-    <Compile Include="LicenseValidationControllerBase.cs" />
-    <Compile Include="LicenseValidationErrorBannerBase.cs" />
-    <Compile Include="LicenseValidationHelper.cs" />
-    <Compile Include="LicenseVerificationTokenStore.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="LicenseSettingsPartHandlerBase.cs" />
-    <Compile Include="LicenseSettingsPartBase.cs" />
-    <Compile Include="LicenseSettingsPartDriverBase.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\IDeliverable.Licensing\IDeliverable.Licensing.csproj">
-      <Project>{7e439cb7-1ace-435f-a8f3-5bb929423e34}</Project>
-      <Name>IDeliverable.Licensing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Orchard\Orchard.Framework.csproj">
-      <Project>{2d1d92bb-4555-4cbe-8d0e-63563d6ce4c6}</Project>
-      <Name>Orchard.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <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>
-  -->
-</Project>

src/IDeliverable/IDeliverable.Licensing.Orchard/ILicensedProductManifest.cs

@@ -1,14 +0,0 @@
-using Orchard;
-using Orchard.Logging;
-
-namespace IDeliverable.Licensing.Orchard
-{
-    public interface ILicensedProductManifest : IDependency
-    {
-        string ProductId { get; }
-        string ProductName { get; }
-        bool SkipValidationForLocalRequests { get; }
-        string LicenseKey { get; }
-        ILogger Logger { get; }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Orchard/LicenseSettingsPartBase.cs

@@ -1,13 +0,0 @@
-using Orchard.ContentManagement;
-
-namespace IDeliverable.Licensing.Orchard
-{
-    public abstract class LicenseSettingsPartBase : ContentPart
-    {
-        public string LicenseKey
-        {
-            get { return this.Retrieve(x => x.LicenseKey); }
-            set { this.Store(x => x.LicenseKey, value); }
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Orchard/LicenseSettingsPartDriverBase.cs

@@ -1,25 +0,0 @@
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Drivers;
-
-namespace IDeliverable.Licensing.Orchard
-{
-    public abstract class LicenseSettingsPartDriverBase<TPart> : ContentPartDriver<TPart> where TPart : LicenseSettingsPartBase, new()
-    {
-        protected abstract string EditorShapeName { get; }
-        protected abstract string EditorShapeTemplateName { get; }
-
-        protected override DriverResult Editor(TPart part, dynamic shapeHelper)
-        {
-            return Editor(part, null, shapeHelper);
-        }
-
-        protected override DriverResult Editor(TPart part, IUpdateModel updater, dynamic shapeHelper)
-        {
-            return ContentShape(EditorShapeName, () =>
-            {
-                updater?.TryUpdateModel(part, Prefix, null, null);
-                return shapeHelper.EditorTemplate(TemplateName: EditorShapeTemplateName, Prefix: Prefix, Model: part);
-            }).OnGroup("Licenses");
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Orchard/LicenseSettingsPartHandlerBase.cs

@@ -1,17 +0,0 @@
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Localization;
-
-namespace IDeliverable.Licensing.Orchard
-{
-    public abstract class LicenseSettingsPartHandlerBase<TPart> : ContentHandler where TPart : LicenseSettingsPartBase, new()
-    {
-        protected LicenseSettingsPartHandlerBase()
-        {
-            Filters.Add(new ActivatingFilter<TPart>("Site"));
-            OnGetContentItemMetadata<TPart>((context, part) => context.Metadata.EditorGroupInfo.Add(new GroupInfo(T("Licenses"))));
-        }
-
-        public Localizer T { get; set; } = NullLocalizer.Instance;
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Orchard/LicenseValidationControllerBase.cs

@@ -1,31 +0,0 @@
-using System.Web.Mvc;
-using Orchard.Localization;
-using Orchard.UI.Notify;
-using Orchard.Utility.Extensions;
-
-namespace IDeliverable.Licensing.Orchard
-{
-    public abstract class LicenseValidationControllerBase : Controller
-    {
-        protected LicenseValidationControllerBase(INotifier notifier)
-        {
-            Notifier = notifier;
-            T = NullLocalizer.Instance;
-        }
-
-        public Localizer T { get; set; }
-        protected INotifier Notifier { get; }
-        protected abstract string ProductId { get; }
-
-        public ActionResult VerifyLicenseKey()
-        {
-            LicenseValidationHelper.Instance.ClearLicenseValidationResult(ProductId);
-
-            if (LicenseValidationHelper.GetLicenseIsValid(ProductId))
-                Notifier.Information(T("License key succesfully validated."));
-
-            var urlReferrer = Request.UrlReferrer?.ToString();
-            return Redirect(Request.IsLocalUrl(urlReferrer) ? urlReferrer : "~/");
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Orchard/LicenseValidationErrorBannerBase.cs

@@ -1,68 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Web.Mvc;
-using IDeliverable.Licensing.Validation;
-using Orchard;
-using Orchard.Localization;
-using Orchard.Logging;
-using Orchard.UI.Admin.Notification;
-using Orchard.UI.Notify;
-
-namespace IDeliverable.Licensing.Orchard
-{
-    public abstract class LicenseValidationErrorBannerBase : Component, INotificationProvider
-    {
-        protected LicenseValidationErrorBannerBase(IEnumerable<ILicensedProductManifest> products, UrlHelper urlHelper, string productId)
-        {
-            mProducts = products;
-            mUrlHelper = urlHelper;
-            mProductId = productId;
-        }
-
-        private readonly IEnumerable<ILicensedProductManifest> mProducts;
-        private readonly UrlHelper mUrlHelper;
-        private readonly string mProductId;
-
-        public IEnumerable<NotifyEntry> GetNotifications()
-        {
-            var productManifest = mProducts.Single(x => x.ProductId == mProductId);
-            var licenseSettingsUrl = mUrlHelper.Action("Index", "Admin", new { area = "Settings", groupInfoId = "Licenses" });
-            var refreshResultUrl = mUrlHelper.Action("VerifyLicenseKey", "LicenseValidation", new { area = productManifest.ProductName });
-            var refreshResultLink = T("<a href=\"{0}\">Refresh</a>", refreshResultUrl);
-            LocalizedString message = null;
-
-            try
-            {
-                LicenseValidationHelper.EnsureLicenseIsValid(productManifest.ProductId);
-            }
-            catch (LicenseValidationException ex)
-            {
-                switch (ex.Error)
-                {
-                    case LicenseValidationError.UnknownLicenseKey:
-                        message = T("The <a href=\"{0}\">configured license key</a> for the {1} module is invalid. {2}", licenseSettingsUrl, productManifest.ProductName, refreshResultLink);
-                        break;
-                    case LicenseValidationError.HostnameMismatch:
-                        message = T("The <a href=\"{0}\">configured license key</a> for the {1} module is invalid for the current host name. {2}", licenseSettingsUrl, productManifest.ProductName, refreshResultLink);
-                        break;
-                    case LicenseValidationError.NoActiveSubscription:
-                        message = T("The <a href=\"{0}\">configured license key</a> for the {1} module has no active subscription. {2}", licenseSettingsUrl, productManifest.ProductName, refreshResultLink);
-                        break;
-                    case LicenseValidationError.TokenAgeValidationFailed:
-                    case LicenseValidationError.TokenSignatureValidationFailed:
-                    case LicenseValidationError.LicensingServiceError:
-                    case LicenseValidationError.LicensingServiceUnreachable:
-                    case LicenseValidationError.UnexpectedError:
-                    default:
-                        message = T("There was an error validating the <a href=\"{0}\">configured license key</a> for the {1} module. {2}", licenseSettingsUrl, productManifest.ProductName, refreshResultLink);
-                        break;
-                }
-
-                Logger.Warning(ex, "An error occurred while validating the configured license key for the {0} module. {1}", productManifest.ProductName, refreshResultLink);
-            }
-
-            if (message != null)
-                yield return new NotifyEntry { Message = message, Type = NotifyType.Warning };
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Orchard/LicenseValidationHelper.cs

@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using IDeliverable.Licensing.Validation;
-using IDeliverable.Licensing.VerificationTokens;
-using Orchard;
-using Orchard.Logging;
-using Orchard.FileSystems.AppData;
-
-namespace IDeliverable.Licensing.Orchard
-{
-    public class LicenseValidationHelper
-    {
-        public static bool GetLicenseIsValid(string productId)
-        {
-            try
-            {
-                EnsureLicenseIsValid(productId);
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        public static void EnsureLicenseIsValid(string productId)
-        {
-            Instance.ValidateLicense(productId);
-        }
-
-        public static LicenseValidationHelper Instance
-        {
-            get
-            {
-                var workContext = HttpContext.Current.Request.RequestContext.GetWorkContext();
-                var products = workContext.Resolve<IEnumerable<ILicensedProductManifest>>();
-                var appDataFolder = workContext.Resolve<IAppDataFolder>();
-                var instance = new LicenseValidationHelper(products, appDataFolder);
-
-                return instance;
-            }
-        }
-
-        private static readonly TimeSpan _validationResultCachedFor = TimeSpan.FromMinutes(5);
-
-        public LicenseValidationHelper(IEnumerable<ILicensedProductManifest> products, IAppDataFolder appDataFolder)
-        {
-            var tokenStore = new LicenseVerificationTokenStore(appDataFolder);
-            var tokenAccessor = new LicenseVerificationTokenAccessor(tokenStore);
-
-            mProducts = products;
-            mLicenseValidator = new LicenseValidator(tokenAccessor);
-            mCacheService = new CacheService();
-        }
-
-        private readonly IEnumerable<ILicensedProductManifest> mProducts;
-        private readonly LicenseValidator mLicenseValidator;
-        private readonly CacheService mCacheService;
-
-        public void ValidateLicense(string productId)
-        {
-            var productManifest = GetLicensedProductManifest(productId);
-            productManifest.Logger.Debug("Validating license for product '{0}'...", productId);
-
-            try
-            {
-                var cacheKey = ComputeCacheKey(productManifest);
-                mCacheService.GetValue(cacheKey, context =>
-                {
-                    context.ValidFor = _validationResultCachedFor;
-
-                    var options = LicenseValidationOptions.Default;
-                    if (productManifest.SkipValidationForLocalRequests)
-                        options = options | LicenseValidationOptions.SkipForLocalRequests;
-
-                    productManifest.Logger.Debug("Validation result not in cache. Invoking the license validator for product '{0}'...", productId);
-                    mLicenseValidator.ValidateLicense(productManifest.ProductId, productManifest.LicenseKey, options);
-
-                    return true;
-                });
-
-                productManifest.Logger.Debug("License successfully validated for product '{0}'.", productId);
-            }
-            catch (Exception ex)
-            {
-                productManifest.Logger.Error(ex, "An error occurred while validating the license for product '{0}'.", productId);
-                throw;
-            }
-        }
-
-        public void ClearLicenseValidationResult(string productId)
-        {
-            var productManifest = GetLicensedProductManifest(productId);
-            productManifest.Logger.Debug("Clearing license validation result for product '{0}'...", productId);
-
-            var cacheKey = ComputeCacheKey(productManifest);
-            mCacheService.RemoveValue(cacheKey);
-        }
-
-        private ILicensedProductManifest GetLicensedProductManifest(string productId)
-        {
-            return mProducts.Single(x => x.ProductId == productId);
-        }
-
-        private string ComputeCacheKey(ILicensedProductManifest productManifest)
-        {
-            return $"ValidateLicenseResult-{productManifest.ProductId}-{productManifest.LicenseKey}-{productManifest.SkipValidationForLocalRequests}";
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Orchard/LicenseVerificationTokenStore.cs

@@ -1,63 +0,0 @@
-using System;
-using IDeliverable.Licensing.VerificationTokens;
-using Orchard.FileSystems.AppData;
-using Orchard.Logging;
-
-namespace IDeliverable.Licensing.Orchard
-{
-    internal class LicenseVerificationTokenStore : ILicenseVerificationTokenStore
-    {
-        public LicenseVerificationTokenStore(IAppDataFolder appDataFolder)
-        {
-            mAppDataFolder = appDataFolder;
-        }
-
-        private readonly IAppDataFolder mAppDataFolder;
-
-        public LicenseVerificationToken Load(string productId)
-        {
-            var path = GetRelativeTokenFilePath(productId);
-            if (!mAppDataFolder.FileExists(path))
-                return null;
-
-            LicenseVerificationToken token = null;
-            var tokenBase64 = mAppDataFolder.ReadFile(path);
-
-            try
-            {
-                token = LicenseVerificationToken.FromBase64(tokenBase64);
-            }
-            catch
-            {
-                // An exception while parsing the token indicates somebody probably
-                // tampered with it or it got corrupted. In this case, let's clear out
-                // the store and return nothing.
-                Clear(productId);
-            }
-
-            return token;
-        }
-
-        public void Save(string productId, LicenseVerificationToken token)
-        {
-            Clear(productId);
-
-            var path = GetRelativeTokenFilePath(productId);
-
-            var tokenBase64 = token.ToBase64();
-            mAppDataFolder.CreateFile(path, tokenBase64);
-        }
-
-        public void Clear(string productId)
-        {
-            var path = GetRelativeTokenFilePath(productId);
-            if (mAppDataFolder.FileExists(path))
-                mAppDataFolder.DeleteFile(path);
-        }
-
-        private string GetRelativeTokenFilePath(string productId)
-        {
-            return $"IDeliverable.Licensing/{productId}.lic";
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Orchard/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("IDeliverable.Licensing.Orchard.Orchard")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("IDeliverable.Licensing.Orchard.Orchard")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("f1467a6b-2397-447b-be90-766d192ec3d9")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/IDeliverable/IDeliverable.Licensing.Service/ApiKeyAuthorizationAttribute.cs

@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http.Controllers;
-using System.Web.Http.Filters;
-
-namespace IDeliverable.Licensing.Service
-{
-    internal class ApiKeyAuthorizationAttribute : AuthorizationFilterAttribute
-	{
-		public override void OnAuthorization(HttpActionContext actionContext)
-		{
-            var values = new List<string>();
-
-            var paramsQuery =
-                from param in actionContext.Request.GetQueryNameValuePairs()
-                where String.Equals(param.Key, "ApiKey", StringComparison.OrdinalIgnoreCase)
-                select param.Value;
-            values.AddRange(paramsQuery.ToArray());
-
-            IEnumerable<string> headers;
-			actionContext.Request.Headers.TryGetValues("ApiKey", out headers);
-            if (headers != null)
-                values.AddRange(headers);
-
-			string apiKey = values != null ? values.FirstOrDefault() : null;
-
-			if (String.IsNullOrWhiteSpace(apiKey))
-				actionContext.Response = actionContext.ControllerContext.Request.CreateResponse(HttpStatusCode.Unauthorized);
-
-            var expectedApiKey = ConfigurationManager.AppSettings["ApiKey"];
-
-			if (apiKey != expectedApiKey)
-				actionContext.Response = actionContext.ControllerContext.Request.CreateResponse(HttpStatusCode.Unauthorized);
-		}
-	}
-}

src/IDeliverable/IDeliverable.Licensing.Service/App_Start/WebApiConfig.cs

@@ -1,24 +0,0 @@
-using System.Web.Http;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace IDeliverable.Licensing.Service
-{
-    internal static class WebApiConfig
-    {
-        public static void Register(HttpConfiguration config)
-        {
-            ConfigSerializationSettings(config);
-
-            config.MapHttpAttributeRoutes();
-            config.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always;
-        }
-
-        private static void ConfigSerializationSettings(HttpConfiguration config)
-        {
-            var jsonSetting = new JsonSerializerSettings();
-            jsonSetting.Converters.Add(new StringEnumConverter());
-            config.Formatters.JsonFormatter.SerializerSettings = jsonSetting;
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/ApplicationInsights.config

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings">
-    <!-- 
-    Learn more about Application Insights configuration with ApplicationInsights.config here: 
-    http://go.microsoft.com/fwlink/?LinkID=513840
-    
-    Note: If not present, please add <InstrumentationKey>Your Key</InstrumentationKey> to the top of this file.
-    -->
-    <TelemetryModules>
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing.DiagnosticsTelemetryModule, Microsoft.ApplicationInsights" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.PerfCollector.PerformanceCollectorModule, Microsoft.ApplicationInsights.Extensibility.PerfCollector">
-            <!--
-            Use the following syntax here to collect additional performance counters:
-      
-            <Counters>
-            <Add PerformanceCounter="\Process(??APP_WIN32_PROC??)\Handle Count" ReportAs="Process handle count" />
-            ...
-            </Counters>
-      
-            PerformanceCounter must be either \CategoryName(InstanceName)\CounterName or \CategoryName\CounterName
-      
-            Counter names may only contain letters, round brackets, forward slashes, hyphens, underscores, spaces and dots.
-            You may provide an optional ReportAs attribute which will be used as the metric name when reporting counter data.
-            For the purposes of reporting, metric names will be sanitized by removing all invalid characters from the resulting metric name.
-      
-            The following placeholders are supported as InstanceName:
-            ??APP_WIN32_PROC?? - instance name of the application process  for Win32 counters.
-            ??APP_W3SVC_PROC?? - instance name of the application IIS worker process for IIS/ASP.NET counters.
-            ??APP_CLR_PROC?? - instance name of the application CLR process for .NET counters.
-            -->
-        </Add>
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.RuntimeTelemetry.RemoteDependencyModule, Microsoft.ApplicationInsights.Extensibility.RuntimeTelemetry" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryModules.WebApplicationLifecycleModule, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryModules.WebRequestTrackingTelemetryModule, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryModules.WebExceptionTrackingTelemetryModule, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryModules.WebSessionTrackingTelemetryModule, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryModules.WebUserTrackingTelemetryModule, Microsoft.ApplicationInsights.Extensibility.Web" />
-    </TelemetryModules>
-    <TelemetryChannel Type="Microsoft.ApplicationInsights.Channel.PersistenceChannel, Microsoft.ApplicationInsights.PersistenceChannel" />
-    <ContextInitializers>
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.BuildInfoConfigComponentVersionContextInitializer, Microsoft.ApplicationInsights" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.DeviceContextInitializer, Microsoft.ApplicationInsights" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.ContextInitializers.AzureRoleEnvironmentContextInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.ContextInitializers.DomainNameRoleInstanceContextInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-    </ContextInitializers>
-    <TelemetryInitializers>
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryInitializers.WebSyntheticTelemetryInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryInitializers.WebClientIpHeaderTelemetryInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryInitializers.WebUserAgentTelemetryInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryInitializers.WebOperationNameTelemetryInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryInitializers.WebOperationIdTelemetryInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryInitializers.WebUserTelemetryInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-        <Add Type="Microsoft.ApplicationInsights.Extensibility.Web.TelemetryInitializers.WebSessionTelemetryInitializer, Microsoft.ApplicationInsights.Extensibility.Web" />
-    </TelemetryInitializers>
-    <!-- This key is for Application Insights resource 'ideliverable-licensing' in resource group 'Internal' -->
-    <InstrumentationKey>4af2a280-2e97-489d-be03-52ed20a87ae4</InstrumentationKey>
-</ApplicationInsights>

src/IDeliverable/IDeliverable.Licensing.Service/Controllers/LicenseController.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Configuration;
-using System.Net;
-using System.Net.Http;
-using System.Web.Http;
-using IDeliverable.Licensing.Service.Exceptions;
-using IDeliverable.Licensing.Service.Services;
-using IDeliverable.Licensing.VerificationTokens;
-
-namespace IDeliverable.Licensing.Service.Controllers
-{
-    [RoutePrefix("api/v1")]
-    public class LicenseController : ApiController
-    {
-        [HttpGet]
-        [Route("license/{licenseKey}/verify")]
-        [ApiKeyAuthorization]
-        public LicenseVerificationToken Verify(string licenseKey, int productId, string hostname)
-        {
-            var sendOwlApiEndpoint = ConfigurationManager.AppSettings["SendOwlApiEndpoint"];
-            var sendOwlApiKey = ConfigurationManager.AppSettings["SendOwlApiKey"];
-            var sendOwlApiSecret = ConfigurationManager.AppSettings["SendOwlApiSecret"];
-            var tokenSigningCertificateThumbprint = ConfigurationManager.AppSettings["TokenSigningCertificateThumbprint"];
-
-            var service = new LicenseService(sendOwlApiEndpoint, sendOwlApiKey, sendOwlApiSecret, tokenSigningCertificateThumbprint);
-
-            try
-            {
-                return service.VerifyLicense(licenseKey, productId, hostname);
-            }
-            catch (LicenseVerificationException ex)
-            {
-                switch (ex.Error)
-                {
-                    case LicenseVerificationError.UnknownLicenseKey:
-                        throw new HttpResponseException(new HttpResponseMessage(HttpStatusCode.NotFound) { ReasonPhrase = ex.Message });
-
-                    case LicenseVerificationError.HostnameMismatch:
-                        throw new HttpResponseException(new HttpResponseMessage(HttpStatusCode.Forbidden) { ReasonPhrase = ex.Message });
-
-                    case LicenseVerificationError.NoActiveSubscription:
-                        throw new HttpResponseException(new HttpResponseMessage(HttpStatusCode.Gone) { ReasonPhrase = ex.Message });
-
-                    default:
-                        throw;
-                }
-            }
-        }
-
-        [HttpGet]
-        [Route("test")]
-        [ApiKeyAuthorization]
-        public HttpResponseMessage Test()
-        {
-            var testProductId = ConfigurationManager.AppSettings["TestProductId"];
-            var testHostname = ConfigurationManager.AppSettings["TestHostname"];
-            var testKey = ConfigurationManager.AppSettings["TestKey"];
-
-            try
-            {
-                var token = Verify(testKey, Int32.Parse(testProductId), testHostname);
-            }
-            catch (Exception ex)
-            {
-                return new HttpResponseMessage(HttpStatusCode.InternalServerError) { ReasonPhrase = $"Verification for a supposedly valid license failed: {ex.Message}." };
-            }
-
-            return new HttpResponseMessage(HttpStatusCode.OK);
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/Exceptions/LicenseVerificationError.cs

@@ -1,10 +0,0 @@
-namespace IDeliverable.Licensing.Service.Exceptions
-{
-    internal enum LicenseVerificationError
-    {
-        UnknownLicenseKey,
-        NoActiveSubscription,
-        HostnameMismatch,
-        UnhandledException
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/Exceptions/LicenseVerificationException.cs

@@ -1,29 +0,0 @@
-using System;
-
-namespace IDeliverable.Licensing.Service.Exceptions
-{
-    internal class LicenseVerificationException : Exception
-    {
-        public LicenseVerificationException(LicenseVerificationError error)
-            :this("An error occurred while verifying the license.", error)
-        {
-        }
-
-        public LicenseVerificationException(string message, LicenseVerificationError error) : base(message)
-        {
-            Error = error;
-        }
-
-        public LicenseVerificationException(LicenseVerificationError error, Exception innerException)
-            : this("An error occurred while verifying the license.", error, innerException)
-        {
-        }
-
-        public LicenseVerificationException(string message, LicenseVerificationError error, Exception innerException) : base(message, innerException)
-        {
-            Error = error;
-        }
-
-        public LicenseVerificationError Error { get; private set; }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/Global.asax

@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="IDeliverable.Licensing.Service.WebApiApplication" Language="C#" %>

src/IDeliverable/IDeliverable.Licensing.Service/Global.asax.cs

@@ -1,14 +0,0 @@
-using System.Web.Http;
-using System.Web.Mvc;
-using System.Web.Routing;
-
-namespace IDeliverable.Licensing.Service
-{
-    public class WebApiApplication : System.Web.HttpApplication
-    {
-        protected void Application_Start()
-        {
-            GlobalConfiguration.Configure(WebApiConfig.Register);
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/IDeliverable.Licensing.Service.csproj

@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6014E7AC-C979-4D50-B8D9-5FD9DC8CA641}</ProjectGuid>
-    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>IDeliverable.Licensing.Service</RootNamespace>
-    <AssemblyName>IDeliverable.Licensing.Service</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <MvcBuildViews>false</MvcBuildViews>
-    <UseIISExpress>true</UseIISExpress>
-    <IISExpressSSLPort />
-    <IISExpressAnonymousAuthentication />
-    <IISExpressWindowsAuthentication />
-    <IISExpressUseClassicPipelineMode />
-    <UseGlobalApplicationHostFile>true</UseGlobalApplicationHostFile>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <ApplicationInsightsResourceId>/subscriptions/1788357e-d506-4118-9f88-092c1dcddc16/resourcegroups/Internal/providers/microsoft.insights/components/ideliverable-licensing</ApplicationInsightsResourceId>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.ApplicationInsights, Version=0.14.3.177, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.ApplicationInsights.0.14.3-build00177\lib\net40\Microsoft.ApplicationInsights.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.ApplicationInsights.Extensibility.PerfCollector, Version=0.14.3.185, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.ApplicationInsights.PerformanceCollector.0.14.3-build00177\lib\net40\Microsoft.ApplicationInsights.Extensibility.PerfCollector.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.ApplicationInsights.Extensibility.RuntimeTelemetry, Version=0.14.3.177, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.ApplicationInsights.RuntimeTelemetry.0.14.3-build00177\lib\net45\Microsoft.ApplicationInsights.Extensibility.RuntimeTelemetry.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.ApplicationInsights.Extensibility.Web, Version=0.14.3.177, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.ApplicationInsights.Web.0.14.3-build00177\lib\net45\Microsoft.ApplicationInsights.Extensibility.Web.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.ApplicationInsights.PersistenceChannel, Version=0.14.3.186, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.ApplicationInsights.PersistenceChannel.0.14.3-build00177\lib\net40\Microsoft.ApplicationInsights.PersistenceChannel.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Diagnostics.Instrumentation.Extensions.Intercept, Version=0.14.0.8007, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\lib\net40\Microsoft.Diagnostics.Instrumentation.Extensions.Intercept.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\lib\net45\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Threading.Tasks.Extensions.Desktop, Version=1.0.168.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure">
-      <HintPath>..\..\..\lib\aspnetmvc\Microsoft.Web.Infrastructure.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.Helpers">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.Razor">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Deployment">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.WebPages.Razor">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Abstractions" />
-    <Reference Include="System.Web.Routing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Net.Http">
-    </Reference>
-    <Reference Include="System.Net.Http.WebRequest">
-    </Reference>
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Compile Include="App_Start\WebApiConfig.cs" />
-    <Compile Include="ApiKeyAuthorizationAttribute.cs" />
-    <Compile Include="Controllers\LicenseController.cs" />
-    <Compile Include="Exceptions\LicenseVerificationError.cs" />
-    <Compile Include="Global.asax.cs">
-      <DependentUpon>Global.asax</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\LicenseInfo.cs" />
-    <Compile Include="Services\LicenseService.cs" />
-    <Compile Include="Exceptions\LicenseVerificationException.cs" />
-    <Compile Include="Services\OrderInfo.cs" />
-    <Compile Include="Services\OrderStatus.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Global.asax" />
-    <Content Include="packages.config" />
-    <Content Include="ApplicationInsights.config" />
-    <None Include="Properties\PublishProfiles\ideliverable-licensing.pubxml" />
-    <Content Include="Web.config">
-      <SubType>Designer</SubType>
-    </Content>
-    <Content Include="Web.Debug.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-    <Content Include="Web.Release.config">
-      <DependentUpon>Web.config</DependentUpon>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\IDeliverable.Licensing\IDeliverable.Licensing.csproj">
-      <Project>{7e439cb7-1ace-435f-a8f3-5bb929423e34}</Project>
-      <Name>IDeliverable.Licensing</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
-  <Target Name="MvcBuildViews" AfterTargets="AfterBuild" Condition="'$(MvcBuildViews)'=='true'">
-    <AspNetCompiler VirtualPath="temp" PhysicalPath="$(WebProjectOutputDir)" />
-  </Target>
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <UseIIS>True</UseIIS>
-          <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>56979</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:56979/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
-  <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
-    <Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
-    <Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
-  </Target>
-  <Import Project="..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets" Condition="Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\build\Microsoft.ApplicationInsights.Agent.Intercept.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\build\Microsoft.ApplicationInsights.Agent.Intercept.targets'))" />
-  </Target>
-  <Import Project="..\..\packages\Microsoft.ApplicationInsights.0.14.3-build00177\tools\net40\Microsoft.ApplicationInsights.targets" Condition="Exists('..\..\packages\Microsoft.ApplicationInsights.0.14.3-build00177\tools\net40\Microsoft.ApplicationInsights.targets')" />
-  <Target Name="EnsureApplicationInsightsImported" BeforeTargets="BeforeBuild" Condition="'$(ApplicationInsightsImported)' == ''">
-    <Error Condition="!Exists('..\..\packages\Microsoft.ApplicationInsights.0.14.3-build00177\tools\net40\Microsoft.ApplicationInsights.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." />
-    <Error Condition="Exists('..\..\packages\Microsoft.ApplicationInsights.0.14.3-build00177\tools\net40\Microsoft.ApplicationInsights.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." />
-  </Target>
-  <Import Project="..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\build\Microsoft.ApplicationInsights.Agent.Intercept.targets" Condition="Exists('..\..\packages\Microsoft.ApplicationInsights.Agent.Intercept.0.14.0-build08008\build\Microsoft.ApplicationInsights.Agent.Intercept.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> -->
-</Project>

src/IDeliverable/IDeliverable.Licensing.Service/Properties/AssemblyInfo.cs

@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("IDeliverable.Licensing.Service")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("IDeliverable.Licensing.Service")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c2a67b6c-4615-4ecf-bfc6-39bf0f975c1f")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/IDeliverable/IDeliverable.Licensing.Service/Services/LicenseInfo.cs

@@ -1,14 +0,0 @@
-namespace IDeliverable.Licensing.Service.Services
-{
-    internal class LicenseInfo
-    {
-        public LicenseInfo(string key, int orderId)
-        {
-            Key = key;
-            OrderId = orderId;
-        }
-
-        public string Key { get; }
-        public int OrderId { get; }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/Services/LicenseService.cs

@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using IDeliverable.Licensing.Service.Exceptions;
-using IDeliverable.Licensing.VerificationTokens;
-using Newtonsoft.Json.Linq;
-
-namespace IDeliverable.Licensing.Service.Services
-{
-    internal class LicenseService
-    {
-        public LicenseService(string sendOwlApiEndpoint, string sendOwlApiKey, string sendOwlApiSecret, string tokenSigningCertificateThumbprint)
-        {
-            mSendOwlApiEndpoint = sendOwlApiEndpoint;
-            mSendOwlApiKey = sendOwlApiKey;
-            mSendOwlApiSecret = sendOwlApiSecret;
-            mTokenSigningCertificateThumbprint = tokenSigningCertificateThumbprint;
-        }
-
-        private readonly string mSendOwlApiEndpoint;
-        private readonly string mSendOwlApiKey;
-        private readonly string mSendOwlApiSecret;
-        private readonly string mTokenSigningCertificateThumbprint;
-
-        public LicenseVerificationToken VerifyLicense(string licenseKey, int productId, string hostname)
-        {
-            try
-            {
-                using (var client = new HttpClient())
-                {
-                    client.BaseAddress = new Uri(mSendOwlApiEndpoint);
-                    client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", CreateBasicAuthenticationToken(mSendOwlApiKey, mSendOwlApiSecret));
-                    client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-                    var licenses = ParseLicenseInfo(client.GetAsync($"products/{productId}/licenses/check_valid?key={licenseKey}").Result.Content.ReadAsStringAsync().Result).ToList();
-
-                    if (!licenses.Any())
-                        throw new LicenseVerificationException($"No license with key '{licenseKey}' was found.", LicenseVerificationError.UnknownLicenseKey);
-
-                    var orderId = licenses.First(x => x.Key == licenseKey).OrderId;
-                    var order = ParseOrderInfo(client.GetAsync($"orders/{orderId}").Result.Content.ReadAsStringAsync().Result);
-
-                    if (!order.IsProductAccessAllowed)
-                        throw new LicenseVerificationException($"The license with key '{licenseKey}' is not associated with an active subscription.", LicenseVerificationError.NoActiveSubscription);
-
-                    if (!order.Hostnames.Contains(hostname, StringComparer.OrdinalIgnoreCase))
-                        throw new LicenseVerificationException($"The license with key '{licenseKey}' is not valid for the provided '{hostname}'. Valid hostnames are '{String.Join(",", order.Hostnames)}", LicenseVerificationError.HostnameMismatch);
-
-                    var token = CreateVerificationToken(productId, hostname, licenseKey);
-
-                    return token;
-                }
-            }
-            catch (Exception ex) when (!(ex is LicenseVerificationException))
-            {
-                throw new LicenseVerificationException(LicenseVerificationError.UnhandledException, ex);
-            }
-        }
-
-        private LicenseVerificationToken CreateVerificationToken(int productId, string hostname, string key)
-        {
-            X509Certificate2 signingCert = null;
-
-            // Try to find the certificate in either the CurrentUser or LocalMachine stores
-            // to maximize code portability.
-            signingCert = GetSigningCertificateFrom(StoreLocation.CurrentUser) ?? GetSigningCertificateFrom(StoreLocation.LocalMachine);
-            if (signingCert == null)
-                throw new Exception($"No certificate with thumbprint '{mTokenSigningCertificateThumbprint}' was found in the certificate store.");
-
-            var info = new LicenseVerificationInfo(productId, hostname, key, DateTime.UtcNow.Ticks);
-            var token = LicenseVerificationToken.Create(info, signingCert);
-
-            return token;
-        }
-
-        private X509Certificate2 GetSigningCertificateFrom(StoreLocation location)
-        {
-            var store = new X509Store(StoreName.My, location);
-            store.Open(OpenFlags.ReadOnly);
-
-            try
-            {
-                var certificates = store.Certificates.Find(X509FindType.FindByThumbprint, mTokenSigningCertificateThumbprint, validOnly: false);
-                return certificates.Count > 0 ? certificates[0] : null;
-            }
-            finally
-            {
-                store.Close();
-            }
-        }
-
-        private static string CreateBasicAuthenticationToken(string userName, string password)
-        {
-            return Convert.ToBase64String(Encoding.UTF8.GetBytes($"{userName}:{password}"), Base64FormattingOptions.None);
-        }
-
-        private static IEnumerable<LicenseInfo> ParseLicenseInfo(string json)
-        {
-            var licensesQuery =
-                from node in JArray.Parse(json)
-                select new LicenseInfo((string)node["license"]["key"], (int)node["license"]["order_id"]);
-
-            return licensesQuery.ToArray();
-        }
-
-        private OrderInfo ParseOrderInfo(string json)
-        {
-            var order = JObject.Parse(json)["order"];
-            var status = ReadOrderStatus(order);
-            var isAccessAllowed = (bool) order["access_allowed"];
-            var customFields = (JArray)order["order_custom_checkout_fields"];
-            var hostnames = new List<string>();
-
-            if (customFields.Count > 0)
-                hostnames.Add((string)customFields[0]["order_custom_checkout_field"]["value"]);
-
-            if (customFields.Count > 1)
-                hostnames.Add((string)customFields[1]["order_custom_checkout_field"]["value"]);
-
-            return new OrderInfo((int)order["id"], status, isAccessAllowed, hostnames);
-        }
-
-        private static OrderStatus ReadOrderStatus(JToken order)
-        {
-            var dictionary = new Dictionary<string, OrderStatus>
-            {
-                {"initial", OrderStatus.Initial },
-                {"payment_started", OrderStatus.PaymentStarted },
-                {"payment_pending", OrderStatus.PaymentPending },
-                {"failed", OrderStatus.Failed },
-                {"complete", OrderStatus.Complete },
-                {"chargeback", OrderStatus.Chargeback },
-                {"refunded", OrderStatus.Refunded },
-                {"in_dispute", OrderStatus.InDispute },
-                {"free", OrderStatus.Free },
-                {"imported", OrderStatus.Imported },
-                {"fraud_review", OrderStatus.FraudReview },
-                {"subscription_setup", OrderStatus.SubscriptionSetup },
-                {"subscription_active", OrderStatus.SubscriptionActive },
-                {"subscription_complete", OrderStatus.SubscriptionComplete },
-                {"subscription_cancelled", OrderStatus.SubscriptionCancelled }
-            };
-            var status = (string) order["state"];
-
-            return dictionary.ContainsKey(status) ? dictionary[status] : OrderStatus.Unknown;
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/Services/OrderInfo.cs

@@ -1,20 +0,0 @@
-using System.Collections.Generic;
-
-namespace IDeliverable.Licensing.Service.Services
-{
-    internal class OrderInfo
-    {
-        public OrderInfo(int orderId, OrderStatus status, bool isProductAccessAllowed, IEnumerable<string> hostnames)
-        {
-            OrderId = orderId;
-            Hostnames = hostnames;
-            Status = status;
-            IsProductAccessAllowed = isProductAccessAllowed;
-        }
-
-        public int OrderId { get; }
-        public IEnumerable<string> Hostnames { get; }
-        public OrderStatus Status { get; }
-        public bool IsProductAccessAllowed { get; }
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/Services/OrderStatus.cs

@@ -1,21 +0,0 @@
-namespace IDeliverable.Licensing.Service.Services {
-    internal enum OrderStatus
-    {
-        Unknown,
-        Initial,
-        PaymentStarted,
-        PaymentPending,
-        Failed,
-        Complete,
-        Chargeback,
-        Refunded,
-        InDispute,
-        Free,
-        Imported,
-        FraudReview,
-        SubscriptionSetup,
-        SubscriptionActive,
-        SubscriptionComplete,
-        SubscriptionCancelled,
-    }
-}

src/IDeliverable/IDeliverable.Licensing.Service/Web.Debug.config

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- For more information on using Web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=301874 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    In the example below, the "SetAttributes" transform will change the value of
-    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator
-    finds an attribute "name" that has a value of "MyDB".
-
-    <connectionStrings>
-      <add name="MyDB"
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <!--
-      In the example below, the "Replace" transform will replace the entire
-      <customErrors> section of your Web.config file.
-      Note that because there is only one customErrors section under the
-      <system.web> node, there is no need to use the "xdt:Locator" attribute.
-
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>

src/IDeliverable/IDeliverable.Licensing.Service/Web.Release.config

@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- For more information on using Web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=301874 -->
-
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <!--
-    In the example below, the "SetAttributes" transform will change the value of
-    "connectionString" to use "ReleaseSQLServer" only when the "Match" locator
-    finds an attribute "name" that has a value of "MyDB".
-
-    <connectionStrings>
-      <add name="MyDB"
-        connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
-        xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
-    </connectionStrings>
-  -->
-  <system.web>
-    <compilation xdt:Transform="RemoveAttributes(debug)" />
-    <!--
-      In the example below, the "Replace" transform will replace the entire
-      <customErrors> section of your Web.config file.
-      Note that because there is only one customErrors section under the
-      <system.web> node, there is no need to use the "xdt:Locator" attribute.
-
-      <customErrors defaultRedirect="GenericError.htm"
-        mode="RemoteOnly" xdt:Transform="Replace">
-        <error statusCode="500" redirect="InternalError.htm"/>
-      </customErrors>
-    -->
-  </system.web>
-</configuration>

src/IDeliverable/IDeliverable.Licensing.Service/Web.config

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    
-    <appSettings>
-        <!-- Below three settings can be overridden through the Azure portal. -->
-        <add key="ApiKey" value="MJb17j7YAzSjyEYkhsoI" />
-        <add key="TestProductId" value="233554" />
-        <add key="TestHostname" value="ideliverable.com" />
-        <add key="TestKey" value="ADB5-2D53-0A62-4C2F" />
-        <add key="SendOwlApiEndpoint" value="https://www.sendowl.com/api/v1/" />
-        <add key="SendOwlApiKey" value="14be9ee5e05222e" />
-        <add key="SendOwlApiSecret" value="1a10fe7987724e0a56a1" />
-        <add key="TokenSigningCertificateThumbprint" value="fa4746a778716109e7e80e1b8dc2ed2a2ba3b852" />
-    </appSettings>
-    
-    <system.web>
-        <compilation debug="true" targetFramework="4.5.2" />
-        <httpRuntime targetFramework="4.5.2" />
-        <httpModules>
-            <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Extensibility.Web.RequestTracking.WebRequestTrackingModule, Microsoft.ApplicationInsights.Extensibility.Web" />
-        </httpModules>
-    </system.web>
-    
-    <system.webServer>
-        <handlers>
-            <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
-            <remove name="OPTIONSVerbHandler" />
-            <remove name="TRACEVerbHandler" />
-            <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
-        </handlers>
-        <validation validateIntegratedModeConfiguration="false" />
-        <modules>
-            <remove name="ApplicationInsightsWebTracking" />
-            <add name="ApplicationInsightsWebTracking" type="Microsoft.ApplicationInsights.Extensibility.Web.RequestTracking.WebRequestTrackingModule, Microsoft.ApplicationInsights.Extensibility.Web" preCondition="managedHandler" />
-        </modules>
-    </system.webServer>
-    
-    <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-                <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
-    
-</configuration>

src/IDeliverable/IDeliverable.Licensing.Service/packages.config

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.ApplicationInsights" version="0.14.3-build00177" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.ApplicationInsights.Agent.Intercept" version="0.14.0-build08008" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.ApplicationInsights.JavaScript" version="0.11.0-build09387" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.ApplicationInsights.PerformanceCollector" version="0.14.3-build00177" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.ApplicationInsights.PersistenceChannel" version="0.14.3-build00177" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.ApplicationInsights.RuntimeTelemetry" version="0.14.3-build00177" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.ApplicationInsights.Web" version="0.14.3-build00177" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.AspNet.WebApi.HelpPage" version="5.2.3" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.Bcl" version="1.1.8" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.16-beta" targetFramework="net452" userInstalled="true" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" userInstalled="true" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" userInstalled="true" />
-</packages>

src/IDeliverable/IDeliverable.Licensing/CacheInvalidationContext.cs

@@ -1,11 +0,0 @@
-using System;
-using System.Web.Caching;
-
-namespace IDeliverable.Licensing
-{
-    public class CacheInvalidationContext
-    {
-        public CacheDependency CacheDependency { get; set; }
-        public TimeSpan? ValidFor { get; set; }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/CacheService.cs

@@ -1,52 +0,0 @@
-using System;
-using System.Web.Caching;
-
-namespace IDeliverable.Licensing
-{
-    public class CacheService
-    {
-        private readonly HttpContextAccessor mHttpContextAccessor = new HttpContextAccessor();
-
-        private Cache Cache => mHttpContextAccessor.Current().Cache;
-
-        public void SetValue<T>(string key, T value, CacheDependency dependency = null, TimeSpan? validFor = null)
-        {
-            var absoluteExpiration = validFor != null ? DateTime.UtcNow.Add(validFor.Value) : Cache.NoAbsoluteExpiration;
-            Cache.Insert(key, value, dependency, absoluteExpiration, Cache.NoSlidingExpiration);
-        }
-
-        public T GetValue<T>(string key, Func<CacheInvalidationContext, T> valueFactory = null)
-        {
-            var value = Cache.Get(key);
-            var exception = value as Exception;
-
-            if (exception != null)
-                throw (Exception)value;
-
-            if (value != null)
-                return (T)value;
-
-            if (valueFactory == null)
-                return default(T);
-
-            var context = new CacheInvalidationContext();
-
-            try
-            {
-                value = valueFactory(context);
-                SetValue(key, value, context.CacheDependency, context.ValidFor);
-                return (T) value;
-            }
-            catch (Exception ex)
-            {
-                SetValue(key, ex, context.CacheDependency, context.ValidFor);
-                throw;
-            }
-        }
-
-        public object RemoveValue(string key)
-        {
-            return Cache.Remove(key);
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/HttpContextAccessor.cs

@@ -1,12 +0,0 @@
-using System.Web;
-
-namespace IDeliverable.Licensing
-{
-    public class HttpContextAccessor
-    {
-        public HttpContextBase Current()
-        {
-            return new HttpContextWrapper(HttpContext.Current);
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/HttpRequestExtensions.cs

@@ -1,17 +0,0 @@
-using System.Web;
-
-namespace IDeliverable.Licensing
-{
-    internal static class HttpRequestExtensions
-    {
-        public static string GetHttpHost(this HttpRequestBase request)
-        {
-            var host = request.ServerVariables["HTTP_HOST"];
-
-            if (host?.Contains(":") == true)
-                host = host.Substring(0, host.IndexOf(':'));
-
-            return host;
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/IDeliverable.Licensing.csproj

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7E439CB7-1ACE-435F-A8F3-5BB929423E34}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>IDeliverable.Licensing</RootNamespace>
-    <AssemblyName>IDeliverable.Licensing</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\lib\newtonsoft.json\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CacheInvalidationContext.cs" />
-    <Compile Include="CacheService.cs" />
-    <Compile Include="HttpContextAccessor.cs" />
-    <Compile Include="HttpRequestExtensions.cs" />
-    <Compile Include="Validation\LicenseValidationError.cs" />
-    <Compile Include="Validation\LicenseValidationException.cs" />
-    <Compile Include="Validation\LicenseValidator.cs" />
-    <Compile Include="VerificationTokens\LicenseVerificationTokenError.cs" />
-    <Compile Include="VerificationTokens\LicenseVerificationTokenException.cs" />
-    <Compile Include="VerificationTokens\LicenseVerificationInfo.cs" />
-    <Compile Include="VerificationTokens\LicenseVerificationToken.cs" />
-    <Compile Include="VerificationTokens\LicenseVerificationTokenAccessor.cs" />
-    <Compile Include="VerificationTokens\LicensingServiceClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Validation\LicenseValidationOptions.cs" />
-    <Compile Include="VerificationTokens\ILicenseVerificationTokenStore.cs" />
-  </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>
-  -->
-</Project>

src/IDeliverable/IDeliverable.Licensing/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("IDeliverable.LicensingFramework")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("IDeliverable.LicensingFramework")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("7e439cb7-1ace-435f-a8f3-5bb929423e34")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/IDeliverable/IDeliverable.Licensing/Validation/LicenseValidationError.cs

@@ -1,14 +0,0 @@
-namespace IDeliverable.Licensing.Validation
-{
-    public enum LicenseValidationError
-    {
-        UnknownLicenseKey,
-        HostnameMismatch,
-        NoActiveSubscription,
-        LicensingServiceError,
-        LicensingServiceUnreachable,
-        TokenAgeValidationFailed,
-        TokenSignatureValidationFailed,
-        UnexpectedError,
-    }
-}

src/IDeliverable/IDeliverable.Licensing/Validation/LicenseValidationException.cs

@@ -1,29 +0,0 @@
-using System;
-
-namespace IDeliverable.Licensing.Validation
-{
-    public class LicenseValidationException : Exception
-    {
-        public LicenseValidationException(LicenseValidationError error)
-            :this("An error occurred while validating the license.", error)
-        {
-        }
-
-        public LicenseValidationException(string message, LicenseValidationError error) : base(message)
-        {
-            Error = error;
-        }
-
-        public LicenseValidationException(LicenseValidationError error, Exception innerException)
-            : this("An error occurred while validating the license.", error, innerException)
-        {
-        }
-
-        public LicenseValidationException(string message, LicenseValidationError error, Exception innerException) : base(message, innerException)
-        {
-            Error = error;
-        }
-
-        public LicenseValidationError Error { get; private set; }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/Validation/LicenseValidationOptions.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace IDeliverable.Licensing.Validation
-{
-    [Flags]
-    public enum LicenseValidationOptions
-    {
-        Default = 0,
-        SkipForLocalRequests = 1,
-        ForceRenewToken = 2,
-    }
-}

src/IDeliverable/IDeliverable.Licensing/Validation/LicenseValidator.cs

@@ -1,137 +0,0 @@
-using System;
-using System.Security.Cryptography.X509Certificates;
-using IDeliverable.Licensing.VerificationTokens;
-
-namespace IDeliverable.Licensing.Validation
-{
-    public class LicenseValidator
-    {
-        private static readonly TimeSpan sVerificationTokenValidFor = TimeSpan.FromDays(21);
-        private static readonly TimeSpan sAllowableClockSkew = TimeSpan.FromMinutes(10);
-
-        public LicenseValidator(LicenseVerificationTokenAccessor verificationTokenAccessor)
-        {
-            mHttpContextAccessor = new HttpContextAccessor();
-            mVerificationTokenAccessor = verificationTokenAccessor;
-        }
-
-        private readonly HttpContextAccessor mHttpContextAccessor;
-        private readonly LicenseVerificationTokenAccessor mVerificationTokenAccessor;
-
-        public void ValidateLicense(string productId, string licenseKey, LicenseValidationOptions options = LicenseValidationOptions.Default)
-        {
-            var request = mHttpContextAccessor.Current().Request;
-
-            var skipForLocalRequests = (options & LicenseValidationOptions.SkipForLocalRequests) == LicenseValidationOptions.SkipForLocalRequests;
-            if (request.IsLocal && skipForLocalRequests)
-                return;
-
-            LicenseVerificationToken token;
-
-            try
-            {
-                var forceRenewToken = (options & LicenseValidationOptions.ForceRenewToken) == LicenseValidationOptions.ForceRenewToken;
-                token = mVerificationTokenAccessor.GetLicenseVerificationToken(productId, licenseKey, request.GetHttpHost(), forceRenewToken);
-
-                // If the token we got back is too old to be considered valid anymore, try to get the token
-                // again, this time forcing token renewal.
-                if (token.Age > sVerificationTokenValidFor)
-                    token = mVerificationTokenAccessor.GetLicenseVerificationToken(productId, licenseKey, request.GetHttpHost(), forceRenew: true);
-            }
-            catch (LicenseVerificationTokenException ex)
-            {
-                var error = LicenseValidationError.UnexpectedError;
-
-                switch (ex.Error)
-                {
-                    case LicenseVerificationTokenError.UnknownLicenseKey:
-                        error = LicenseValidationError.UnknownLicenseKey;
-                        break;
-
-                    case LicenseVerificationTokenError.HostnameMismatch:
-                        error = LicenseValidationError.HostnameMismatch;
-                        break;
-
-                    case LicenseVerificationTokenError.NoActiveSubscription:
-                        error = LicenseValidationError.NoActiveSubscription;
-                        break;
-
-                    case LicenseVerificationTokenError.LicenseServiceError:
-                        error = LicenseValidationError.LicensingServiceError;
-                        break;
-
-                    case LicenseVerificationTokenError.LicenseServiceUnreachable:
-                        error = LicenseValidationError.LicensingServiceUnreachable;
-                        break;
-                }
-
-                throw new LicenseValidationException(ex.Message, error);
-            }
-            catch (Exception ex)
-            {
-                throw new LicenseValidationException("An unexpected error occurred while validating the license.", LicenseValidationError.UnexpectedError, ex);
-            }
-
-            // It should never happen that at this point we don't have a token or it's too old.
-            if (token == null || token.Age > sVerificationTokenValidFor)
-                throw new LicenseValidationException(LicenseValidationError.UnexpectedError);
-
-            // If the token age is negative by more than 10 minutes (allowable clock skew between licensing
-            // service and local machine) then this is a strong indication of an attempt to bypass license
-            // validation by changing the system clock.
-            if (token.Age < -sAllowableClockSkew)
-                throw new LicenseValidationException("The license verification token age is negative by more than the allowable clock skew. This might indicate that system clock of either the client or the licensing service is offset.", LicenseValidationError.TokenAgeValidationFailed);
-
-            var signingCertificate = GetSigningCertificate();
-            if (!token.GetSignatureIsValid(signingCertificate))
-                throw new LicenseValidationException("License verification token signature validation failed.", LicenseValidationError.TokenSignatureValidationFailed);
-        }
-
-        private static X509Certificate2 GetSigningCertificate()
-        {
-            const string certBase64 =
-@"MIIG0TCCBLmgAwIBAgIQ7qnUeLGos7hDPcw3o9G74jANBgkqhkiG9w0BAQ0FADCB
-ozELMAkGA1UEBhMCQ1kxETAPBgNVBAgTCExpbWFzc29sMREwDwYDVQQHEwhMaW1h
-c3NvbDEZMBcGA1UEChMQSURlbGl2ZXJhYmxlIEx0ZDETMBEGA1UECxMKT3BlcmF0
-aW9uczEYMBYGA1UEAxMPSURlbGl2ZXJhYmxlIENBMSQwIgYJKoZIhvcNAQkBFhVp
-bmZvQGlkZWxpdmVyYWJsZS5jb20wHhcNMTQxMjMxMjEwMDAwWhcNMjQxMjMxMjEw
-MDAwWjCBrjELMAkGA1UEBhMCQ1kxETAPBgNVBAgTCExpbWFzc29sMREwDwYDVQQH
-EwhMaW1hc3NvbDEZMBcGA1UEChMQSURlbGl2ZXJhYmxlIEx0ZDETMBEGA1UECxMK
-T3BlcmF0aW9uczEjMCEGA1UEAxMabGljZW5zaW5nLmlkZWxpdmVyYWJsZS5jb20x
-JDAiBgkqhkiG9w0BCQEWFWluZm9AaWRlbGl2ZXJhYmxlLmNvbTCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAJ0LddkeiE9f0p60exUCR1PxrKBHoVwF5von
-Lq+4GxA4I7Frtt8MV/dEYnYT44d/S6lEkAPLfF70CnyyWfpPO7MkIJYlFNZ2eJSz
-9wu0VZ12CZO9RilxrEzK1xLS+f6g7P+rPP3m1CqSt84wpd3YloLdBuB3HwPWNh5H
-a0Ew7W6IKyhzIX4MNzXXNc2evDIoaur3jQiPewtSastXzSQEEUx+S4St4qFbJ8lK
-v6pwC1BmqX37uoNURqqS1CWg3iKiAfzqtTIwt9vBu8C1ev4ZnlKmAF4C1fTuH3Wo
-X1lT+wpkycqWIUxoV7zoXYpxkleeNCw/GavDYmqhfU0qSjI4bdD/uy0s66dubtWB
-rCZ3VRC7mjHhmEWj1Y9GYvvg6Fjt/BchVMNEhIBd873MdXDqIx0cV6SILiQgudtr
-uvAUm5rT6KEYNSsHq9gQWN+LAgy8mDSOGLjYXdBtAOJMxS/w8XNA+bXWzvNYOl9q
-QO8w7Py3U/8mnLkxgHaVGktWazwQ1QkwaLyQz7lbTBedXkxOzP3LvLAe+POd4Zre
-wYcNUs/W51WfLup9o/IMEvDk/z0FCJ1fGFiHny3QFWrhJB3dAia1dwYtUpy42ZuY
-w4UQEuZVr3BzDCXudx6638WOURpvaMe/Enfdr2bcqvCYvzbT06RPD/VTtuKtZ8O7
-Q/hr0NvTAgMBAAGjgfMwgfAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwgdgGA1UdAQSB
-0DCBzYAQFBF2JL0Y1AduVxGNb4H7DqGBpjCBozELMAkGA1UEBhMCQ1kxETAPBgNV
-BAgTCExpbWFzc29sMREwDwYDVQQHEwhMaW1hc3NvbDEZMBcGA1UEChMQSURlbGl2
-ZXJhYmxlIEx0ZDETMBEGA1UECxMKT3BlcmF0aW9uczEYMBYGA1UEAxMPSURlbGl2
-ZXJhYmxlIENBMSQwIgYJKoZIhvcNAQkBFhVpbmZvQGlkZWxpdmVyYWJsZS5jb22C
-EMgq1WuLQwSJTj+ogMza3/YwDQYJKoZIhvcNAQENBQADggIBAEU9gdrydWT3ZwtA
-LP/HEct2DJRQdK9WuL02x2xbdmszyb8xoayTIcJdvs2WHPBqxM417XAhNTZuG3Aw
-Yx6OPSzbfmS1X7aVctSeBwZCfzxOk2MhTsKoZ+wjmFn6LVYz3P6K2deJVz6t+HRc
-mMwFrsctzgGZsxIvMXa0eqyDE6hhxj0XKYLFmYNGBdUd5sW68Ko26Njv1FPLkoqo
-Me2y+Gi6SltgjD/bmza36IRvaQVQtOjOxq+TncOBqLJ2+ikQOr93pkCgx3nso3CM
-YH1ryRpXbSAb5aA9sF0jb6LLLUgHv5q2ExpEFcoRja5gww5R2VKwEJ2PXjK+2O/A
-DgHOLKuiODxBF61+Ou/d29XiSX2HxCoH+onppi2h6ceJPcFwPrgzKVszsGkavtKL
-7myxufgdBUgTFxYMaTEtrU0yaRiJItxreH1wj/vl1zKyl25MXZLM1LyFvszAX49h
-9hgWApwE9hL1i6ygIfrpq2B+djPS8ZwX5S/t/QO5SmBjNLmw1GD1gHN5xqY0vMzS
-VxDXrH6Kllhwipu8GLeMWn/VmWWLy1vr//GoBjujhplIZHJPYBrYjqwfxH1ZLa4B
-O+N7bHDp63M0UVX5FdX1sN0laL29L1jXX/oe7x8PHNt3W4aOwVaIilh+/adXNDxr
-1yumH4G7QEeMQisiMhlPxnZJHajX";
-
-            var certBytes = Convert.FromBase64String(certBase64);
-            var cert = new X509Certificate2(certBytes);
-
-            return cert;
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/VerificationTokens/ILicenseVerificationTokenStore.cs

@@ -1,9 +0,0 @@
-namespace IDeliverable.Licensing.VerificationTokens
-{
-    public interface ILicenseVerificationTokenStore
-    {
-        LicenseVerificationToken Load(string productId);
-        void Save(string productId, LicenseVerificationToken token);
-        void Clear(string productId);
-    }
-}

src/IDeliverable/IDeliverable.Licensing/VerificationTokens/LicenseVerificationInfo.cs

@@ -1,36 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace IDeliverable.Licensing.VerificationTokens
-{
-    public class LicenseVerificationInfo
-    {
-        public LicenseVerificationInfo(int productId, string hostname, string licenseKey, long verifiedUtcTicks)
-        {
-            ProductId = productId;
-            Hostname = hostname;
-            LicenseKey = licenseKey;
-            VerifiedUtcTicks = verifiedUtcTicks;
-        }
-
-        public int ProductId { get; }
-        public string Hostname { get; }
-        public string LicenseKey { get; }
-        public long VerifiedUtcTicks { get; }
-
-        public DateTime VerifiedUtc => new DateTime(VerifiedUtcTicks, DateTimeKind.Utc);
-        public TimeSpan Age => DateTime.UtcNow - VerifiedUtc;
-
-        public override string ToString()
-        {
-            return JsonConvert.SerializeObject(
-                new
-                {
-                    ProductId,
-                    Hostname,
-                    LicenseKey,
-                    VerifiedUtcTicks
-                });
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/VerificationTokens/LicenseVerificationToken.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-
-namespace IDeliverable.Licensing.VerificationTokens
-{
-    public class LicenseVerificationToken
-    {
-        public static LicenseVerificationToken Create(LicenseVerificationInfo info, X509Certificate2 signingCert)
-        {
-            var infoString = info.ToString();
-            var infoBytes = Encoding.UTF8.GetBytes(infoString);
-            var privateKey = (RSACryptoServiceProvider)signingCert.PrivateKey;
-            var signatureBytes = privateKey.SignData(infoBytes, "md5");
-            var signature = Convert.ToBase64String(signatureBytes);
-
-            return new LicenseVerificationToken(info, signature);
-        }
-
-        public static LicenseVerificationToken FromBase64(string value)
-        {
-            var tokenBytes = Convert.FromBase64String(value);
-            var tokenJson = Encoding.UTF8.GetString(tokenBytes);
-            return Parse(tokenJson);
-        }
-
-        public static LicenseVerificationToken Parse(string value)
-        {
-            return JsonConvert.DeserializeObject<LicenseVerificationToken>(value, new StringEnumConverter());
-        }
-
-        public LicenseVerificationToken(LicenseVerificationInfo info, string signature)
-        {
-            if (info == null)
-                throw new ArgumentNullException(nameof(info), $"The parameter {nameof(info)} cannot be null.");
-
-            Info = info;
-            Signature = signature;
-        }
-
-        public LicenseVerificationInfo Info { get; }
-        public string Signature { get; }
-
-        public DateTime VerifiedUtc => Info.VerifiedUtc; // Delegated to Info because it needs to be included in signature.
-        public TimeSpan Age => Info.Age; // Delegated to Info because it needs to be included in signature.
-
-        public string ToBase64()
-        {
-            var tokenJson = ToString();
-            var tokenBytes = Encoding.UTF8.GetBytes(tokenJson);
-            return Convert.ToBase64String(tokenBytes);
-        }
-
-        public override string ToString()
-        {
-            return JsonConvert.SerializeObject(this);
-        }
-
-        public bool GetSignatureIsValid(X509Certificate2 signingCert)
-        {
-            var publicKey = (RSACryptoServiceProvider)signingCert.PublicKey.Key;
-            var infoBytes = Encoding.UTF8.GetBytes(Info.ToString());
-            var signatureBytes = Convert.FromBase64String(Signature);
-            var isValid = publicKey.VerifyData(infoBytes, "md5", signatureBytes);
-
-            return isValid;
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/VerificationTokens/LicenseVerificationTokenAccessor.cs

@@ -1,72 +0,0 @@
-using System;
-
-namespace IDeliverable.Licensing.VerificationTokens
-{
-    public class LicenseVerificationTokenAccessor
-    {
-        private static readonly TimeSpan sTokenRenewalInterval = TimeSpan.FromHours(48);
-
-        public LicenseVerificationTokenAccessor(ILicenseVerificationTokenStore store)
-        {
-            mStore = store;
-            mLicensingServiceClient = new LicensingServiceClient();
-        }
-
-        private readonly ILicenseVerificationTokenStore mStore;
-        private readonly LicensingServiceClient mLicensingServiceClient;
-
-        public LicenseVerificationToken GetLicenseVerificationToken(string productId, string licenseKey, string hostname, bool forceRenew = false)
-        {
-            var token = mStore.Load(productId);
-
-            // Delete the existing verification token from store if:
-            // * It was issued for a different license key OR
-            // * We are instructed by caller to force renewal
-            if (token != null && (token.Info.LicenseKey != licenseKey || forceRenew))
-            {
-                mStore.Clear(productId);
-                token = null;
-            }
-
-            // Try to renew verification token from licensing service if:
-            // * We don't have a token in store OR
-            // * The one we have has passed the token renewal interval
-            if (token == null || token.Age > sTokenRenewalInterval)
-            {
-                try
-                {
-                    token = mLicensingServiceClient.VerifyLicense(productId, licenseKey, hostname);
-                }
-                catch (Exception ex)
-                {
-                    // If the license key is reported by licensing service to be either invalid or for
-                    // a different hostname, we delete any existing token from store and throw unconditionally.
-                    if (ex is LicenseVerificationTokenException)
-                    {
-                        var lvtex = (LicenseVerificationTokenException)ex;
-                        if (lvtex.Error == LicenseVerificationTokenError.UnknownLicenseKey || 
-                            lvtex.Error == LicenseVerificationTokenError.HostnameMismatch ||
-                            lvtex.Error == LicenseVerificationTokenError.NoActiveSubscription)
-                        {
-                            mStore.Clear(productId);
-                            throw;
-                        }
-                    }
-                       
-                    // If we have an existing token from before, return it rather than throwing.
-                    if (token != null)
-                        return token;
-
-                    if (ex is LicenseVerificationTokenException)
-                        throw;
-
-                    throw new LicenseVerificationTokenException(LicenseVerificationTokenError.UnexpectedError, ex);
-                }
-
-                mStore.Save(productId, token);
-            }
-
-            return token;
-        }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/VerificationTokens/LicenseVerificationTokenError.cs

@@ -1,12 +0,0 @@
-namespace IDeliverable.Licensing.VerificationTokens
-{
-    public enum LicenseVerificationTokenError
-    {
-        UnknownLicenseKey,
-        HostnameMismatch,
-        NoActiveSubscription,
-        LicenseServiceError,
-        LicenseServiceUnreachable,
-        UnexpectedError
-    }
-}

src/IDeliverable/IDeliverable.Licensing/VerificationTokens/LicenseVerificationTokenException.cs

@@ -1,29 +0,0 @@
-using System;
-
-namespace IDeliverable.Licensing.VerificationTokens
-{
-    public class LicenseVerificationTokenException : Exception
-    {
-        public LicenseVerificationTokenException(LicenseVerificationTokenError error)
-            :this("An error occurred while getting a license verification token.", error)
-        {
-        }
-
-        public LicenseVerificationTokenException(string message, LicenseVerificationTokenError error) : base(message)
-        {
-            Error = error;
-        }
-
-        public LicenseVerificationTokenException(LicenseVerificationTokenError error, Exception innerException)
-            : this("An error occurred while getting a license verification token.", error, innerException)
-        {
-        }
-
-        public LicenseVerificationTokenException(string message, LicenseVerificationTokenError error, Exception innerException) : base(message, innerException)
-        {
-            Error = error;
-        }
-
-        public LicenseVerificationTokenError Error { get; private set; }
-    }
-}

src/IDeliverable/IDeliverable.Licensing/VerificationTokens/LicensingServiceClient.cs

@@ -1,73 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-
-namespace IDeliverable.Licensing.VerificationTokens
-{
-    public class LicensingServiceClient
-    {
-        // These are consciously hard coded (need to be obfuscated).
-        private static readonly string sLicensingServiceUrl = "https://licensing.ideliverable.com/api/v1/";
-        private static readonly string sLicensingServiceApiKey = "MJb17j7YAzSjyEYkhsoI";
-        private static readonly string sExpectedServerCertificateThumbprint = "fa4746a778716109e7e80e1b8dc2ed2a2ba3b852";
-
-        public LicenseVerificationToken VerifyLicense(string productId, string licenseKey, string hostname)
-        {
-            RemoteCertificateValidationCallback certValidationHandler = (sender, certificate, chain, errors) =>
-            {
-                // Accept the server certificate as long as it matches the expected thumbprint. This makes sure
-                // that the API call works even if the client host doesn't trust IDeliverable CA certificate, but
-                // fails if somebody is trying to spoof the service.
-                var serverCertThumbprint = ((X509Certificate2)certificate).Thumbprint;
-                return String.Equals(serverCertThumbprint, sExpectedServerCertificateThumbprint, StringComparison.OrdinalIgnoreCase);
-            };
-
-            using (var client = new HttpClient())
-            {
-                client.BaseAddress = new Uri(sLicensingServiceUrl);
-                client.DefaultRequestHeaders.Add("ApiKey", sLicensingServiceApiKey);
-                client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-                ServicePointManager.ServerCertificateValidationCallback += certValidationHandler;
-
-                try
-                {
-                    HttpResponseMessage response = null;
-
-                    try
-                    {
-                        response = client.GetAsync($"license/{licenseKey}/verify?productId={productId}&hostname={hostname}").Result;
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new LicenseVerificationTokenException("An error occurred while calling the licensing service.", LicenseVerificationTokenError.LicenseServiceUnreachable, ex);
-                    }
-
-                    if (response.StatusCode == HttpStatusCode.NotFound)
-                        throw new LicenseVerificationTokenException(response.ReasonPhrase, LicenseVerificationTokenError.UnknownLicenseKey);
-
-                    if (response.StatusCode == HttpStatusCode.Forbidden)
-                        throw new LicenseVerificationTokenException(response.ReasonPhrase, LicenseVerificationTokenError.HostnameMismatch);
-
-                    if (response.StatusCode == HttpStatusCode.Gone)
-                        throw new LicenseVerificationTokenException(response.ReasonPhrase, LicenseVerificationTokenError.NoActiveSubscription);
-
-                    if (!response.IsSuccessStatusCode)
-                        throw new LicenseVerificationTokenException(response.ReasonPhrase, LicenseVerificationTokenError.LicenseServiceError);
-
-                    var responseText = response.Content.ReadAsStringAsync().Result;
-                    var token = LicenseVerificationToken.Parse(responseText);
-
-                    return token;
-                }
-                finally
-                {
-                    ServicePointManager.ServerCertificateValidationCallback -= certValidationHandler;   
-                }
-            }
-        }
-    }
-}

src/IDeliverable/Packaging/Confuser/ConfuserEx.exe.config

@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Practices.ServiceLocation" publicKeyToken="31BF3856AD364E35"
-                          culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-    <loadFromRemoteSources enabled="true" />
-  </runtime>
-</configuration>

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

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

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

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

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

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

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

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

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

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

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

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

src/Orchard.Profile/Properties/AssemblyInfo.cs

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

src/Orchard.Specs/Bindings/WebAppHosting.cs

@@ -93,13 +93,14 @@ namespace Orchard.Specs.Bindings {
             _webHost = new WebHost(_orchardTemp);
             Host.Initialize(siteFolder, virtualDirectory ?? "/", _dynamicCompilationOption);
             var shuttle = new Shuttle();
-            Host.Execute(() => {
-                log4net.Config.BasicConfigurator.Configure(new CastleAppender());
-                HostingTraceListener.SetHook(msg => shuttle._sink.Receive(msg));
-            });
+            Host.Execute(() => Executor(shuttle));
             _messages = shuttle._sink;
         }
 
+        private static void Executor(Shuttle shuttle) {
+            HostingTraceListener.SetHook(msg => shuttle._sink.Receive(msg));
+        }
+
         private class CastleAppender : IAppender {
             public void Close() { }
             public string Name { get; set; }

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

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

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

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

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

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

src/Orchard.Specs/Hosting/SerializableDelegate.cs

@@ -68,7 +68,7 @@ namespace Orchard.Specs.Hosting {
                 TargetInstance = Activator.CreateInstance(classType);
 
                 foreach (FieldInfo field in classType.GetFields()) {
-                    if (typeof (Delegate).IsAssignableFrom(field.FieldType))
+                    if (typeof (TDelegate).IsAssignableFrom(field.FieldType))
                         //If the field is a delegate
                         field.SetValue(TargetInstance, ((SerializableDelegate<TDelegate>)info.GetValue(field.Name, typeof(SerializableDelegate<TDelegate>))).Delegate);
                     else if (!field.FieldType.IsSerializable)
@@ -86,8 +86,12 @@ namespace Orchard.Specs.Hosting {
 
                 foreach (FieldInfo field in targetType.GetFields()) {
                     //See corresponding comments above
-                    if (typeof (Delegate).IsAssignableFrom(field.FieldType))
-                        info.AddValue(field.Name, new SerializableDelegate<TDelegate>((TDelegate)field.GetValue(TargetInstance)));
+                    if (typeof (TDelegate).IsAssignableFrom(field.FieldType)) {
+                        var value = (TDelegate)field.GetValue(TargetInstance);
+                        if (value != null) {
+                            info.AddValue(field.Name, new SerializableDelegate<TDelegate>(value));
+                        }
+                    }
                     else if (!field.FieldType.IsSerializable)
                         info.AddValue(field.Name, new AnonymousClassWrapper(field.FieldType, field.GetValue(TargetInstance)));
                     else

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

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

src/Orchard.Specs/Properties/AssemblyInfo.cs

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

src/Orchard.Tests.Modules/App.config

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

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

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

src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs

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

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

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

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

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

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

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