Updating Orchard.Tests.ContentManagement.HqlExpressionTests.ShouldSortRandomly to decrease failure chance due to randomness

Adding workflow to run specflow tests as a nightly build
Revert "Testing the branch strategy matrix concept to be used for the nightly build"
2026-02-09 09:16:41 +08:00 · 2024-03-08 11:41:17 +01:00 · 2024-03-08 11:03:02 +01:00 · 2024-03-08 10:57:07 +01:00 · 2024-03-08 10:49:36 +01:00 · 2024-03-08 10:49:08 +01:00
381 changed files with 50335 additions and 42588 deletions
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -10,61 +10,25 @@ on:
      - 1.10.x

 jobs:
-  compile-dotnet:
-    name: Compile .NET solution
+  compile:
+    name: Compile
    defaults:
      run:
        shell: pwsh
    runs-on: windows-latest
+
    steps:
      - name: Clone repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

      - name: Restore NuGet packages
        run: nuget restore src/Orchard.sln

      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0

      - name: Compile
-        run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:MvcBuildViews=true /p:TreatWarningsAsErrors=true -WarnAsError
+        run: msbuild Orchard.proj /m /t:Compile /p:MvcBuildViews=true /p:TreatWarningsAsErrors=true -WarnAsError

      - name: Test
-        run: msbuild Orchard.proj /m /v:minimal /t:Test
-
-  compile-node:
-    name: Compile client-side assets
-    defaults:
-      run:
-        shell: pwsh
-    runs-on: windows-latest
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v4.1.1
-
-      - name: Setup NodeJS
-        uses: actions/setup-node@v4.0.2
-        with:
-          node-version: '7'
-
-      - name: Setup NPM packages
-        working-directory: ./src
-        run: |
-          npm install --loglevel warn
-
-          # Install gulp globally to be able to run the rebuild task, using the same version as in the project.
-          $gulpVersion = (Get-Content Package.json -Raw | ConvertFrom-Json).devDependencies.gulp
-          Start-Process npm -NoNewWindow -Wait -ArgumentList "install gulp@$gulpVersion -g --loglevel warn"
-
-      - name: Rebuild client-side assets
-        working-directory: ./src
-        run: |
-          gulp rebuild
-
-          git add . # To make line ending changes "disappear".
-          $gitStatus = (git status --porcelain)
-          if ($gitStatus)
-          {
-            throw ("Client-side assets are not up-to-date. Please run 'gulp rebuild' and commit the changes.`n" +
-              [System.String]::Join([System.Environment]::NewLine, $gitStatus))
-          }
+        run: msbuild Orchard.proj /m /t:Test
--- a/.github/workflows/specflow.yml
+++ b/.github/workflows/specflow.yml
@@ -30,10 +30,10 @@ jobs:
        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0

      - name: Compile
-        run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:MvcBuildViews=true /p:TreatWarningsAsErrors=true -WarnAsError
+        run: msbuild Orchard.proj /m /t:Compile /p:MvcBuildViews=true /p:TreatWarningsAsErrors=true -WarnAsError

      - name: Test
-        run: msbuild Orchard.proj /m /v:minimal /t:Test
+        run: msbuild Orchard.proj /m /t:Test

      - name: Spec
-        run: msbuild Orchard.proj /m /v:minimal /t:Spec
+        run: msbuild Orchard.proj /m /t:Spec
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
-**/.vs/**
-src/Rebracer.xml

 # User-specific files
 *.suo
@@ -192,3 +190,5 @@ src/Orchard.Azure/Orchard.Azure.CloudService/Staging/

 #enable all /lib artifacts
 !lib/**/*.*
+**/.vs/*
+src/Rebracer.xml
--- a/ClickToBuild.cmd
+++ b/ClickToBuild.cmd
@@ -3,18 +3,36 @@
 REM Necessary for the InstallDir variable to work inside the MsBuild-finding loop below.
 SETLOCAL ENABLEDELAYEDEXPANSION

-for /f "usebackq tokens=1* delims=: " %%i in (`lib\vswhere\vswhere -latest -version "[16.0,18.0)" -requires Microsoft.Component.MSBuild`) do (
+for /f "usebackq tokens=1* delims=: " %%i in (`lib\vswhere\vswhere -latest -version "[15.0,17.0)" -requires Microsoft.Component.MSBuild`) do (
  if /i "%%i"=="installationPath" (
 	set InstallDir=%%j
 	echo !InstallDir!
+	if exist "!InstallDir!\MSBuild\15.0\Bin\MSBuild.exe" (
+		echo "Using MSBuild from Visual Studio 2017"
+		set msbuild="!InstallDir!\MSBuild\15.0\Bin\MSBuild.exe"
+		goto build
+	)
 	if exist "!InstallDir!\MSBuild\Current\Bin\MSBuild.exe" (
-		echo "Using MSBuild from !InstallDir!"
+		echo "Using MSBuild from Visual Studio 2019"
 		set msbuild="!InstallDir!\MSBuild\Current\Bin\MSBuild.exe"
 		goto build
 	)
  )
 )

+FOR %%b in (
+       "%VS140COMNTOOLS%\vsvars32.bat"
+       "%VS120COMNTOOLS%\vsvars32.bat"
+       "%VS110COMNTOOLS%\vsvars32.bat"
+    ) do (
+    if exist %%b ( 
+		echo "Using MSBuild from %%b"
+		call %%b
+		set msbuild="msbuild"
+		goto build
+    )
+)
+
 echo "Unable to detect suitable environment. Build may not succeed."

 :build
--- a/Orchard.proj
+++ b/Orchard.proj
@@ -113,26 +113,30 @@
  </Target>
  
  <Target Name="Compile">
-    <CallTarget Targets="DevCompile"/>
    <!-- Compile to "OutputFolder" -->
    <MSBuild
      Projects="$(Solution)"
      Targets="Build"
-      Properties="Configuration=$(Configuration);OutputPath=$(CompileFolder)" />
-  </Target>
-  
-  <Target Name="DevCompile">
-    <!-- To make sure that Roslyn tools are available, since it's included with Orchard.Web, which is not referenced by
-    other projects, so it will be built towards the end. -->
-    <MSBuild
-      Projects="$(OrchardWebFolder)\Orchard.Web.csproj"
-      Targets="CopyRoslynCompilerFilesToOutputDirectory" />
+      Properties="Configuration=$(Configuration);OutputPath=$(CompileFolder);MvcBuildViews=false" />
    <!-- Compile to "regular" output folder for devs using VS locally -->
    <MSBuild
      Projects="$(Solution)"
      Targets="Build"
      Properties="Configuration=$(Configuration);MvcBuildViews=$(MvcBuildViews)" />
  </Target>
+  
+  <Target Name="BuildViews">
+    <!-- To make sure that Roslyn tools are available, even if the Compile task was not called before this. -->
+    <MSBuild
+      Projects="$(OrchardWebFolder)\Orchard.Web.csproj"
+      Targets="CopyRoslynFilesToOutputFolder"
+      Properties="Configuration=$(Configuration)" />
+    <!-- The actual compilation with views also compiled. -->
+    <MSBuild
+      Projects="$(Solution)"
+      Targets="Build"
+      Properties="Configuration=$(Configuration);MvcBuildViews=true" />
+  </Target>

  <Target Name="CompileMsBuildTasks">
    <MSBuild
@@ -191,6 +195,7 @@
      <Stage-Media Include="$(SrcFolder)\Orchard.Web\Media\OrchardLogo.png" />
      <Stage-PoFiles Include="$(SrcFolder)\Orchard.Web\**\*.po" />
      <Stage-Core Include="$(WebSitesFolder)\Orchard.Core\**\*" Exclude="$(WebSitesFolder)\Orchard.Core\**\bin\**\*" />
+      <Stage-Roslyn Include="$(SrcFolder)\Orchard.Web\bin\roslyn\*" />
     
      <!-- Get list of module names from the module definition files within ModulesSrcFolder -->
      <Stage-Modules-Definitions Include="$(ModulesSrcFolder)\**\Module.txt" />
@@ -232,7 +237,7 @@

    <!-- Copying module binaries is somewhat tricky: From a module "bin" directory, we
         only want to include the files that are _not_ already present in 
-         the "Orchard.Web\Bin" folder. -->
+         the "Orchard.Web\Bin" folder (except for "Orchard.Web\bin\roslyn"). -->
    <FilterModuleBinaries
      ModulesBinaries="@(Stage-Modules-Binaries)"
      OrchardWebBinaries="@(Stage-Orchard-Web-Bins)">
@@ -262,6 +267,7 @@
    <Copy SourceFiles="@(Stage-Themes-Custom)" DestinationFiles="@(Stage-Themes-Custom->'$(StageFolder)\Themes\%(ThemeName)\%(RecursiveDir)%(Filename)%(Extension)')"/>
    <Copy SourceFiles="@(Stage-Themes-Binaries-Unique)" DestinationFiles="@(Stage-Themes-Binaries-Unique->'$(StageFolder)\Themes\%(ThemeName)\%(RecursiveDir)%(Filename)%(Extension)')"/>
    <Copy SourceFiles="@(Stage-Themes-Sources)" DestinationFolder="$(StageFolder)\Themes\%(RecursiveDir)"/>
+    <Copy SourceFiles="@(Stage-Roslyn)" DestinationFolder="$(StageFolder)\bin\roslyn"/>

    <MakeDir Directories="$(StageFolder)\App_Data"/>
    <WriteLinesToFile File="$(StageFolder)\App_Data\_marker.txt" Lines="some_text" Overwrite="true"/>
--- a/lib/nuget/nuget.exe
+++ b/lib/nuget/nuget.exe
--- a/src/Gulpfile.js
+++ b/src/Gulpfile.js
@@ -222,7 +222,7 @@ function buildJsPipeline(assetGroup, doConcat, doRebuild) {
    // Source maps are useless if neither concatenating nor transpiling.
    if ((!doConcat || assetGroup.inputPaths.length < 2) && !assetGroup.inputPaths.some(function (inputPath) { return path.extname(inputPath).toLowerCase() === ".ts"; }))
        generateSourceMaps = false;
-    var typeScriptOptions = { allowJs: true, noImplicitAny: true, noEmitOnError: true, module: 'amd' };
+    var typeScriptOptions = { allowJs: true, noImplicitAny: true, noEmitOnError: true };
    if (assetGroup.typeScriptOptions)
        typeScriptOptions = Object.assign(typeScriptOptions, assetGroup.typeScriptOptions); // Merge override options from asset group if any.
    if (doConcat)
--- a/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
+++ b/src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
@@ -11,7 +11,6 @@
    <RootNamespace>Orchard.Azure.Tests</RootNamespace>
    <AssemblyName>Orchard.Azure.Tests</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -42,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -52,6 +52,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
--- a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
+++ b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs
@@ -20,7 +20,6 @@ using Orchard.Core.Feeds.StandardBuilders;
 using Orchard.Tests.Modules;
 using Orchard.Tests.Stubs;
 using Orchard.Core.Title.Models;
-using Orchard.Services;

 namespace Orchard.Core.Tests.Feeds.Controllers {
    [TestFixture]
@@ -178,7 +177,6 @@ namespace Orchard.Core.Tests.Feeds.Controllers {
            builder.RegisterInstance(mockContentManager.Object).As<IContentManager>();
            builder.RegisterType<RssFeedBuilder>().As<IFeedBuilderProvider>();
            builder.RegisterType<CorePartsFeedItemBuilder>().As<IFeedItemBuilder>();
-            builder.RegisterType<HtmlFilterProcessor>().As<IHtmlFilterProcessor>();
            builder.RegisterInstance(query).As<IFeedQueryProvider>();
            var container = builder.Build();

--- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
+++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj
@@ -11,7 +11,6 @@
    <RootNamespace>Orchard.Core.Tests</RootNamespace>
    <AssemblyName>Orchard.Core.Tests</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -42,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
@@ -53,6 +53,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
--- a/src/Orchard.Profile/Orchard.Profile.csproj
+++ b/src/Orchard.Profile/Orchard.Profile.csproj
@@ -11,7 +11,6 @@
    <RootNamespace>Orchard.Profile</RootNamespace>
    <AssemblyName>Orchard.Profile</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -42,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
@@ -53,6 +53,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
--- a/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config
+++ b/src/Orchard.Specs/Hosting/Orchard.Web/Core/Web.config
@@ -4,9 +4,10 @@
        <add key="webpages:Enabled" value="false" />
        <add key="aspnet:RoslynCompilerLocation" value="..\bin\roslyn" />
    </appSettings>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <system.codedom>
        <compilers>
-            <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:latest" />
        </compilers>
    </system.codedom>
    <system.web>
--- a/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config
+++ b/src/Orchard.Specs/Hosting/Orchard.Web/Themes/Web.config
@@ -4,9 +4,10 @@
        <add key="webpages:Enabled" value="false" />
        <add key="aspnet:RoslynCompilerLocation" value="..\bin\roslyn" />
    </appSettings>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <system.codedom>
        <compilers>
-            <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:latest" />
        </compilers>
    </system.codedom>
    <system.web>
--- a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config
+++ b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config
@@ -37,7 +37,7 @@
    <!-- Registering Roslyn as a compiler for Dynamic Compilation. -->
    <system.codedom>
        <compilers>
-            <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:latest" />
        </compilers>
    </system.codedom>
  <system.web>
--- a/src/Orchard.Specs/Orchard.Specs.csproj
+++ b/src/Orchard.Specs/Orchard.Specs.csproj
@@ -11,7 +11,6 @@
    <RootNamespace>Orchard.Specs</RootNamespace>
    <AssemblyName>Orchard.Specs</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -42,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
@@ -53,6 +53,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
--- a/src/Orchard.Tests.Modules/Email/EmailChannelTests.cs
+++ b/src/Orchard.Tests.Modules/Email/EmailChannelTests.cs
@@ -1,9 +1,15 @@
 using System.Collections.Generic;
 using Autofac;
+using Moq;
 using NUnit.Framework;
+using Orchard.ContentManagement.Records;
 using Orchard.DisplayManagement;
+using Orchard.Email.Services;
+using Orchard.Messaging.Events;
 using Orchard.Messaging.Services;
+using Orchard.Tests.Messaging;
 using Orchard.Tests.Modules.Stubs;
+using Orchard.Tests.Utility;

 namespace Orchard.Tests.Modules.Email {
    [TestFixture]
@@ -24,10 +30,10 @@ namespace Orchard.Tests.Modules.Email {
            var container = builder.Build();
            _messageService = container.Resolve<IMessageService>();
        }
-
+    
        [Test]
        public void CanSendEmailUsingAddresses() {
-            _messageService.Send("Email", new Dictionary<string, object>() { { "", null } });
+            _messageService.Send("Email", new Dictionary<string, object>() { {"", null} });
            Assert.That(_smtpChannel.Processed, Is.Not.Null);
        }

--- a/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
+++ b/src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj
@@ -11,7 +11,6 @@
    <RootNamespace>Orchard.Tests.Modules</RootNamespace>
    <AssemblyName>Orchard.Tests.Modules</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -42,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
@@ -53,6 +53,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
@@ -76,6 +77,9 @@
    <Reference Include="FluentPath, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Orchard.FluentPath.1.0.0.1\lib\FluentPath.dll</HintPath>
    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
    <Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
      <HintPath>..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll</HintPath>
    </Reference>
--- a/src/Orchard.Tests.Modules/Packaging/Services/Hello.World.csproj.txt
+++ b/src/Orchard.Tests.Modules/Packaging/Services/Hello.World.csproj.txt
@@ -13,6 +13,7 @@
    <RootNamespace>Hello.World</RootNamespace>
    <AssemblyName>Hello.World</AssemblyName>
    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <MvcBuildViews>false</MvcBuildViews>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
--- a/src/Orchard.Tests.Modules/packages.config
+++ b/src/Orchard.Tests.Modules/packages.config
@@ -20,4 +20,5 @@
  <package id="Orchard.NuGet.Core" version="1.1.0.0" targetFramework="net48" />
  <package id="Remotion.Linq" version="2.2.0" targetFramework="net48" />
  <package id="Remotion.Linq.EagerFetching" version="2.2.0" targetFramework="net48" />
+  <package id="SharpZipLib" version="1.3.1" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Tests/ContentManagement/XmlHelperTests.cs
+++ b/src/Orchard.Tests/ContentManagement/XmlHelperTests.cs
@@ -7,8 +7,6 @@ using Orchard.ContentManagement;
 namespace Orchard.Tests.ContentManagement {
    [TestFixture]
    public class XmlHelperTests {
-        private const string _testGuidString = "98f3dc0a-01c3-4975-bd52-1b4f5a678d73";
-
        [Test]
        public void AddEl() {
            var el = new XElement("data");
@@ -86,14 +84,6 @@ namespace Orchard.Tests.ContentManagement {
            Assert.That(el.Attribute("foo").Value, Is.EqualTo("1970-05-21T13:55:21.934Z"));
        }

-        [Test]
-        public void GuidToAttribute() {
-            var el = new XElement("data");
-            el.Attr("guid", new Guid(_testGuidString));
-
-            Assert.That(el.Attribute("guid").Value, Is.EqualTo(_testGuidString));
-        }
-
        [Test]
        public void DoubleFloatDecimalToAttribute() {
            var el = new XElement("data");
@@ -160,14 +150,6 @@ namespace Orchard.Tests.ContentManagement {
            Assert.That(el.Element("decimal").Value, Is.EqualTo("12.458"));
        }

-        [Test]
-        public void GuidToElement() {
-            var el = new XElement("data");
-            el.El("guid", new Guid(_testGuidString));
-
-            Assert.That(el.Element("guid").Value, Is.EqualTo(_testGuidString));
-        }
-
        [Test]
        public void ReadElement() {
            var el = XElement.Parse("<data><foo>bar</foo></data>");
@@ -186,14 +168,12 @@ namespace Orchard.Tests.ContentManagement {
                ADouble = 12.345D,
                AFloat = 23.456F,
                ADecimal = 34.567M,
-                AGuid = new Guid(_testGuidString),
                ANullableInt = 42,
                ANullableBoolean = true,
                ANullableDate = new DateTime(1970, 5, 21, 13, 55, 21, 934, DateTimeKind.Utc),
                ANullableDouble = 12.345D,
                ANullableFloat = 23.456F,
-                ANullableDecimal = 34.567M,
-                ANullableGuid = new Guid(_testGuidString)
+                ANullableDecimal = 34.567M
            };
            var el = new XElement("data");
            el.With(target)
@@ -204,14 +184,12 @@ namespace Orchard.Tests.ContentManagement {
                .ToAttr(t => t.ADouble)
                .ToAttr(t => t.AFloat)
                .ToAttr(t => t.ADecimal)
-                .ToAttr(t => t.AGuid)
                .ToAttr(t => t.ANullableInt)
                .ToAttr(t => t.ANullableBoolean)
                .ToAttr(t => t.ANullableDate)
                .ToAttr(t => t.ANullableDouble)
                .ToAttr(t => t.ANullableFloat)
-                .ToAttr(t => t.ANullableDecimal)
-                .ToAttr(t => t.ANullableGuid);
+                .ToAttr(t => t.ANullableDecimal);


            Assert.That(el.Attr("AString"), Is.EqualTo("foo"));
@@ -221,14 +199,12 @@ namespace Orchard.Tests.ContentManagement {
            Assert.That(el.Attr("ADouble"), Is.EqualTo("12.345"));
            Assert.That(el.Attr("AFloat"), Is.EqualTo("23.456"));
            Assert.That(el.Attr("ADecimal"), Is.EqualTo("34.567"));
-            Assert.That(el.Attr("AGuid"), Is.EqualTo(_testGuidString));
            Assert.That(el.Attr("ANullableInt"), Is.EqualTo("42"));
            Assert.That(el.Attr("ANullableBoolean"), Is.EqualTo("true"));
            Assert.That(el.Attr("ANullableDate"), Is.EqualTo("1970-05-21T13:55:21.934Z"));
            Assert.That(el.Attr("ANullableDouble"), Is.EqualTo("12.345"));
            Assert.That(el.Attr("ANullableFloat"), Is.EqualTo("23.456"));
            Assert.That(el.Attr("ANullableDecimal"), Is.EqualTo("34.567"));
-            Assert.That(el.Attr("ANullableGuid"), Is.EqualTo(_testGuidString));
        }

        [Test]
@@ -238,10 +214,10 @@ namespace Orchard.Tests.ContentManagement {
                XElement.Parse(
                    "<data AString=\"foo\" AnInt=\"42\" ABoolean=\"true\" " +
                    "ADate=\"1970-05-21T13:55:21.934Z\" ADouble=\"12.345\" " +
-                    $"AFloat=\"23.456\" ADecimal=\"34.567\" AGuid=\"{_testGuidString}\" " +
+                    "AFloat=\"23.456\" ADecimal=\"34.567\" " +
                    "ANullableInt=\"42\" ANullableBoolean=\"true\" " +
                    "ANullableDate=\"1970-05-21T13:55:21.934Z\" ANullableDouble=\"12.345\" " +
-                    $"ANullableFloat=\"23.456\" ANullableDecimal=\"34.567\" ANullableGuid=\"{_testGuidString}\"/>");
+                    "ANullableFloat=\"23.456\" ANullableDecimal=\"34.567\"/>");
            el.With(target)
                .FromAttr(t => t.AString)
                .FromAttr(t => t.AnInt)
@@ -250,14 +226,12 @@ namespace Orchard.Tests.ContentManagement {
                .FromAttr(t => t.ADouble)
                .FromAttr(t => t.AFloat)
                .FromAttr(t => t.ADecimal)
-                .FromAttr(t => t.AGuid)
                .FromAttr(t => t.ANullableInt)
                .FromAttr(t => t.ANullableBoolean)
                .FromAttr(t => t.ANullableDate)
                .FromAttr(t => t.ANullableDouble)
                .FromAttr(t => t.ANullableFloat)
-                .FromAttr(t => t.ANullableDecimal)
-                .FromAttr(t => t.ANullableGuid);
+                .FromAttr(t => t.ANullableDecimal);

            Assert.That(target.AString, Is.EqualTo("foo"));
            Assert.That(target.AnInt, Is.EqualTo(42));
@@ -266,14 +240,12 @@ namespace Orchard.Tests.ContentManagement {
            Assert.That(target.ADouble, Is.EqualTo(12.345D));
            Assert.That(target.AFloat, Is.EqualTo(23.456F));
            Assert.That(target.ADecimal, Is.EqualTo(34.567M));
-            Assert.That(target.AGuid, Is.EqualTo(new Guid(_testGuidString)));
            Assert.That(target.ANullableInt, Is.EqualTo(42));
            Assert.That(target.ANullableBoolean, Is.True);
            Assert.That(target.ANullableDate, Is.EqualTo(new DateTime(1970, 5, 21, 13, 55, 21, 934, DateTimeKind.Utc)));
            Assert.That(target.ANullableDouble, Is.EqualTo(12.345D));
            Assert.That(target.ANullableFloat, Is.EqualTo(23.456F));
            Assert.That(target.ANullableDecimal, Is.EqualTo(34.567M));
-            Assert.That(target.ANullableGuid, Is.EqualTo(new Guid(_testGuidString)));
        }

        [Test]
@@ -286,14 +258,12 @@ namespace Orchard.Tests.ContentManagement {
                ADouble = 12.345D,
                AFloat = 23.456F,
                ADecimal = 34.567M,
-                AGuid = new Guid(_testGuidString),
                ANullableInt = 42,
                ANullableBoolean = true,
                ANullableDate = new DateTime(1970, 5, 21, 13, 55, 21, 934, DateTimeKind.Utc),
                ANullableDouble = 12.345D,
                ANullableFloat = 23.456F,
-                ANullableDecimal = 34.567M,
-                ANullableGuid = new Guid(_testGuidString)
+                ANullableDecimal = 34.567M
            };
            var el = new XElement("data");
            el.With(target)
@@ -304,14 +274,12 @@ namespace Orchard.Tests.ContentManagement {
                .FromAttr(t => t.ADouble)
                .FromAttr(t => t.AFloat)
                .FromAttr(t => t.ADecimal)
-                .FromAttr(t => t.AGuid)
                .FromAttr(t => t.ANullableInt)
                .FromAttr(t => t.ANullableBoolean)
                .FromAttr(t => t.ANullableDate)
                .FromAttr(t => t.ANullableDouble)
                .FromAttr(t => t.ANullableFloat)
-                .FromAttr(t => t.ANullableDecimal)
-                .FromAttr(t => t.ANullableGuid);
+                .FromAttr(t => t.ANullableDecimal);

            Assert.That(target.AString, Is.EqualTo("foo"));
            Assert.That(target.AnInt, Is.EqualTo(42));
@@ -320,14 +288,12 @@ namespace Orchard.Tests.ContentManagement {
            Assert.That(target.ADouble, Is.EqualTo(12.345D));
            Assert.That(target.AFloat, Is.EqualTo(23.456F));
            Assert.That(target.ADecimal, Is.EqualTo(34.567M));
-            Assert.That(target.AGuid, Is.EqualTo(new Guid(_testGuidString)));
            Assert.That(target.ANullableInt, Is.EqualTo(42));
            Assert.That(target.ANullableBoolean, Is.True);
            Assert.That(target.ANullableDate, Is.EqualTo(new DateTime(1970, 5, 21, 13, 55, 21, 934, DateTimeKind.Utc)));
            Assert.That(target.ANullableDouble, Is.EqualTo(12.345D));
            Assert.That(target.ANullableFloat, Is.EqualTo(23.456F));
            Assert.That(target.ANullableDecimal, Is.EqualTo(34.567M));
-            Assert.That(target.ANullableGuid, Is.EqualTo(new Guid(_testGuidString)));
        }

        [Test]
@@ -373,8 +339,7 @@ namespace Orchard.Tests.ContentManagement {
                .ToAttr(t => t.ANullableDate)
                .ToAttr(t => t.ANullableDouble)
                .ToAttr(t => t.ANullableFloat)
-                .ToAttr(t => t.ANullableDecimal)
-                .ToAttr(t => t.ANullableGuid);
+                .ToAttr(t => t.ANullableDecimal);

            Assert.That(el.Attr("AString"), Is.EqualTo(""));
            Assert.That(el.Attr("ANullableInt"), Is.EqualTo("null"));
@@ -383,7 +348,6 @@ namespace Orchard.Tests.ContentManagement {
            Assert.That(el.Attr("ANullableDouble"), Is.EqualTo("null"));
            Assert.That(el.Attr("ANullableFloat"), Is.EqualTo("null"));
            Assert.That(el.Attr("ANullableDecimal"), Is.EqualTo("null"));
-            Assert.That(el.Attr("ANullableGuid"), Is.EqualTo("null"));
        }

        [Test]
@@ -393,7 +357,7 @@ namespace Orchard.Tests.ContentManagement {
                XElement.Parse(
                    "<data AString=\"null\" ANullableInt=\"null\" ANullableBoolean=\"null\" " +
                    "ANullableDate=\"null\" ANullableDouble=\"null\" " +
-                    "ANullableFloat=\"null\" ANullableDecimal=\"null\" ANullableGuid=\"null\"/>");
+                    "ANullableFloat=\"null\" ANullableDecimal=\"null\"/>");
            el.With(target)
                .FromAttr(t => t.AString)
                .FromAttr(t => t.ANullableInt)
@@ -401,8 +365,7 @@ namespace Orchard.Tests.ContentManagement {
                .FromAttr(t => t.ANullableDate)
                .FromAttr(t => t.ANullableDouble)
                .FromAttr(t => t.ANullableFloat)
-                .FromAttr(t => t.ANullableDecimal)
-                .FromAttr(t => t.ANullableGuid);
+                .FromAttr(t => t.ANullableDecimal);

            Assert.That(target.AString, Is.EqualTo("null"));
            Assert.That(target.ANullableInt, Is.Null);
@@ -411,7 +374,6 @@ namespace Orchard.Tests.ContentManagement {
            Assert.That(target.ANullableDouble, Is.Null);
            Assert.That(target.ANullableFloat, Is.Null);
            Assert.That(target.ANullableDecimal, Is.Null);
-            Assert.That(target.ANullableGuid, Is.Null);
        }

        private class Target {
@@ -422,14 +384,12 @@ namespace Orchard.Tests.ContentManagement {
            public double ADouble { get; set; }
            public float AFloat { get; set; }
            public decimal ADecimal { get; set; }
-            public Guid AGuid { get; set; }
            public int? ANullableInt { get; set; }
            public bool? ANullableBoolean { get; set; }
            public DateTime? ANullableDate { get; set; }
            public double? ANullableDouble { get; set; }
            public float? ANullableFloat { get; set; }
            public decimal? ANullableDecimal { get; set; }
-            public Guid? ANullableGuid { get; set; }
        }
    }
 }
--- a/src/Orchard.Tests/Orchard.Framework.Tests.csproj
+++ b/src/Orchard.Tests/Orchard.Framework.Tests.csproj
@@ -12,7 +12,6 @@
    <RootNamespace>Orchard.Tests</RootNamespace>
    <AssemblyName>Orchard.Framework.Tests</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -45,6 +44,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
@@ -56,6 +56,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
@@ -141,6 +142,7 @@
      <HintPath>..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath>
      <Private>True</Private>
    </Reference>
+    <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
--- a/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj
+++ b/src/Orchard.WarmupStarter/Orchard.WarmupStarter.csproj
@@ -11,7 +11,6 @@
    <RootNamespace>Orchard.WarmupStarter</RootNamespace>
    <AssemblyName>Orchard.WarmupStarter</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <FileAlignment>512</FileAlignment>
    <TargetFrameworkProfile />
  </PropertyGroup>
@@ -23,6 +22,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <Prefer32Bit>false</Prefer32Bit>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
@@ -34,6 +34,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
--- a/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj
+++ b/src/Orchard.Web.Tests/Orchard.Web.Tests.csproj
@@ -11,7 +11,6 @@
    <RootNamespace>Orchard.Web.Tests</RootNamespace>
    <AssemblyName>Orchard.Web.Tests</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <FileAlignment>512</FileAlignment>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -42,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
@@ -53,6 +53,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
--- a/src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs
+++ b/src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs
@@ -1,9 +1,12 @@
-using System.Web;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
 using Orchard.Mvc.Html;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Models;
+using Orchard.Core.Common.Settings;
 using Orchard.Core.Common.ViewModels;
 using Orchard.Services;
 using System.Web.Mvc;
@@ -12,13 +15,13 @@ using Orchard.ContentManagement.Handlers;

 namespace Orchard.Core.Common.Drivers {
    public class BodyPartDriver : ContentPartDriver<BodyPart> {
-        private readonly IHtmlFilterProcessor _htmlFilterProcessor;
+        private readonly IEnumerable<IHtmlFilter> _htmlFilters;
        private readonly RequestContext _requestContext;

        private const string TemplateName = "Parts.Common.Body";

-        public BodyPartDriver(IOrchardServices services, IHtmlFilterProcessor htmlFilterProcessor, RequestContext requestContext) {
-            _htmlFilterProcessor = htmlFilterProcessor;
+        public BodyPartDriver(IOrchardServices services, IEnumerable<IHtmlFilter> htmlFilters, RequestContext requestContext) {
+            _htmlFilters = htmlFilters;
            Services = services;
            _requestContext = requestContext;
        }
@@ -30,27 +33,32 @@ namespace Orchard.Core.Common.Drivers {
        }

        protected override DriverResult Display(BodyPart part, string displayType, dynamic shapeHelper) {
-            string GetProcessedBodyText() => _htmlFilterProcessor.ProcessFilters(part.Text, part.GetFlavor(), part);
-
            return Combined(
-                ContentShape("Parts_Common_Body", () =>
-                    shapeHelper.Parts_Common_Body(Html: new HtmlString(GetProcessedBodyText()))),
-                ContentShape("Parts_Common_Body_Summary", () =>
-                    shapeHelper.Parts_Common_Body_Summary(Html: new HtmlString(GetProcessedBodyText()))));
+                ContentShape("Parts_Common_Body",
+                             () => {
+                                 var bodyText = _htmlFilters.Aggregate(part.Text, (text, filter) => filter.ProcessContent(text, GetFlavor(part)));
+                                 return shapeHelper.Parts_Common_Body(Html: new HtmlString(bodyText));
+                             }),
+                ContentShape("Parts_Common_Body_Summary",
+                             () => {
+                                 var bodyText = _htmlFilters.Aggregate(part.Text, (text, filter) => filter.ProcessContent(text, GetFlavor(part)));
+                                 return shapeHelper.Parts_Common_Body_Summary(Html: new HtmlString(bodyText));
+                             })
+                );
        }

        protected override DriverResult Editor(BodyPart part, dynamic shapeHelper) {
            var model = BuildEditorViewModel(part,_requestContext);
-            return ContentShape("Parts_Common_Body_Edit", () =>
-                shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
+            return ContentShape("Parts_Common_Body_Edit",
+                                () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
        }

        protected override DriverResult Editor(BodyPart part, IUpdateModel updater, dynamic shapeHelper) {
            var model = BuildEditorViewModel(part, _requestContext);
            updater.TryUpdateModel(model, Prefix, null, null);

-            return ContentShape("Parts_Common_Body_Edit", () =>
-                shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
+            return ContentShape("Parts_Common_Body_Edit", 
+                                () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
        }

        protected override void Importing(BodyPart part, ContentManagement.Handlers.ImportContentContext context) {
@@ -75,11 +83,18 @@ namespace Orchard.Core.Common.Drivers {
        private static BodyEditorViewModel BuildEditorViewModel(BodyPart part,RequestContext requestContext) {
            return new BodyEditorViewModel {
                BodyPart = part,
-                EditorFlavor = part.GetFlavor(),
+                EditorFlavor = GetFlavor(part),
                AddMediaPath = new PathBuilder(part,requestContext).AddContentType().AddContainerSlug().ToString()
            };
        }

+        private static string GetFlavor(BodyPart part) {
+            var typePartSettings = part.Settings.GetModel<BodyTypePartSettings>();
+            return (typePartSettings != null && !string.IsNullOrWhiteSpace(typePartSettings.Flavor))
+                       ? typePartSettings.Flavor
+                       : part.PartDefinition.Settings.GetModel<BodyPartSettings>().FlavorDefault;
+        }
+
        class PathBuilder {
            private readonly IContent _content;
            private string _path;
--- a/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
+++ b/src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Web;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
@@ -8,14 +10,13 @@ using Orchard.Core.Common.Settings;
 using Orchard.Core.Common.ViewModels;
 using Orchard.Localization;
 using Orchard.Services;
-using Orchard.Utility.Extensions;

 namespace Orchard.Core.Common.Drivers {
    public class TextFieldDriver : ContentFieldDriver<TextField> {
-        private readonly IHtmlFilterProcessor _htmlFilterProcessor;
+        private readonly IEnumerable<IHtmlFilter> _htmlFilters;

-        public TextFieldDriver(IOrchardServices services, IHtmlFilterProcessor htmlFilterProcessor) {
-            _htmlFilterProcessor = htmlFilterProcessor;
+        public TextFieldDriver(IOrchardServices services, IEnumerable<IHtmlFilter> htmlFilters) {
+            _htmlFilters = htmlFilters;
            Services = services;
            T = NullLocalizer.Instance;
        }
@@ -35,7 +36,8 @@ namespace Orchard.Core.Common.Drivers {
            return ContentShape("Fields_Common_Text", GetDifferentiator(field, part),
                () => {
                    var settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>();
-                    var fieldValue = new HtmlString(_htmlFilterProcessor.ProcessFilters(field.Value, settings.Flavor, part));
+
+                    object fieldValue = new HtmlString(_htmlFilters.Aggregate(field.Value, (text, filter) => filter.ProcessContent(text, settings.Flavor)));
                    return shapeHelper.Fields_Common_Text(Name: field.Name, Value: fieldValue);
                });
        }
@@ -69,16 +71,6 @@ namespace Orchard.Core.Common.Drivers {
                if (settings.Required && String.IsNullOrWhiteSpace(field.Value)) {
                    updater.AddModelError("Text", T("The {0} field is required.", T(field.DisplayName)));
                }
-
-                if (settings.MaxLength > 0) {
-
-                    var value = new HtmlString(_htmlFilterProcessor.ProcessFilters(field.Value, settings.Flavor, part))
-                        .ToString().RemoveTags();
-
-                    if (value.Length > settings.MaxLength) {
-                        updater.AddModelError("Text", T("The maximum allowed length for the field {0} is {1}", T(field.DisplayName), settings.MaxLength));
-                    }
-                }
            }

            return Editor(part, field, shapeHelper);
--- a/src/Orchard.Web/Core/Common/Models/BodyPart.cs
+++ b/src/Orchard.Web/Core/Common/Models/BodyPart.cs
@@ -1,5 +1,4 @@
 using Orchard.ContentManagement;
-using Orchard.Core.Common.Settings;

 namespace Orchard.Core.Common.Models {
    public class BodyPart : ContentPart<BodyPartRecord> {
@@ -12,12 +11,5 @@ namespace Orchard.Core.Common.Models {
            get { return Retrieve(x => x.Format); }
            set { Store(x => x.Format, value); }
        }
-
-        public string GetFlavor() {
-            var typePartSettings = Settings.GetModel<BodyTypePartSettings>();
-            return string.IsNullOrWhiteSpace(typePartSettings?.Flavor)
-                ? PartDefinition.Settings.GetModel<BodyPartSettings>().FlavorDefault
-                : typePartSettings.Flavor;
-        }
    }
 }
--- a/src/Orchard.Web/Core/Common/Services/BbcodeFilter.cs
+++ b/src/Orchard.Web/Core/Common/Services/BbcodeFilter.cs
@@ -5,26 +5,27 @@ using System.Web;
 using Orchard.Services;

 namespace Orchard.Core.Common.Services {
-    public class BbcodeFilter : HtmlFilter {
-        public override string ProcessContent(string text, HtmlFilterContext context) {
-            return BbcodeReplace(text, context);
+    public class BbcodeFilter : IHtmlFilter {
+        public string ProcessContent(string text, string flavor) {
+            return BbcodeReplace(text);
        }

        // Can be moved somewhere else once we have IoC enabled body text filters.
-        private static string BbcodeReplace(string text, HtmlFilterContext context) {
-            if (String.IsNullOrEmpty(text))
-                return String.Empty;
+        private static string BbcodeReplace(string text) {
+            if (string.IsNullOrEmpty(text))
+                return string.Empty;

-            // Optimize code path if nothing to do.
+            // optimize code path if nothing to do
            if (!text.Contains("[url]") && !text.Contains("[img]") && !text.Contains("[url=")) {
                return text;
            }

            var sb = new StringBuilder(text);
+
            var index = -1;
            var allIndexes = new List<int>();

-            // Process all [url].
+            // process all [url]
            while (-1 != (index = text.IndexOf("[url]", index + 1, StringComparison.Ordinal))) {
                allIndexes.Add(index);
            }
@@ -62,7 +63,7 @@ namespace Orchard.Core.Common.Services {
                var url = text.Substring(start + 5, urlEnd - start - 5);
                var title = text.Substring(urlEnd + 1, end - urlEnd - 1);

-                // Substitute [url] by <a>.
+                // substitue [url] by <a>
                sb.Remove(start, end - start + 6);
                sb.Insert(start, String.Format("<a href=\"{0}\">{1}</a>", url, title));
            }
@@ -84,7 +85,7 @@ namespace Orchard.Core.Common.Services {
                
                var url = text.Substring(start + 5, end - start - 5);

-                // Substitue [url] by <a>.
+                // substitue [url] by <a>
                sb.Remove(start, end - start + 6);

                if (!string.IsNullOrEmpty(url)) {
--- a/src/Orchard.Web/Core/Common/Services/TextFieldFilter.cs
+++ b/src/Orchard.Web/Core/Common/Services/TextFieldFilter.cs
@@ -4,10 +4,10 @@ using Orchard.Services;
 using Orchard.Utility.Extensions;

 namespace Orchard.Core.Common.Services {
-    public class TextFieldFilter : HtmlFilter {
-        public override string ProcessContent(string text, HtmlFilterContext context) {
+    public class TextFieldFilter : IHtmlFilter {
+        public string ProcessContent(string text, string flavor) {
            // Flavor is null for a normal input/text field
-            return context.Flavor == null || String.Equals(context.Flavor, "textarea", StringComparison.OrdinalIgnoreCase) ? ReplaceNewLines(text) : text;
+            return flavor == null || string.Equals(flavor, "textarea", StringComparison.OrdinalIgnoreCase) ? ReplaceNewLines(text) : text;
        }

        private static string ReplaceNewLines(string text) {
--- a/src/Orchard.Web/Core/Common/Settings/TextFieldSettings.cs
+++ b/src/Orchard.Web/Core/Common/Settings/TextFieldSettings.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;

 namespace Orchard.Core.Common.Settings {

@@ -10,8 +9,5 @@ namespace Orchard.Core.Common.Settings {
        public string Hint { get; set; }
        public string Placeholder { get; set; }
        public string DefaultValue { get; set; }
-        [Range(0, int.MaxValue)]
-        [DisplayName("Maximum Length")]
-        public int MaxLength { get; set; }
    }
 }
--- a/src/Orchard.Web/Core/Common/Settings/TextFieldSettingsEvents.cs
+++ b/src/Orchard.Web/Core/Common/Settings/TextFieldSettingsEvents.cs
@@ -35,10 +35,9 @@ namespace Orchard.Core.Common.Settings {
                builder.WithSetting("TextFieldSettings.Required", model.Settings.Required.ToString(CultureInfo.InvariantCulture));
                builder.WithSetting("TextFieldSettings.Placeholder", model.Settings.Placeholder);
                builder.WithSetting("TextFieldSettings.DefaultValue", model.Settings.DefaultValue);
-                builder.WithSetting("TextFieldSettings.MaxLength", model.Settings.MaxLength.ToString());               
-            }

-            yield return DefinitionTemplate(model);
+                yield return DefinitionTemplate(model);
+            }
        }
    }
 }
--- a/src/Orchard.Web/Core/Common/Views/Body-Large.Editor.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Body-Large.Editor.cshtml
@@ -1,12 +1,9 @@
@{
    var propertyName = Model.PropertyName != null ? (string)Model.PropertyName : "Text";
-    var htmlAttributes = (Dictionary<string, object>)Model.HtmlAttributes;

-    if (htmlAttributes == null) {
-        htmlAttributes = new Dictionary<string, object> {
-            {"class", "text large"}
-        };
-    }
+    var htmlAttributes = new Dictionary<string, object> {
+        {"class", "text large"}
+    };

    if (Model.Required == true) {
        htmlAttributes["required"] = "required";
--- a/src/Orchard.Web/Core/Common/Views/Body-Small.Editor.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Body-Small.Editor.cshtml
@@ -1,12 +1,9 @@
@{
    var propertyName = Model.PropertyName != null ? (string)Model.PropertyName : "Text";
-    var htmlAttributes = (Dictionary<string, object>)Model.HtmlAttributes;

-    if (htmlAttributes == null) {
-        htmlAttributes = new Dictionary<string, object> {
-            {"class", "text small"}
-        };
-    }
+    var htmlAttributes = new Dictionary<string, object> {
+        {"class", "text small"}
+    };

    if (Model.Required == true) {
        htmlAttributes["required"] = "required";
--- a/src/Orchard.Web/Core/Common/Views/Body-Textarea.Editor.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Body-Textarea.Editor.cshtml
@@ -1,10 +1,7 @@
@{
    var propertyName = Model.PropertyName != null ? (string)Model.PropertyName : "Text";
-    var htmlAttributes = (Dictionary<string, object>)Model.HtmlAttributes;

-    if (htmlAttributes == null) {
-        htmlAttributes = new Dictionary<string, object>();
-    }
+    var htmlAttributes = new Dictionary<string, object>();

    if (Model.Required == true) {
        htmlAttributes["required"] = "required";
--- a/src/Orchard.Web/Core/Common/Views/Body-Wide.Editor.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Body-Wide.Editor.cshtml
@@ -1,12 +1,9 @@
@{
    var propertyName = Model.PropertyName != null ? (string)Model.PropertyName : "Text";
-    var htmlAttributes = (Dictionary<string, object>)Model.HtmlAttributes;

-    if (htmlAttributes == null) {
-        htmlAttributes = new Dictionary<string, object> {
-            {"class", "text medium"}
-        };
-    }
+    var htmlAttributes = new Dictionary<string, object> {
+        {"class", "text medium"}
+    };

    if (Model.Required == true) {
        htmlAttributes["required"] = "required";
--- a/src/Orchard.Web/Core/Common/Views/Body.Editor.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/Body.Editor.cshtml
@@ -3,16 +3,10 @@
    var propertyName = Model.PropertyName != null ? (string)Model.PropertyName : "Text";

    string editorFlavor = Model.EditorFlavor;
-    var htmlAttributes = (Dictionary<string, object>)Model.HtmlAttributes;

-    if (htmlAttributes == null) {
-        htmlAttributes = new Dictionary<string, object> {
-        {"class", editorFlavor.HtmlClassify()}};
-
-    }
-    else {
-        htmlAttributes["class"] = editorFlavor.HtmlClassify();
-    }
+    var htmlAttributes = new Dictionary<string, object> {
+        {"class", editorFlavor.HtmlClassify()}
+    };

    if (Model.Required == true) {
        htmlAttributes["required"] = "required";
--- a/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/TextFieldSettingsEventsViewModel.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/DefinitionTemplates/TextFieldSettingsEventsViewModel.cshtml
@@ -7,12 +7,6 @@
        @Html.ValidationMessageFor(m => m.Settings.Flavor)
    </div>
 </fieldset>
-<fieldset>
-    <label for="@Html.FieldIdFor(m => m.Settings.MaxLength)">@T("Maximum length")</label>
-    @Html.EditorFor(m => m.Settings.MaxLength, new { htmlAttributes = new { min = 0 } })
-    <span class="hint">@T("Maximum length allowed for this field. Setting the value to 0 means unlimited length.")</span>
-    @Html.ValidationMessageFor(m => m.Settings.MaxLength)
-</fieldset>
 <fieldset>
    <div>
        @Html.CheckBoxFor(m => m.Settings.Required) <label for="@Html.FieldIdFor(m => m.Settings.Required)" class="forcheckbox">@T("Required")</label>
@@ -35,4 +29,4 @@
 </fieldset>
 <fieldset>
    @Display.DefinitionTemplate(TemplateName: "TextFieldDefaultValueEditor", Model: Model)
-</fieldset>
+</fieldset>
--- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
+++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml
@@ -1,25 +1,17 @@
@model Orchard.Core.Common.ViewModels.TextFieldDriverViewModel
-@{
-    var maxLength = Model.Settings.MaxLength > 0 ? Model.Settings.MaxLength.ToString() : "";
-}

 <fieldset>
-    <label for="@Html.FieldIdFor(m => m.Text)" @if (Model.Settings.Required) { <text> class="required" </text> }>@Model.Field.DisplayName</label>
+    <label for="@Html.FieldIdFor(m => m.Text)" @if(Model.Settings.Required) { <text>class="required"</text> }>@Model.Field.DisplayName</label>
    @if (String.IsNullOrWhiteSpace(Model.Settings.Flavor)) {
        @(Model.Settings.Required
-            ? Html.TextBoxFor(m => m.Text, new { @class = "text", maxlength = maxLength, placeholder = Model.Settings.Placeholder, required = "required" })
-            : Html.TextBoxFor(m => m.Text, new { @class = "text", maxlength = maxLength, placeholder = Model.Settings.Placeholder }))
+            ? Html.TextBoxFor(m => m.Text, new { @class = "text", required = "required", placeholder = Model.Settings.Placeholder })
+            : Html.TextBoxFor(m => m.Text, new { @class = "text", placeholder = Model.Settings.Placeholder }))
        @Html.ValidationMessageFor(m => m.Text)
    }
    else {
-        var htmlAttributes = new Dictionary<string, object> {
-            {"maxlength", maxLength}
-        };
-
-        @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.Settings.Flavor, Required: Model.Settings.Required,
-            ContentItem: Model.ContentItem, Placeholder: Model.Settings.Placeholder, Field: Model.Field, HtmlAttributes: htmlAttributes)
+       @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.Settings.Flavor, Required: Model.Settings.Required, ContentItem: Model.ContentItem, Placeholder: Model.Settings.Placeholder, Field: Model.Field)
    }
    @if (HasText(Model.Settings.Hint)) {
-        <span class="hint">@Model.Settings.Hint</span>
+    <span class="hint">@Model.Settings.Hint</span>
    }
 </fieldset>
--- a/src/Orchard.Web/Core/Feeds/StandardBuilders/CorePartsFeedItemBuilder.cs
+++ b/src/Orchard.Web/Core/Feeds/StandardBuilders/CorePartsFeedItemBuilder.cs
@@ -13,15 +13,15 @@ namespace Orchard.Core.Feeds.StandardBuilders {
    public class CorePartsFeedItemBuilder : IFeedItemBuilder {
        private readonly IContentManager _contentManager;
        private readonly RouteCollection _routes;
-        private readonly IHtmlFilterProcessor _htmlFilterProcessor;
+        private readonly IEnumerable<IHtmlFilter> _htmlFilters;

        public CorePartsFeedItemBuilder(
            IContentManager contentManager, 
            RouteCollection routes,
-            IHtmlFilterProcessor htmlFilterProcessor) {
+            IEnumerable<IHtmlFilter> htmlFilters) {
            _contentManager = contentManager;
            _routes = routes;
-            _htmlFilterProcessor = htmlFilterProcessor;
+            _htmlFilters = htmlFilters;
        }

        public void Populate(FeedContext context) {
@@ -29,8 +29,8 @@ namespace Orchard.Core.Feeds.StandardBuilders {

                var inspector = new ItemInspector(
                    feedItem.Item,
-                    _contentManager.GetItemMetadata(feedItem.Item),
-                    _htmlFilterProcessor);
+                    _contentManager.GetItemMetadata(feedItem.Item), 
+                    _htmlFilters);

                // author is intentionally left empty as it could result in unwanted spam

--- a/src/Orchard.Web/Core/Feeds/StandardBuilders/ItemInspector.cs
+++ b/src/Orchard.Web/Core/Feeds/StandardBuilders/ItemInspector.cs
@@ -12,17 +12,17 @@ namespace Orchard.Core.Feeds.StandardBuilders {
    public class ItemInspector {
        private readonly IContent _item;
        private readonly ContentItemMetadata _metadata;
-        private readonly IHtmlFilterProcessor _htmlFilterProcessor;
+        private readonly IEnumerable<IHtmlFilter> _htmlFilters;
        private readonly ICommonPart _common;
        private readonly ITitleAspect _titleAspect;
        private readonly BodyPart _body;

-        public ItemInspector(IContent item, ContentItemMetadata metadata) : this(item, metadata, null) {}
+        public ItemInspector(IContent item, ContentItemMetadata metadata) : this(item, metadata, Enumerable.Empty<IHtmlFilter>()) {}

-        public ItemInspector(IContent item, ContentItemMetadata metadata, IHtmlFilterProcessor htmlFilterProcessor) {
+        public ItemInspector(IContent item, ContentItemMetadata metadata, IEnumerable<IHtmlFilter> htmlFilters) {
            _item = item;
            _metadata = metadata;
-            _htmlFilterProcessor = htmlFilterProcessor;
+            _htmlFilters = htmlFilters;
            _common = item.Get<ICommonPart>();
            _titleAspect = item.Get<ITitleAspect>();
            _body = item.Get<BodyPart>();
@@ -49,8 +49,8 @@ namespace Orchard.Core.Feeds.StandardBuilders {

        public string Description {
            get {
-                if (_htmlFilterProcessor != null && _body != null && !string.IsNullOrEmpty(_body.Text)) {
-                    return _htmlFilterProcessor.ProcessFilters(_body.Text, GetFlavor(_body), _body);
+                if (_body != null && !string.IsNullOrEmpty(_body.Text)) {
+                    return _htmlFilters.Aggregate(_body.Text, (text, filter) => filter.ProcessContent(text, GetFlavor(_body)));
                }
                return Title;
            }
--- a/src/Orchard.Web/Core/Feeds/StandardQueries/ContainerFeedQuery.cs
+++ b/src/Orchard.Web/Core/Feeds/StandardQueries/ContainerFeedQuery.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Web.Mvc;
 using System.Xml.Linq;
 using Orchard.ContentManagement;
@@ -7,16 +8,16 @@ using Orchard.Core.Feeds.Models;
 using Orchard.Core.Feeds.StandardBuilders;
 using Orchard.Mvc.Extensions;
 using Orchard.Services;
+using Orchard.Utility.Extensions;

-namespace Orchard.Core.Feeds.StandardQueries
-{
+namespace Orchard.Core.Feeds.StandardQueries {
    public class ContainerFeedQuery : IFeedQueryProvider, IFeedQuery {
        private readonly IContentManager _contentManager;
-        private readonly IHtmlFilterProcessor _htmlFilterProcessor;
+        private readonly IEnumerable<IHtmlFilter> _htmlFilters;

-        public ContainerFeedQuery(IContentManager contentManager, IHtmlFilterProcessor htmlFilterProcessor) {
+        public ContainerFeedQuery(IContentManager contentManager, IEnumerable<IHtmlFilter> htmlFilters) {
            _contentManager = contentManager;
-            _htmlFilterProcessor = htmlFilterProcessor;
+            _htmlFilters = htmlFilters;
        }

        public FeedQueryMatch Match(FeedContext context) {
@@ -54,7 +55,7 @@ namespace Orchard.Core.Feeds.StandardQueries
                return;
            }
            
-            var inspector = new ItemInspector(container, _contentManager.GetItemMetadata(container), _htmlFilterProcessor);
+            var inspector = new ItemInspector(container, _contentManager.GetItemMetadata(container), _htmlFilters);
            if (context.Format == "rss") {
                var link = new XElement("link");
                context.Response.Element.SetElementValue("title", inspector.Title);
--- a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
@@ -1,26 +1,26 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
-using System.Web.Routing;
 using Orchard.ContentManagement;
-using Orchard.ContentManagement.Aspects;
-using Orchard.ContentManagement.Handlers;
-using Orchard.Core.Contents.Settings;
 using Orchard.Core.Navigation.Models;
 using Orchard.Core.Navigation.Services;
 using Orchard.Core.Navigation.ViewModels;
-using Orchard.Data;
-using Orchard.Exceptions;
 using Orchard.Localization;
-using Orchard.Logging;
 using Orchard.Mvc.Extensions;
-using Orchard.Mvc.Html;
 using Orchard.UI;
-using Orchard.UI.Navigation;
 using Orchard.UI.Notify;
+using Orchard.UI.Navigation;
 using Orchard.Utility;
+using System;
+using Orchard.ContentManagement.Handlers;
+using Orchard.Logging;
+using Orchard.Exceptions;
+using Orchard.ContentManagement.Aspects;
 using Orchard.Utility.Extensions;
+using Orchard.Mvc.Html;
+using Orchard.Core.Contents.Settings;
+using Orchard.Data;
+using System.Web.Routing;

 namespace Orchard.Core.Navigation.Controllers {
    [ValidateInput(false)]
@@ -249,14 +249,13 @@ namespace Orchard.Core.Navigation.Controllers {
        }

        [HttpPost, ActionName("Edit")]
-        [Mvc.FormValueRequired("submit.Publish")]
+        [Mvc.FormValueRequired("submit.Save")]
        public ActionResult EditPOST(int id, string returnUrl) {
            return EditPOST(id, returnUrl, contentItem => {
                if (!contentItem.Has<IPublishingControlAspect>() && !contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
                    _contentManager.Publish(contentItem);
            });
        }
-
        private ActionResult EditPOST(int id, string returnUrl, Action<ContentItem> conditionallyPublish) {
            var contentItem = _contentManager.Get(id, VersionOptions.DraftRequired);

--- a/src/Orchard.Web/Core/Navigation/ViewModels/MenuPartViewModel.cs
+++ b/src/Orchard.Web/Core/Navigation/ViewModels/MenuPartViewModel.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using Orchard.ContentManagement;
-using Orchard.Core.Navigation.Models;

 namespace Orchard.Core.Navigation.ViewModels {
    public class MenuPartViewModel {
@@ -9,8 +7,7 @@ namespace Orchard.Core.Navigation.ViewModels {
        public int CurrentMenuId { get; set; }
        public bool OnMenu { get; set; }

-        public ContentItem ContentItem { get; set; }
-        [StringLength(MenuPartRecord.DefaultMenuTextLength)]
+        public ContentItem ContentItem { get; set; } 
        public string MenuText { get; set; }
    }
 }
--- a/src/Orchard.Web/Core/Navigation/Views/MenuItemLink-HtmlMenuItem.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/MenuItemLink-HtmlMenuItem.cshtml
@@ -1,10 +1 @@
-@using Orchard.Core.Common.Models
-@using Orchard.Services
-
-@{
-    var htmlFilterProcessor = WorkContext.Resolve<IHtmlFilterProcessor>();
-    var bodyPart = Model.Content.BodyPart as BodyPart;
-    var bodyText = htmlFilterProcessor.ProcessFilters(bodyPart.Text, bodyPart.GetFlavor(), bodyPart);
-}
-
-<span class="raw">@Html.Raw(bodyText)</span>
+<span class="raw">@Html.Raw(Model.Content.BodyPart.Text)</span>
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Orchard.Core</RootNamespace>
    <AssemblyName>Orchard.Core</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -38,6 +39,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
    <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -49,12 +51,13 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -294,8 +297,6 @@
    <Compile Include="Title\Migrations.cs" />
    <Compile Include="Title\Models\TitlePart.cs" />
    <Compile Include="Title\Models\TitlePartRecord.cs" />
-    <Compile Include="Title\Settings\TitlePartSettings.cs" />
-    <Compile Include="Title\Settings\TitlePartSettingsEvents.cs" />
    <Compile Include="XmlRpc\Controllers\HomeController.cs" />
    <Compile Include="XmlRpc\Controllers\LiveWriterController.cs" />
    <Compile Include="XmlRpc\IXmlRpcDriver.cs" />
@@ -613,7 +614,6 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
-    <Content Include="Title\Views\DefinitionTemplates\TitlePartSettings.cshtml" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -659,4 +659,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Core/Title/Drivers/TitlePartDriver.cs
+++ b/src/Orchard.Web/Core/Title/Drivers/TitlePartDriver.cs
@@ -1,9 +1,7 @@
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.Handlers;
-using Orchard.Core.Common.Settings;
 using Orchard.Core.Title.Models;
-using Orchard.Core.Title.Settings;
 using Orchard.Localization;

 namespace Orchard.Core.Title.Drivers {
@@ -35,14 +33,7 @@ namespace Orchard.Core.Title.Drivers {
        }

        protected override DriverResult Editor(TitlePart part, IUpdateModel updater, dynamic shapeHelper) {
-            if (updater.TryUpdateModel(part, Prefix, null, null)){
-
-                var settings = part.Settings.GetModel<TitlePartSettings>();
-
-                if (settings.MaxLength > 0 && part.Title.Length > settings.MaxLength) {
-                    updater.AddModelError("Title", T("The maximum allowed length for the title is {0}", settings.MaxLength));
-                }
-            }
+            updater.TryUpdateModel(part, Prefix, null, null);

            return Editor(part, shapeHelper);
        }
--- a/src/Orchard.Web/Core/Title/Migrations.cs
+++ b/src/Orchard.Web/Core/Title/Migrations.cs
@@ -1,7 +1,6 @@
 using Orchard.ContentManagement.MetaData;
 using Orchard.Core.Contents.Extensions;
 using Orchard.Data.Migration;
-using Orchard.Core.Title.Settings;

 namespace Orchard.Core.Title {
    public class Migrations : DataMigrationImpl {
@@ -10,7 +9,7 @@ namespace Orchard.Core.Title {
            SchemaBuilder.CreateTable("TitlePartRecord", 
                table => table
                    .ContentPartVersionRecord()
-                    .Column<string>("Title", column => column.WithLength(TitlePartSettings.MaxTitleLength))
+                    .Column<string>("Title", column => column.WithLength(1024))
                );

            ContentDefinitionManager.AlterPartDefinition("TitlePart", builder => builder
--- a/src/Orchard.Web/Core/Title/Settings/TitlePartSettings.cs
+++ b/src/Orchard.Web/Core/Title/Settings/TitlePartSettings.cs
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel;
-using System.Linq;
-using System.Web;
-
-namespace Orchard.Core.Title.Settings {
-
-    
-    public class TitlePartSettings {
-        // Whenever this constant is changed a new migration step must be created to update the length of the field on the DB
-        public const int MaxTitleLength = 1024;
-        [Range(0, MaxTitleLength)]
-        [DisplayName("Maximum Length")]
-        public int MaxLength {get; set;}
-
-    }
-}
--- a/src/Orchard.Web/Core/Title/Settings/TitlePartSettingsEvents.cs
+++ b/src/Orchard.Web/Core/Title/Settings/TitlePartSettingsEvents.cs
@@ -1,42 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using Orchard.ContentManagement;
-using Orchard.ContentManagement.MetaData;
-using Orchard.ContentManagement.MetaData.Builders;
-using Orchard.ContentManagement.MetaData.Models;
-using Orchard.ContentManagement.ViewModels;
-
-namespace Orchard.Core.Title.Settings {
-    public class TitlePartSettingsEvents : ContentDefinitionEditorEventsBase {
-
-        public override IEnumerable<TemplateViewModel> TypePartEditor(ContentTypePartDefinition definition) {
-            if (definition.PartDefinition.Name != "TitlePart") {
-                yield break;
-            }
-
-            var settings = definition
-                .Settings
-                .GetModel<TitlePartSettings>()
-                ?? new TitlePartSettings();
-
-            yield return DefinitionTemplate(settings);
-        }
-
-        public override IEnumerable<TemplateViewModel> TypePartEditorUpdate(ContentTypePartDefinitionBuilder builder, IUpdateModel updateModel) {
-
-            if (builder.Name != "TitlePart") {
-                yield break;
-            }
-
-            var model = new TitlePartSettings();
-
-            if (updateModel.TryUpdateModel(model, "TitlePartSettings", null, null)) {
-                builder.WithSetting("TitlePartSettings.MaxLength", model.MaxLength.ToString());
-
-            }
-            yield return DefinitionTemplate(model);
-        }
-    }
-}
--- a/src/Orchard.Web/Core/Title/Views/DefinitionTemplates/TitlePartSettings.cshtml
+++ b/src/Orchard.Web/Core/Title/Views/DefinitionTemplates/TitlePartSettings.cshtml
@@ -1,12 +0,0 @@
-@using Orchard.Core.Title.Settings;
-@model TitlePartSettings
-@{
-    var maxLength = TitlePartSettings.MaxTitleLength;
-}
-
-<fieldset>
-    <label for="@Html.FieldIdFor(m => m.MaxLength)">@T("Maximum length")</label>
-    @Html.EditorFor(m => m.MaxLength, new { htmlAttributes = new { min = 0, max = maxLength } })
-    <span class="hint">@T("Maximum length allowed for the title. Setting the value to 0 means the maximum allowed length is {0} characters.", maxLength)</span>
-    @Html.ValidationMessageFor(m => m.MaxLength)
-</fieldset>
--- a/src/Orchard.Web/Core/Title/Views/EditorTemplates/Parts.Title.TitlePart.cshtml
+++ b/src/Orchard.Web/Core/Title/Views/EditorTemplates/Parts.Title.TitlePart.cshtml
@@ -1,11 +1,7 @@
-@using Orchard.Core.Title.Settings
-@model Orchard.Core.Title.Models.TitlePart
-@{
-    var maxLength = Model.Settings.GetModel<TitlePartSettings>().MaxLength > 0 ? Model.Settings.GetModel<TitlePartSettings>().MaxLength.ToString() : "";
-}
+@model Orchard.Core.Title.Models.TitlePart

 <fieldset>
-    <label for="@Html.FieldIdFor(m => m.Title)" class="required">@T("Title")</label>
-    @Html.TextBoxFor(m => m.Title, new { @class = "text large", autofocus = "autofocus", maxlength = maxLength })
+    <label for="@Html.FieldIdFor(m => m.Title)" class="required">@T("Title")</label>    
+    @Html.TextBoxFor(m => m.Title, new { @class = "text large", autofocus = "autofocus" })
    <span class="hint">@T("You must provide a title for this content item")</span>
 </fieldset>
--- a/src/Orchard.Web/Core/Web.config
+++ b/src/Orchard.Web/Core/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\bin\roslyn" />
    </appSettings>
@@ -72,7 +73,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Core/packages.config
+++ b/src/Orchard.Web/Core/packages.config
@@ -3,7 +3,7 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
  <package id="NHibernate" version="5.3.10" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Web/Modules/Lucene/Lucene.csproj
+++ b/src/Orchard.Web/Modules/Lucene/Lucene.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,7 +15,7 @@
    <RootNamespace>Lucene</RootNamespace>
    <AssemblyName>Lucene</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <UseIISExpress>false</UseIISExpress>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -39,6 +40,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -49,14 +51,18 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
    <Reference Include="Lucene.Net, Version=3.0.3.0, Culture=neutral, PublicKeyToken=85089178b9ac3181, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\Lucene.Net.3.0.3\lib\NET40\Lucene.Net.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -164,4 +170,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Lucene/Web.config
+++ b/src/Orchard.Web/Modules/Lucene/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -71,7 +72,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Lucene/packages.config
+++ b/src/Orchard.Web/Modules/Lucene/packages.config
@@ -4,6 +4,7 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
+  <package id="SharpZipLib" version="1.3.3" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Web/Modules/Markdown/Markdown.csproj
+++ b/src/Orchard.Web/Modules/Markdown/Markdown.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Markdown</RootNamespace>
    <AssemblyName>Markdown</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -38,6 +39,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -48,6 +50,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -55,8 +58,8 @@
    <Reference Include="Markdig.Signed, Version=0.22.1.0, Culture=neutral, PublicKeyToken=870da25a133885f8, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\Markdig.Signed.0.22.1\lib\net452\Markdig.Signed.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
@@ -231,4 +234,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Markdown/Services/MarkdownFilter.cs
+++ b/src/Orchard.Web/Modules/Markdown/Services/MarkdownFilter.cs
@@ -1,16 +1,15 @@
 using System;
 using Orchard.Services;

-namespace Markdown.Services
-{
-    public class MarkdownFilter : HtmlFilter {
-        public override string ProcessContent(string text, HtmlFilterContext context) {
-            return String.Equals(context.Flavor, "markdown", StringComparison.OrdinalIgnoreCase) ? MarkdownReplace(text) : text;
+namespace Markdown.Services {
+    public class MarkdownFilter : IHtmlFilter {
+        public string ProcessContent(string text, string flavor) {
+            return String.Equals(flavor, "markdown", StringComparison.OrdinalIgnoreCase) ? MarkdownReplace(text) : text;
        }

        private static string MarkdownReplace(string text) {
-            if (String.IsNullOrEmpty(text))
-                return String.Empty;
+            if (string.IsNullOrEmpty(text))
+                return string.Empty;

            return Markdig.Markdown.ToHtml(text);
        }
--- a/src/Orchard.Web/Modules/Markdown/Web.config
+++ b/src/Orchard.Web/Modules/Markdown/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -72,7 +73,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Markdown/packages.config
+++ b/src/Orchard.Web/Modules/Markdown/packages.config
@@ -4,7 +4,7 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
--- a/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Orchard.Alias</RootNamespace>
    <AssemblyName>Orchard.Alias</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -38,6 +39,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -48,12 +50,13 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -193,4 +196,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexManaged.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexManaged.cshtml
@@ -6,6 +6,8 @@
@using Orchard.Utility.Extensions

@{
+    var urlPrefix = WorkContext.Resolve<ShellSettings>().RequestUrlPrefix;
+
    Layout.Title = T("Manage Aliases").Text;
    var aliasService = WorkContext.Resolve<IAliasService>();
    AdminIndexOptions options = Model.Options;
@@ -57,10 +59,10 @@
                <tr>
                    <td>
                        <input type="hidden" value="@alias.Path" name="@Html.FieldNameFor(m => Model.AliasEntries[index].Alias.Path)" />
-                        @Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + alias.Path))
+                        @Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + urlPrefix + alias.Path))
                    </td>
                    <td>
-                        @Html.Link(url, Href("~/" + url))
+                        @Html.Link(url, Href("~/" + urlPrefix + "/" + url))
                    </td>                   
                </tr>
            }
--- a/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexUnmanaged.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexUnmanaged.cshtml
@@ -6,6 +6,8 @@
@using Orchard.Utility.Extensions

@{
+    var urlPrefix = WorkContext.Resolve<ShellSettings>().RequestUrlPrefix;
+
    Layout.Title = T("Manage Aliases").Text;
    var aliasService = WorkContext.Resolve<IAliasService>();
    AdminIndexOptions options = Model.Options;
@@ -71,10 +73,10 @@
                        <input type="checkbox" value="true" name="@Html.FieldNameFor(m => Model.AliasEntries[index].IsChecked)" />
                    </td>
                    <td>
-                        @Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + alias.Path))
+                        @Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + urlPrefix + alias.Path))
                    </td>
                    <td>
-                        @Html.Link(url, Href("~/" + url))
+                        @Html.Link(url, Href("~/" + urlPrefix + "/" + url))
                    </td>
                    <td>
                        <ul class="action-links">
--- a/src/Orchard.Web/Modules/Orchard.Alias/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Alias/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -72,7 +73,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Orchard.Alias/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Alias/packages.config
@@ -3,6 +3,6 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
+++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Orchard.AntiSpam</RootNamespace>
    <AssemblyName>Orchard.AntiSpam</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -38,6 +39,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -48,12 +50,13 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -250,4 +253,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -72,7 +73,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/packages.config
@@ -3,7 +3,7 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,7 +15,7 @@
    <RootNamespace>Orchard.ArchiveLater</RootNamespace>
    <AssemblyName>Orchard.ArchiveLater</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <UpgradeBackupLocation>
@@ -39,6 +40,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -49,11 +51,12 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -166,4 +169,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -72,7 +73,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/packages.config
@@ -3,6 +3,6 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Orchard.AuditTrail</RootNamespace>
    <AssemblyName>Orchard.AuditTrail</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -37,6 +38,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -47,6 +49,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -57,8 +60,8 @@
    <Reference Include="Iesi.Collections, Version=4.0.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -409,4 +412,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -74,7 +75,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/packages.config
@@ -5,7 +5,7 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
  <package id="NHibernate" version="5.3.10" targetFramework="net48" />
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Orchard.Autoroute.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Orchard.Autoroute</RootNamespace>
    <AssemblyName>Orchard.Autoroute</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -38,6 +39,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -48,12 +50,13 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -214,4 +217,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Providers/SlugTokens.cs
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Providers/SlugTokens.cs
@@ -41,7 +41,6 @@ namespace Orchard.Autoroute.Providers {
            context.For<IContent>("Content")
                // {Content.Slug}
                .Token("Slug", (content => content == null ? String.Empty : _slugService.Slugify(content)))
-                .Chain("Slug", "Text", (content => content == null ? String.Empty : _slugService.Slugify(content)))
                .Token("Path", (content => {
                    var autoroutePart = content.As<AutoroutePart>();
                    if (autoroutePart == null) {
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
@@ -186,7 +186,7 @@ namespace Orchard.Autoroute.Services {
        }

        public string GenerateUniqueSlug(AutoroutePart part, IEnumerable<string> existingPaths) {
-            if (existingPaths == null || !existingPaths.Contains(part.Path, StringComparer.OrdinalIgnoreCase))
+            if (existingPaths == null || !existingPaths.Contains(part.Path))
                return part.Path;

            var version = existingPaths.Select(s => GetSlugVersion(part.Path, s)).OrderBy(i => i).LastOrDefault();
@@ -287,8 +287,7 @@ namespace Orchard.Autoroute.Services {

        private static int? GetSlugVersion(string path, string potentialConflictingPath) {
            int v;
-            // Matching needs to ignore case, so both paths are forced to lowercase.
-            var slugParts = potentialConflictingPath.ToLower().Split(new[] { path.ToLower() }, StringSplitOptions.RemoveEmptyEntries);
+            var slugParts = potentialConflictingPath.Split(new[] { path }, StringSplitOptions.RemoveEmptyEntries);

            if (slugParts.Length == 0)
                return 2;
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Web.config
@@ -20,6 +20,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -71,7 +72,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/packages.config
@@ -3,6 +3,6 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Orchard.Azure.MediaServices</RootNamespace>
    <AssemblyName>Orchard.Azure.MediaServices</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -37,6 +38,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -47,6 +49,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -66,8 +69,8 @@
    <Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Data.Edm, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -79,14 +82,14 @@
    <Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.7.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.2.4\lib\net451\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Logging, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Logging.5.7.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Tokens.5.7.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Practices.TransientFaultHandling.Core, Version=5.1.1209.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\..\packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll</HintPath>
@@ -130,8 +133,8 @@
      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    </Reference>
    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.IdentityModel.Tokens.Jwt.5.7.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Serialization" />
    <Reference Include="System.ServiceModel" />
@@ -598,4 +601,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/dash.all.js
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/dash.all.js
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/swfobject.js
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Scripts/Lib/swfobject.js
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Services/Rendering/CloudVideoFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Services/Rendering/CloudVideoFilter.cs
@@ -12,7 +12,7 @@ using Orchard.MediaLibrary.Models;
 using Orchard.Services;

 namespace Orchard.Azure.MediaServices.Services.Rendering {
-    public class CloudVideoFilter : HtmlFilter {
+    public class CloudVideoFilter : IHtmlFilter {
        private readonly IShapeFactory _shapeFactory;
        private readonly IContentManager _contentManager;
        private readonly IShapeDisplay _shapeDisplay;
@@ -23,8 +23,8 @@ namespace Orchard.Azure.MediaServices.Services.Rendering {
            _shapeDisplay = shapeDisplay;
        }

-        public override string ProcessContent(string text, HtmlFilterContext context) {
-            return String.Equals(context.Flavor, "html", StringComparison.OrdinalIgnoreCase) ? ReplaceVideoPlaceholder(text) : text;
+        public string ProcessContent(string text, string flavor) {
+            return String.Equals(flavor, "html", StringComparison.OrdinalIgnoreCase) ? ReplaceVideoPlaceholder(text) : text;
        }

        private string ReplaceVideoPlaceholder(string text) {
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Tests/Microsoft.CloudMedia.Tests/Microsoft.CloudMedia.Tests.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Tests/Microsoft.CloudMedia.Tests/Microsoft.CloudMedia.Tests.csproj
@@ -41,6 +41,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
@@ -52,6 +53,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <PlatformTarget>AnyCPU</PlatformTarget>
    <Prefer32Bit>false</Prefer32Bit>
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -89,7 +90,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config
@@ -8,13 +8,13 @@
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net48" />
  <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net48" />
  <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.7.0" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.Logging" version="5.7.0" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.7.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.2.4" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.2.4" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.2.4" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.1.0" targetFramework="net48" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
@@ -22,7 +22,7 @@
  <package id="Orchard.WindowsAzure.Diagnostics" version="2.7.0.0" targetFramework="net48" />
  <package id="Remotion.Linq" version="2.2.0" targetFramework="net48" />
  <package id="Remotion.Linq.EagerFetching" version="2.2.0" targetFramework="net48" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.7.0" targetFramework="net48" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.4" targetFramework="net48" />
  <package id="System.Spatial" version="5.8.4" targetFramework="net48" />
  <package id="TransientFaultHandling.Core" version="5.1.1209.1" targetFramework="net48" />
  <package id="windowsazure.mediaservices" version="3.4.0.0" targetFramework="net48" />
--- a/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Orchard.Azure.csproj
@@ -13,7 +13,7 @@
    <RootNamespace>Orchard.Azure</RootNamespace>
    <AssemblyName>Orchard.Azure</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -35,6 +35,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -45,6 +46,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
--- a/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Services/FileSystems/AzureFileSystem.cs
@@ -96,8 +96,6 @@ namespace Orchard.Azure.Services.FileSystems {
            return newPath;
        }

-        private static string GetFolderName(string path) => path.Substring(path.LastIndexOf('/') + 1);
-
        public string Combine(string path1, string path2) {
            if (path1 == null) {
                throw new ArgumentNullException("path1");
@@ -150,10 +148,10 @@ namespace Orchard.Azure.Services.FileSystems {
            }

            return BlobClient.ListBlobs(prefix)
-                .OfType<CloudBlockBlob>()
-                .Where(blobItem => !blobItem.Uri.AbsoluteUri.EndsWith(FolderEntry))
-                .Select(blobItem => new AzureBlobFileStorage(blobItem, _absoluteRoot))
-                .ToArray();
+                        .OfType<CloudBlockBlob>()
+                        .Where(blobItem => !blobItem.Uri.AbsoluteUri.EndsWith(FolderEntry))
+                        .Select(blobItem => new AzureBlobFileStorage(blobItem, _absoluteRoot))
+                        .ToArray();
        }

        public IEnumerable<IStorageFolder> ListFolders(string path) {
@@ -203,11 +201,6 @@ namespace Orchard.Azure.Services.FileSystems {

        public void CreateFolder(string path) {
            path = ConvertToRelativeUriPath(path);
-
-            if (FileSystemStorageProvider.FolderNameContainsInvalidCharacters(GetFolderName(path))) {
-                throw new InvalidNameCharacterException("The directory name contains invalid character(s)");
-            }
-
            Container.EnsureDirectoryDoesNotExist(String.Concat(_root, path));

            // Creating a virtually hidden file to make the directory an existing concept
@@ -239,11 +232,7 @@ namespace Orchard.Azure.Services.FileSystems {
            path = ConvertToRelativeUriPath(path);
            newPath = ConvertToRelativeUriPath(newPath);

-            if (FileSystemStorageProvider.FolderNameContainsInvalidCharacters(GetFolderName(newPath))) {
-                throw new InvalidNameCharacterException("The new directory name contains invalid character(s)");
-            }
-
-            // Workaround for https://github.com/Azure/azure-storage-net/issues/892.
+            // Workaround for https://github.com/Azure/azure-storage-net/issues/892
            // Renaming a folder by only changing the casing corrupts all the files in the folder.
            if (path.Equals(newPath, StringComparison.OrdinalIgnoreCase)) {
                var tempPath = Guid.NewGuid().ToString() + "/";
@@ -288,10 +277,6 @@ namespace Orchard.Azure.Services.FileSystems {
            path = ConvertToRelativeUriPath(path);
            newPath = ConvertToRelativeUriPath(newPath);

-            if (FileSystemStorageProvider.FileNameContainsInvalidCharacters(Path.GetFileName(newPath))) {
-                throw new InvalidNameCharacterException("The new file name contains invalid character(s)");
-            }
-
            Container.EnsureBlobExists(String.Concat(_root, path));
            Container.EnsureBlobDoesNotExist(String.Concat(_root, newPath));

@@ -316,10 +301,6 @@ namespace Orchard.Azure.Services.FileSystems {
        public IStorageFile CreateFile(string path) {
            path = ConvertToRelativeUriPath(path);

-            if (FileSystemStorageProvider.FileNameContainsInvalidCharacters(Path.GetFileName(path))) {
-                throw new InvalidNameCharacterException("The file name contains invalid character(s)");
-            }
-
            if (Container.BlobExists(String.Concat(_root, path))) {
                throw new ArgumentException("File " + path + " already exists");
            }
@@ -407,7 +388,10 @@ namespace Orchard.Azure.Services.FileSystems {
                _rootPath = rootPath;
            }

-            public string GetName() => GetFolderName(GetPath());
+            public string GetName() {
+                var path = GetPath();
+                return path.Substring(path.LastIndexOf('/') + 1);
+            }

            public string GetPath() {
                return _blob.Uri.ToString().Substring(_rootPath.Length).Trim('/');
@@ -432,12 +416,11 @@ namespace Orchard.Azure.Services.FileSystems {
                long size = 0;

                foreach (var blobItem in directoryBlob.ListBlobs()) {
-                    if (blobItem is CloudBlockBlob blob) {
-                        size += blob.Properties.Length;
-                    }
-                    else if (blobItem is CloudBlobDirectory directory) {
-                        size += GetDirectorySize(directory);
-                    }
+                    if (blobItem is CloudBlockBlob)
+                        size += ((CloudBlockBlob)blobItem).Properties.Length;
+
+                    if (blobItem is CloudBlobDirectory)
+                        size += GetDirectorySize((CloudBlobDirectory)blobItem);
                }

                return size;
--- a/src/Orchard.Web/Modules/Orchard.Blogs/BlogsLocalizationExtensions/Handlers/BlogPostPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/BlogsLocalizationExtensions/Handlers/BlogPostPartHandler.cs
@@ -64,8 +64,7 @@ namespace Orchard.Blogs.BlogsLocalizationExtensions.Handlers {
                var blogids = new HashSet<int> { blog.As<BlogPart>().ContentItem.Id };

                //seek for same culture blog
-                var realBlog = _localizationService.GetLocalizations(blog)
-                    .SingleOrDefault(w => w.Culture?.Culture == blogPostCulture.Culture);
+                var realBlog = _localizationService.GetLocalizations(blog).SingleOrDefault(w => w.As<LocalizationPart>().Culture == blogPostCulture);
                if (realBlog.Has<LocalizationPart>() && realBlog.As<LocalizationPart>().Culture.Id == blogPostCulture.Id) {
                    blogPost.As<ICommonPart>().Container = realBlog;
                    if (blogPost.Has<AutoroutePart>()) {
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Orchard.Blogs</RootNamespace>
    <AssemblyName>Orchard.Blogs</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -38,6 +39,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -48,12 +50,13 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -277,4 +280,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -72,7 +73,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Orchard.Blogs/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/packages.config
@@ -3,6 +3,6 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Caching/Orchard.Caching.csproj
@@ -13,7 +13,7 @@
    <RootNamespace>Orchard.Caching</RootNamespace>
    <AssemblyName>Orchard.Caching</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -35,6 +35,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -45,6 +46,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleCsProj.txt
@@ -13,7 +13,7 @@
    <RootNamespace>$$ModuleName$$</RootNamespace>
    <AssemblyName>$$ModuleName$$</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -33,6 +33,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -43,12 +44,13 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
 <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModulePackagesConfig.txt
@@ -3,6 +3,6 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
 </packages>
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt
@@ -21,12 +21,13 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
    <system.codedom>
        <compilers>
-            <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+            <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:latest" />
        </compilers>
    </system.codedom>
    <system.web>
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt
@@ -10,7 +10,6 @@
    <RootNamespace>$$ProjectName$$</RootNamespace>
    <AssemblyName>$$ProjectName$$</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
    <OldToolsVersion>4.0</OldToolsVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -21,6 +20,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -31,6 +31,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
@@ -14,7 +14,7 @@
    <RootNamespace>Orchard.CodeGeneration</RootNamespace>
    <AssemblyName>Orchard.CodeGeneration</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <UseIISExpress>false</UseIISExpress>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
@@ -37,6 +37,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -47,6 +48,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
--- a/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,7 +14,7 @@
    <RootNamespace>Orchard.Comments</RootNamespace>
    <AssemblyName>Orchard.Comments</AssemblyName>
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
    <OldToolsVersion>4.0</OldToolsVersion>
@@ -38,6 +39,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
@@ -48,12 +50,13 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
+    <Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -268,4 +271,10 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
+  <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.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+  </Target>
 </Project>
--- a/src/Orchard.Web/Modules/Orchard.Comments/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Web.config
@@ -21,6 +21,7 @@
            </namespaces>
        </pages>
    </system.web.webPages.razor>
+    <!-- Registering Roslyn as a compiler for Razor IntelliSense. -->
    <appSettings>
        <add key="aspnet:RoslynCompilerLocation" value="..\..\bin\roslyn" />
    </appSettings>
@@ -72,7 +73,8 @@
  </runtime>
  <system.codedom>
    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" compilerOptions="/langversion:7.3 /nowarn:1659;1699;1701;612;618" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
    </compilers>
  </system.codedom>
 </configuration>
--- a/src/Orchard.Web/Modules/Orchard.Comments/packages.config
+++ b/src/Orchard.Web/Modules/Orchard.Comments/packages.config
@@ -3,6 +3,6 @@
  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
-  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="4.1.0" targetFramework="net48" />
+  <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net48" />
  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
 </packages>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benedek Farkas	6f27eb2c4c	Updating Orchard.Tests.ContentManagement.HqlExpressionTests.ShouldSortRandomly to decrease failure chance due to randomness	2024-03-08 11:41:17 +01:00
Benedek Farkas	7bbc12d3b8	Adding workflow to run specflow tests as a nightly build	2024-03-08 11:03:02 +01:00
Benedek Farkas	a3e6e4887f	Revert "Testing the branch strategy matrix concept to be used for the nightly build" This reverts commit `1354e367b7`.	2024-03-08 10:57:07 +01:00
Benedek Farkas	1354e367b7	Testing the branch strategy matrix concept to be used for the nightly build	2024-03-08 10:49:36 +01:00
Benedek Farkas	1ad1aa278e	Removing SpecFlow test execution from the compile workflow	2024-03-08 10:49:08 +01:00
Benedek Farkas	844b60059e	Upgrading actions to latest versions These actions generated the Node.js 16 deprecation warning	2024-03-08 10:48:48 +01:00
Benedek Farkas	984a8ca0ac	Merge branch 'dev' into issue/8686-dev	2024-03-07 19:41:28 +01:00
Benedek Farkas	64eafbcea8	Merge branch 'issue/8684' into issue/8686-dev	2023-07-19 15:46:28 +02:00
Benedek Farkas	824846036e	Merge branch 'dev' into issue/8686-dev	2023-06-29 10:54:20 +02:00
Benedek Farkas	19847d2e95	Merge branch 'issue/8684' into issue/8686-dev # Conflicts: # .github/workflows/compile.yml # src/Orchard.Specs/Hosting/Orchard.Web/Web.config # src/Orchard.Web/Modules/Orchard.JobsQueue/Tests/Orchard.Messaging.Tests.csproj	2023-06-28 17:18:13 +02:00
Benedek Farkas	cb12c378fb	Re-enabling the Spec step	2023-05-26 15:31:56 +02:00
Benedek Farkas	2e22e5c86f	Specs: Updating the Newtonsoft.Json binding redirect in the spec app's web.config	2023-05-26 15:16:15 +02:00
Benedek Farkas	9c8e5594cf	Fixing that MembershipServiceTests should use IPasswordService, also making SaltAndPasswordShouldBeDifferentEvenWithSameSourcePassword test parameters more readable	2023-05-26 15:05:11 +02:00
Benedek Farkas	17bd0e58e4	Fixing initialization errors in AccountControllerTests	2023-05-26 15:04:35 +02:00
Benedek Farkas	d14aafba8e	Fixing initialization errors in ShellDescriptorManagerTests	2023-05-26 15:03:10 +02:00
Benedek Farkas	9934255e6f	Fixing initialization errors in ModuleStepTest and ThemeStepTest	2023-05-26 15:02:36 +02:00
Benedek Farkas	03a0361d76	Orchard.Tests.Modules: Adding missing reference to Iesi.Collections (that doesn't cause a build error, just when running tests)	2023-05-26 14:54:43 +02:00
Benedek Farkas	68a03c5675	Updating Orchard.Tests/UI/Resources/ResourceManagerTests.cs according to ResourceManager API change in `ac11024be4` and removing obsolete tests	2023-05-26 12:49:32 +02:00
Benedek Farkas	63634d3a4d	Code styling and fixing warning in Orchard.Tests/UI/Resources/ResourceManagerTests.cs	2023-05-26 12:35:24 +02:00
Benedek Farkas	4962a66c12	Fixing Orchard.Tests.Localization.TextTests	2023-05-26 12:00:09 +02:00
Benedek Farkas	c11688a26b	Fixing initialization errors in FeatureManagerTests	2023-05-26 11:21:43 +02:00
Benedek Farkas	f367a79834	Fixing initialization error error in StylesheetBindingStrategyTests	2023-05-26 11:21:09 +02:00
Benedek Farkas	392afad570	Fixing HqlExpressionTests.AllDataTypesCanBeQueried	2023-05-26 11:17:48 +02:00
Benedek Farkas	e9886f0b9b	Re-enabling the Test step	2023-05-26 11:08:23 +02:00
Benedek Farkas	be828e9ff9	Adding System.Net.Http 4.2.0.0 reference to Orchard.Email's web.config to fix Razor compilation warning	2023-05-26 10:50:10 +02:00
Benedek Farkas	b1d058173e	Disabling the Test step for now	2023-05-26 10:47:04 +02:00
Benedek Farkas	9a487037b8	Updating Newtonsoft.Json reference in Orchard.Messaging.Tests.csproj	2023-05-26 10:44:19 +02:00
Benedek Farkas	ec3916307e	Merge branch 'issue/8686' into issue/8686-dev # Conflicts: # src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj # src/Orchard.Azure/Orchard.Azure.Web/packages.config	2023-05-26 10:42:46 +02:00
Benedek Farkas	9d2bb2bec5	Fixing Newtonsoft.Json references	2023-05-26 10:32:13 +02:00
Benedek Farkas	810e5f7cc0	Fixing outdated assembly binding redirects	2023-05-25 20:48:08 +02:00
Benedek Farkas	9340a021c1	Merge branch 'issue/8686' into issue/8686-dev # Conflicts: # .github/workflows/compile.yml # src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj # src/Orchard.Azure/Orchard.Azure.Web/packages.config # src/Orchard.Specs/Blogs.feature.cs # src/Orchard.Specs/DateTime.feature # src/Orchard.Specs/DateTime.feature.cs # src/Orchard.Specs/Hosting/Orchard.Web/Web.config # src/Orchard.Web/Web.config	2023-05-25 20:45:03 +02:00
Benedek Farkas	5d911c2193	Orchard.Specs: Updating Settings.AddingANewSiteCultureAndSelectingItAsTheDefaultWorks to correctly detect that a culture that wasn't added before can be set as default	2023-05-24 21:17:56 +02:00
Benedek Farkas	6e8d7d2d50	Orchard.Specs: Updating DateTime.CreatingAndUsingDateTimeFieldsInAnotherCulture structure without functional change	2023-05-24 21:06:53 +02:00
Benedek Farkas	75e17d410c	Orchard.Specs: Adding Settings feature	2023-05-24 20:53:30 +02:00
Benedek Farkas	d266db61de	Revert "Marking System.Net.Http references as private (copy local) to make sure that it's always available, because it requires a specific version" This reverts commit `e4f5632236`.	2023-05-24 20:41:53 +02:00
Benedek Farkas	e4f5632236	Marking System.Net.Http references as private (copy local) to make sure that it's always available, because it requires a specific version	2023-05-24 16:14:25 +02:00
Benedek Farkas	70ed140231	Re-enabling the Specs step	2023-05-24 13:07:17 +02:00
Benedek Farkas	f610c53bcf	Re-enabling the Test step	2023-05-24 12:48:27 +02:00
Benedek Farkas	86c7350358	Pinning the referenced version of System.Net.Http to 4.2.0.0 to prevent Razor compilation warning System.Net.Http is known to have such problems across different framework versions ways of referencing it The original warning is: ASPNETCOMPILER : error : The following assembly has dependencies on a version of the .NET Framework that is higher than the target and might not load correctly during runtime causing a failure: Orchard.Workflows, Version=1.10.3.0, Culture=neutral, PublicKeyToken=null. The dependencies are: System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a. You should either ensure that the dependent assembly is correct for the target framework, or ensure that the target framework you are addressing is that of the dependent assembly. [D:\a\Orchard\Orchard\src\Orchard.Web\Modules\Orchard.Workflows\Orchard.Workflows.csproj	2023-05-24 12:30:14 +02:00
Benedek Farkas	d2eccf5c2c	Adding step to the Compile workflow to upload the MSBuild binlog results	2023-05-23 20:15:16 +02:00
Benedek Farkas	a912162e96	Specs: Media test simplified since the Orchard.Media feature is deprecated	2023-05-23 19:51:17 +02:00
Benedek Farkas	62b2f65112	Specs: Fixing "I can create browse blog posts on several pages" Blog test's flakyness due to timing because the blog posts are created quickly after one another and the lack of millisecond-precision can cause the blog posts to appear out of order of creation	2023-05-23 17:39:05 +02:00
Benedek Farkas	3aaf2272e1	Specs: Fixing "I can create browse blog posts on several pages" Blog test's usage of "I should not see" and correcting the parameters too because unlike "I should see", this is not a regex match, just contains	2023-05-23 17:36:18 +02:00
Benedek Farkas	29f58677a3	Moving the System.Net.Http assembly redirect to Orchard.Web	2023-05-23 17:29:59 +02:00
Benedek Farkas	0fd452a4f9	Orchard.Workflows: Adding assembly binding redirect for System.Net.Http to avoid Razor compilation warning	2023-05-23 15:43:24 +02:00
Benedek Farkas	e22e2dbe72	Orchard.Framework: Making the System.Net.Http not-private to prevent an outdated version sticking around	2023-05-23 14:29:36 +02:00
Benedek Farkas	99190fe4e5	Disabling Test and Spec execution for now	2023-05-23 14:18:39 +02:00
Benedek Farkas	3f214897eb	Reverting the addition of assembly binding redirects to Orchard.Specs/Hosting/Simple.Web/Web.config since it doesn't need them like Orchard.Specs/Hosting/Orchard.Web/Web.config does	2023-05-23 12:52:41 +02:00
Benedek Farkas	ae7763eb7c	Revert "Upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 4.1.0 (latest) to get rid of old System.Http.Net dependency" This reverts commit `be2ba866e3`.	2023-05-23 12:45:33 +02:00
Benedek Farkas	ddd08c227d	Revert "Replacing System.Net.Http references with its NuGet package to pin the correct version number (experimental)" This reverts commit `087f2849b1`.	2023-05-23 12:45:19 +02:00
Benedek Farkas	6bda87d680	Orchard.Specs/Hosting/Orchard.Web/Global.asax.cs: Workaround for AntiForgeryToken bug in ASP.NET MVC since version 5.2.4 https://github.com/aspnet/AspNetWebStack/issues/162	2023-05-23 12:44:59 +02:00
Benedek Farkas	975a802ed0	Restoring Orchard.Specs/Hosting/Orchard.Web/Web.config to match Orchard.Web's web.config closer so that it loads assemblies from the Dependencies folder. This fixes the error with Autofac not being able to resolve dependencies for DefaultOrchardShell	2023-05-23 12:42:26 +02:00
Benedek Farkas	8446bb94d3	Fixing compile workflow to also mark Razor compilation warnings as errors	2023-05-23 12:33:49 +02:00
Benedek Farkas	b714a44feb	Fixing Test step	2023-05-19 11:43:50 +02:00
Benedek Farkas	5065e8fb20	Compile workflow: Testing the Test and Spec targets	2023-05-19 11:34:44 +02:00
Benedek Farkas	12d7494a54	Orchard.proj: Spec target actually depends on only the Compile target, not Package-Stage (experimental)	2023-05-19 11:33:57 +02:00
Benedek Farkas	be2ba866e3	Upgrading Microsoft.CodeDom.Providers.DotNetCompilerPlatform to 4.1.0 (latest) to get rid of old System.Http.Net dependency	2023-05-18 21:28:32 +02:00
Benedek Farkas	087f2849b1	Replacing System.Net.Http references with its NuGet package to pin the correct version number (experimental)	2023-05-18 19:11:35 +02:00
Benedek Farkas	605551dde2	Removing unused references to System.Net.Http	2023-05-18 19:10:13 +02:00
Benedek Farkas	7e3d1c8cbc	Adding msbuild to PATH	2023-05-18 17:26:09 +02:00
Benedek Farkas	9f86b7dc0f	Changing default shell to pwsh (msbuild was not found in cmd?)	2023-05-18 16:58:37 +02:00
Benedek Farkas	c821afa9a5	Adding the compile workflow's actual contents	2023-05-18 16:45:50 +02:00
Benedek Farkas	42f04dd11b	Adding empty compile workflow from dev	2023-05-18 16:30:17 +02:00
Benedek Farkas	aa71039416	Orchard.Specs: Fixing assembly loading errors when starting up the web host by adding binding redirects	2023-05-18 12:34:51 +02:00
Benedek Farkas	eeb2e4764a	Updating Orchard.Azure.Web's required version of System.Web.Mvc to match the rest of the solution	2023-05-18 09:49:42 +02:00
Benedek Farkas	6ab590bc7a	Fixing indentation in DefaultDateFormatterTests	2023-05-17 22:24:56 +02:00
Benedek Farkas	bbafeded05	Fixing CurrentCultureWorkContextTests	2023-05-17 21:43:17 +02:00
Benedek Farkas	5f0c0c2fec	Fixing that test cases for invalid path in FileSystemStorageProviderTests broke in `a3e9bef3ca` (issue #6802 , PR #6919 ) I should review PRs more carefully!	2023-05-17 21:04:07 +02:00
Benedek Farkas	d1043b9f4f	Fixing typo in CommonPartProviderTests.UpdateModelStub class name	2023-05-17 21:03:12 +02:00
Benedek Farkas	077bfa6ae0	Fixing OwnerEditor tests in CommonPartProviderTests as the owner editor now checks for a different permission since `5b0c82d1ad`	2023-05-17 21:02:52 +02:00
Benedek Farkas	8d7a35b0f0	Fixing that RecipeManagerTests failed due to HttpContext not being available	2023-05-17 20:41:46 +02:00