Adding the compile workflow to the solution

This reverts commit e4f5632236.

.github/workflows/build-crowdin-translation-packages.yml

@@ -1,27 +0,0 @@
-name: Build Crowdin Translation Packages
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 6 * * *'
-
-jobs:
-  build-crowdin-translation-packages:
-    runs-on: ubuntu-24.04
-
-    steps:
-      - name: Orchard CMS
-        uses: andrii-bodnar/crowdin-request-action@ee7a2af9564d8934b5b4a8427185aaaffee0165e # v0.3.0
-        with:
-          route: POST /projects/{projectId}/translations/builds
-          projectId: 46524
-        env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_API_TOKEN }}
-
-      - name: Orchard CMS Gallery
-        uses: andrii-bodnar/crowdin-request-action@ee7a2af9564d8934b5b4a8427185aaaffee0165e # v0.3.0
-        with:
-          route: POST /projects/{projectId}/translations/builds
-          projectId: 63766
-        env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_API_TOKEN }}

.github/workflows/compile.yml

@@ -9,97 +9,25 @@ on:
       - 1.10.x
 
 jobs:
-  compile-dotnet:
-    name: Compile .NET solution
+  compile:
+    name: Compile
     defaults:
       run:
-        shell: cmd
-    runs-on: windows-2025
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        shell: pwsh
+    runs-on: windows-latest
 
-      - name: Restore NuGet Packages
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3.1.0
+
+      - name: Restore NuGet packages
         run: nuget restore src/Orchard.sln
 
-      - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1.3.1
 
       - name: Compile
-        run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:TreatWarningsAsErrors=true -WarnAsError /p:MvcBuildViews=true
+        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
-
-      - name: Test Setup with SpecFlow
-        shell: pwsh
-        run: |
-          $nunitConsole = (Get-ChildItem -Path 'src/packages' -Recurse -Filter 'nunit-console.exe' | Select-Object -Last 1).FullName
-          & $nunitConsole 'build/Compile/Orchard.Specs.dll' /xml='build/Orchard.Specs.xml' /run=Orchard.Specs.SetupFeature.RootAndSetupFolderShowsSetupScreenAndFormValuesAreValidated
-
-      - name: Run Orchard Setup with Orchard.exe
-        shell: pwsh
-        run: |
-          $commandFile = 'src/Orchard.Web/bin/setup-commands.txt'
-          New-Item -Path $commandFile -ItemType File -Force
-          Set-Content -Path $commandFile -Value 'setup /SiteName:Orchard /AdminUsername:admin /AdminPassword:Password1! /DatabaseProvider:SqlCe /Recipe:Default'
-          & 'src/Orchard.Web/bin/Orchard.exe' @$commandFile
-
-      - name: Run Code Generation
-        shell: pwsh
-        run: |
-          $commandFile = 'src/Orchard.Web/bin/codegen-commands.txt'
-          New-Item -Path $commandFile -ItemType File -Force
-          Set-Content -Path $commandFile -Value @'
-            feature enable Orchard.CodeGeneration
-            codegen module Orchard.CodeGeneration.TestModule
-            codegen theme Orchard.CodeGeneration.TestTheme /CreateProject:true
-            codegen moduletests Orchard.CodeGeneration.TestModule
-          '@
-          & 'src/Orchard.Web/bin/Orchard.exe' @$commandFile
-
-      - name: Compile Again with Generated Projects
-        run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:TreatWarningsAsErrors=true -WarnAsError /NoWarn:CS2008
-
-  compile-node:
-    name: Compile Client-side Assets
-    defaults:
-      run:
-        shell: cmd
-    runs-on: windows-2025
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Setup NodeJS
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
-        with:
-          node-version: 7
-
-      - name: Install Gulp Globally
-        working-directory: ./src
-        shell: pwsh
-        run: |
-          # 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: Install NPM Packages
-        working-directory: ./src
-        run: npm install --loglevel warn
-
-      - name: Rebuild Client-side Assets
-        working-directory: ./src
-        run: gulp rebuild
-
-      - name: Check Client-side Assets
-        working-directory: ./src
-        shell: pwsh
-        run: |
-          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

.github/workflows/release-package.yml

@@ -1,39 +0,0 @@
-name: Release Package
-# Builds the release package and uploads it as an artifact.
-
-on:
-  workflow_dispatch:
-
-jobs:
-  release-package:
-    name: Release Package
-    runs-on: Windows-2025
-    defaults:
-      run:
-        shell: cmd
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Restore NuGet Packages
-        run: nuget restore src/Orchard.sln
-
-      - name: Add MSBuild to PATH
-        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
-
-      - name: Build Precompiled Application
-        run: msbuild Orchard.proj /m /v:minimal /t:Precompiled
-
-      - name: Generate Release Package Name
-        id: package-name
-        shell: pwsh
-        run: |
-          $packageName = "Orchard-$('${{ github.ref_name }}'.Replace('/', '_'))-${{ github.sha }}"
-          "package-name=$packageName" >> $Env:GITHUB_OUTPUT
-
-      - name: Upload Release Package
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: ${{ steps.package-name.outputs.package-name }}
-          path: .\build\Precompiled
-          if-no-files-found: error

.github/workflows/specflow.yml

@@ -1,59 +0,0 @@
-name: SpecFlow Tests
-# Compiles the solution and runs unit tests, as well the SpecFlow tests on the main development branches.
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - 1.10.x
-      - dev
-  schedule:
-    - cron: '0 0 * * 1' # Every Monday midnight.
-
-jobs:
-  define-matrix:
-    name: Define Strategy Matrix
-    runs-on: ubuntu-24.04
-    outputs:
-      branches: ${{ steps.branches.outputs.branches }}
-    steps:
-      - name: Define Branches
-        id: branches
-        run: |
-          if [ "${{ github.event_name }}" = "schedule" ]; then
-            echo 'branches=["1.10.x", "dev"]' >> "$GITHUB_OUTPUT"
-          else
-            echo 'branches=["${{ github.ref_name }}"]' >> "$GITHUB_OUTPUT"
-          fi
-
-  compile:
-    name: SpecFlow Tests
-    needs: define-matrix
-    runs-on: windows-2025
-    strategy:
-      matrix:
-        branch: ${{ fromJSON(needs.define-matrix.outputs.branches) }}
-      fail-fast: false
-    defaults:
-      run:
-        shell: cmd
-    steps:
-      - name: Clone Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          ref: ${{ matrix.branch }}
-
-      - name: Restore NuGet Packages
-        run: nuget restore src/Orchard.sln
-
-      - name: Add msbuild to PATH
-        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
-
-      - name: Test
-        run: msbuild Orchard.proj /m /v:minimal /t:Test
-
-      - name: Spec
-        run: msbuild Orchard.proj /m /v:minimal /t:Spec

.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

CREDITS.txt

@@ -52,6 +52,12 @@ Website:      http://dlr.codeplex.com
 Copyright:    Copyright (c) Microsoft Corporation
 License:      Apache Software Foundation License 2.0
 
+DotNetZip
+-----
+Website:      http://dotnetzip.codeplex.com/
+Copyright:    
+License:      MS-PL
+
 Eric Meyer's Reset CSS
 -----
 Website:      http://meyerweb.com/eric/tools/css/reset/

ClickToBuild.cmd

@@ -3,18 +3,31 @@
 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,16.0)" -requires Microsoft.Component.MSBuild`) do (
   if /i "%%i"=="installationPath" (
 	set InstallDir=%%j
 	echo !InstallDir!
-	if exist "!InstallDir!\MSBuild\Current\Bin\MSBuild.exe" (
-		echo "Using MSBuild from !InstallDir!"
-		set msbuild="!InstallDir!\MSBuild\Current\Bin\MSBuild.exe"
+	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
 	)
   )
 )
 
+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

Orchard.proj

@@ -126,26 +126,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
@@ -208,6 +212,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" />
@@ -249,7 +254,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)">
@@ -279,6 +284,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"/>

README.md

@@ -1,14 +1,16 @@
 # Orchard
 
-Orchard is a free, open source, community-focused Content Management System built on the ASP.NET MVC platform. You are looking at Orchard 1, the older, .NET Framework-based version that has been in development since 2009.
+Orchard is a free, open source, community-focused Content Management System built on the ASP.NET MVC platform.
 
-If you're starting a new project (or maintaining a project built on Orchard 1), you should check out [Orchard Core](https://github.com/OrchardCMS/OrchardCore), the new generation of Orchard built on ASP.NET Core. You can also try it for free on [DotNest.com](https://dotnest.com)!
+[![Join the chat at https://gitter.im/OrchardCMS/Orchard](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/OrchardCMS/Orchard?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Join the community discussion on [Discord](https://orchardcore.net/discord), where we also have a [channel dedicated to Orchard 1](https://discord.com/channels/551136772243980291/551137194689953848).
+You can try it for free on [DotNest.com](https://dotnest.com) or on Microsoft Azure by clicking on this button.
+
+[![Deploy to Azure](https://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/OutercurveFoundation.OrchardCMS)
 
 ## About The Orchard Project
 
-#### Please visit our website at https://orchardcore.net for the most current information about this project.
+#### Please visit our website at https://orchardproject.net for the most current information about this project.
 
 Orchard is a free, open source, community-focused **Content Management System** built on the ASP.NET MVC platform.
 
@@ -20,14 +22,14 @@ Our mission is to empower our users and foster a dedicated and diverse community
 
 ## Project Status
 
-Orchard is currently in version **[1.10.4](https://github.com/OrchardCMS/Orchard/releases/tag/1.10.4)**: It contains bugfixes and the more impactful changes and new features added in the latest major version (*1.10*).
+Orchard is currently in version **[1.10.3](https://github.com/OrchardCMS/Orchard/releases/tag/1.10.3)**: It contains bugfixes and the more impactful changes and new features added in the latest major version (*1.10*).
 
-We invite participation by the developer community in shaping the project's direction, so that we can publicly validate our designs and development approach. 
+We invite participation by the developer community in shaping the project’s direction, so that we can publicly validate our designs and development approach. 
 All our releases are available on our [Releases](https://github.com/OrchardCMS/Orchard/releases) page, and we encourage interested developers to check out the source code on the Orchard GitHub site and get involved with the project.
 
 * [Download the latest release](https://github.com/OrchardCMS/Orchard/releases)
-* [Feature roadmap](https://docs.orchardcore.net/projects/O1/en/latest/Documentation/Feature-roadmap/)
-* [Docs and designs/specs](https://docs.orchardcore.net/projects/O1/en/latest/)
+* [Feature roadmap](https://docs.orchardproject.net/en/latest/Documentation/Feature-roadmap/)
+* [Docs and designs/specs](https://docs.orchardproject.net)
 
 ## How To Get Involved
 
@@ -40,7 +42,11 @@ There are many ways you can contribute to Orchard:
 * [Find and file a bug](https://github.com/OrchardCMS/Orchard/issues)
 * [Propose a feature idea](https://github.com/OrchardCMS/Orchard/issues/new)
 * [Ask and answer questions on Stack Overflow](https://stackoverflow.com/questions/tagged/orchardcms)
-* [Join us on Discord](https://orchardcore.net/discord)
-* [Submit a pull request](https://docs.orchardcore.net/projects/O1/en/latest/Documentation/Contributing-patches/)
+* [Participate in our gitter.im chatroom](https://gitter.im/OrchardCMS/Orchard)
+* [Submit a pull request](https://docs.orchardproject.net/en/latest/Documentation/Contributing-patches/)
 * [Translate Orchard](https://crowdin.com/project/orchard-cms)
-* [Contribute modules and themes to our gallery](https://gallery.orchardproject.net)
+* [Contribute modules and themes to our gallery](https://gallery.orchardproject.net/)
+
+## The Future Of Orchard CMS: Orchard Core
+
+As the underlying frameworks (.NET, ASP.NET and ASP.NET MVC) are constantly evolving, Orchard of course keeps track of the changes and improvements of these: Orchard Core is the next generation of Orchard releases that is based on [ASP.NET Core](https://www.asp.net/core). Just like the current Orchard project, it's fully [open-source and is publicly available on GitHub](https://github.com/OrchardCMS/OrchardCore). Orchard Core (as a framework) is being built from scratch: it's still in development and does not share any of its code base (at least directly) with the current versions (1.x) of Orchard.

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

@@ -15,7 +15,7 @@
     <RootNamespace>Orchard.Azure.Web</RootNamespace>
     <AssemblyName>Orchard.Azure.Web</AssemblyName>
     <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <LangVersion>7.3</LangVersion>
+    <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>false</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

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

@@ -129,6 +129,7 @@
     <system.codedom>
         <compilers>
             <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
+            <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
         </compilers>
     </system.codedom>
 </configuration>

src/Orchard.Core.Tests/App.config

@@ -16,7 +16,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -26,22 +26,6 @@
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

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>

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

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

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>

src/Orchard.Profile/Properties/AssemblyInfo.cs

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

src/Orchard.Specs/App.Config

@@ -24,7 +24,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -38,26 +38,6 @@
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <specFlow>

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>

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>

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

@@ -33,7 +33,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>
@@ -151,7 +151,7 @@
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="NHibernate" publicKeyToken="aa95f207798dfdb4" culture="neutral" />

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>

src/Orchard.Specs/Properties/AssemblyInfo.cs

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

src/Orchard.Tests.Modules/App.config

@@ -24,7 +24,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" />
@@ -42,22 +42,6 @@
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

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

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
+using Ionic.Zip;
 using NUnit.Framework;
 using Orchard.Environment.Configuration;
 using Orchard.FileSystems.Media;
@@ -53,10 +53,10 @@ namespace Orchard.Tests.Modules.Media.Services {
         [Test]
         public void GetMediaFoldersTest() {
             StorageProvider.ListFoldersPredicate = path => {
-                return string.IsNullOrEmpty(path) ? new[] { new StubStorageFolder(FolderName1) }
-                            : string.Equals(path, FolderName1) ? new[] { new StubStorageFolder(FolderName2), new StubStorageFolder(FolderName3) }
+                return string.IsNullOrEmpty(path) ? new[] {new StubStorageFolder(FolderName1)}
+                            : string.Equals(path, FolderName1) ? new[] {new StubStorageFolder(FolderName2), new StubStorageFolder(FolderName3)}
                                  : new StubStorageFolder[] { };
-            };
+                };
 
             IEnumerable<MediaFolder> mediaFolders = MediaService.GetMediaFolders(null);
             Assert.That(mediaFolders.Count(), Is.EqualTo(1), "Root path only has 1 sub directory");
@@ -94,7 +94,7 @@ namespace Orchard.Tests.Modules.Media.Services {
             Assert.That(StorageProvider.SavedStreams.Contains(StorageProvider.Combine(FolderName1, FinalDottedWebconfigFileName)), Is.False, "no extension files are never allowed");
             Assert.That(StorageProvider.SavedStreams.Contains(StorageProvider.Combine(FolderName1, PaddedWebconfigFileName)), Is.False, "no extension files are never allowed");
             Assert.That(StorageProvider.SavedStreams.Contains(StorageProvider.Combine(FolderName1, FinalDottedTextFileName)), Is.False, "no extension files are never allowed");
-
+            
             Assert.That(StorageProvider.SavedStreams.Count, Is.EqualTo(3));
         }
 
@@ -160,30 +160,29 @@ namespace Orchard.Tests.Modules.Media.Services {
         }
 
         private MemoryStream CreateZipMemoryStream() {
-            var entries = new List<string> {
-                TextFileName, WebconfigFileName, DllFileName, ZipFileName, NoExtensionFileName, PaddedWebconfigFileName,
-                FinalDottedWebconfigFileName, PaddedTextFileName, FinalDottedTextFileName
-            };
-
             // Setup memory stream with zip archive for more complex scenarios
             MemoryStream memoryStream = new MemoryStream();
-            using (var archive = new ZipArchive(memoryStream, ZipArchiveMode.Create, leaveOpen: true)) {
-                var content = new byte[] { 0x01 };
-                foreach (var entry in entries) {
-                    var zipEntry = archive.CreateEntry(entry);
-                    using (var zipStream = zipEntry.Open()) {
-                        zipStream.Write(content, 0, 1);
-                    }
-                    ++content[0];
-                }
-            }
+            using (ZipFile zipOut = new ZipFile()) {
 
+                zipOut.AddEntry(TextFileName, new byte[] { 0x01 });
+                zipOut.AddEntry(WebconfigFileName, new byte[] { 0x02 });
+                zipOut.AddEntry(DllFileName, new byte[] { 0x03 });
+                zipOut.AddEntry(ZipFileName, new byte[] { 0x04 });
+                zipOut.AddEntry(NoExtensionFileName, new byte[] { 0x05 });
+                zipOut.AddEntry(PaddedWebconfigFileName, new byte[] { 0x06 });
+                zipOut.AddEntry(FinalDottedWebconfigFileName, new byte[] { 0x07 });
+                zipOut.AddEntry(PaddedTextFileName, new byte[] { 0x08 });
+                zipOut.AddEntry(FinalDottedTextFileName, new byte[] { 0x09 });
+
+                zipOut.Save(memoryStream);
+            }
+                
             return new MemoryStream(memoryStream.ToArray());
         }
 
         private class MediaServiceAccessor : MediaService {
             public MediaServiceAccessor(IStorageProvider storageProvider, IOrchardServices orchardServices)
-                : base(storageProvider, orchardServices) { }
+                : base (storageProvider, orchardServices) {}
 
             public void UnzipMediaFileArchiveAccessor(string targetFolder, Stream zipStream) {
                 UnzipMediaFileArchive(targetFolder, zipStream);

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>
@@ -64,6 +65,9 @@
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.3.3.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
+    <Reference Include="DotNetZip, Version=1.12.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.12.0\lib\net20\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="FluentNHibernate, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentNHibernate.2.0.3.0\lib\net40\FluentNHibernate.dll</HintPath>
     </Reference>
@@ -104,8 +108,8 @@
     <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll</HintPath>
@@ -131,7 +135,6 @@
       <HintPath>..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.IO.Compression" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Abstractions">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>

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>

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

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

src/Orchard.Tests.Modules/Warmup/WebDownloaderTests.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Net;
+using System.Net;
 using NUnit.Framework;
 using Orchard.Warmup.Services;
 
@@ -21,7 +20,7 @@ namespace Orchard.Tests.Modules.Warmup {
 
         [Test]
         public void StatusCodeShouldBe404ForUnexistingResources() {
-            var download = _webDownloader.Download("https://orchardcore.net/" + Guid.NewGuid());
+            var download = _webDownloader.Download("http://orchardproject.net/yepyep");
             Assert.That(download, Is.Not.Null);
             Assert.That(download.StatusCode, Is.EqualTo(HttpStatusCode.NotFound));
             Assert.That(download.Content, Is.Null);
@@ -29,7 +28,7 @@ namespace Orchard.Tests.Modules.Warmup {
 
         [Test]
         public void StatusCodeShouldBe200ForValidRequests() {
-            var download = _webDownloader.Download("https://orchardcore.net/");
+            var download = _webDownloader.Download("http://orchardproject.net/");
             Assert.That(download, Is.Not.Null);
             Assert.That(download.StatusCode, Is.EqualTo(HttpStatusCode.OK));
             Assert.That(download.Content, Is.Not.Empty);

src/Orchard.Tests.Modules/packages.config

@@ -2,6 +2,7 @@
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net48" />
   <package id="Castle.Core" version="3.3.1" targetFramework="net48" />
+  <package id="DotNetZip" version="1.12.0" targetFramework="net48" />
   <package id="FluentNHibernate" version="2.0.3.0" targetFramework="net48" />
   <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net48" />
   <package id="IronRuby" version="1.1.3" targetFramework="net48" />
@@ -11,7 +12,7 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
   <package id="Moq" version="4.2.1510.2205" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
   <package id="NHibernate" version="4.1.2.4000" targetFramework="net48" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net48" />
   <package id="Orchard.FluentPath" version="1.0.0.1" targetFramework="net48" />

src/Orchard.Tests/App.config

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

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; }
         }
     }
 }

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>
@@ -104,8 +105,8 @@
     <Reference Include="Moq, Version=4.2.1510.2205, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll</HintPath>
@@ -132,6 +133,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>

src/Orchard.Tests/Properties/AssemblyInfo.cs

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

src/Orchard.Tests/packages.config

@@ -14,7 +14,7 @@
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
   <package id="Moq" version="4.2.1510.2205" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
   <package id="NHibernate" version="4.1.2.4000" targetFramework="net48" />
   <package id="NUnit" version="2.5.10.11092" targetFramework="net48" />
   <package id="NUnitTestAdapter" version="2.3.0" targetFramework="net48" />

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>

src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs

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

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>

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

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

src/Orchard.Web.Tests/app.config

@@ -16,7 +16,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -30,26 +30,6 @@
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
       </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

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

@@ -10,7 +10,6 @@ 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> {
@@ -72,16 +71,6 @@ namespace Orchard.Core.Common.Drivers {
                 if (settings.Required && String.IsNullOrWhiteSpace(field.Value)) {
                     updater.AddModelError("Text", T("The field {0} is mandatory", T(field.DisplayName)));
                 }
-
-                if (settings.MaxLength > 0) {
-
-                    var value = new HtmlString(_htmlFilters.Aggregate(field.Value, (text, filter) => filter.ProcessContent(text, settings.Flavor)))
-                        .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);

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

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

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 {
 
@@ -9,8 +8,5 @@ namespace Orchard.Core.Common.Settings {
         public bool Required { get; set; }
         public string Hint { get; set; }
         public string DefaultValue { get; set; }
-        [Range(0, int.MaxValue)]
-        [DisplayName("Maximum Length")]
-        public int MaxLength { get; set; }
     }
 }

src/Orchard.Web/Core/Common/Settings/TextFieldSettingsEvents.cs

@@ -34,10 +34,9 @@ namespace Orchard.Core.Common.Settings {
                 builder.WithSetting("TextFieldSettings.Hint", model.Settings.Hint);
                 builder.WithSetting("TextFieldSettings.Required", model.Settings.Required.ToString(CultureInfo.InvariantCulture));
                 builder.WithSetting("TextFieldSettings.DefaultValue", model.Settings.DefaultValue);
-                builder.WithSetting("TextFieldSettings.MaxLength", model.Settings.MaxLength.ToString());               
-            }
 
-            yield return DefinitionTemplate(model);
+                yield return DefinitionTemplate(model);
+            }
         }
     }
 }

src/Orchard.Web/Core/Common/Views/Body-Large.Editor.cshtml

@@ -1,14 +1,7 @@
 @{
-    var htmlAttributes = (Dictionary<string, object>)Model.HtmlAttributes;
-
-    if (htmlAttributes == null) {
-        htmlAttributes = new Dictionary<string, object> {
-            {"class", "text large"}
-        };
-    }
-    else {
-        htmlAttributes["class"] = "text large";
-    }
+    var htmlAttributes = new Dictionary<string, object> {
+        {"class", "text large"}
+    };
 
     if (Model.Required == true) {
         htmlAttributes["required"] = "required";

src/Orchard.Web/Core/Common/Views/Body-Small.Editor.cshtml

@@ -1,14 +1,7 @@
 @{
-    var htmlAttributes = (Dictionary<string, object>)Model.HtmlAttributes;
-
-    if (htmlAttributes == null) {
-        htmlAttributes = new Dictionary<string, object> {
-            {"class", "text small"}
-        };
-    }
-    else {
-        htmlAttributes["class"] = "text small";
-    }
+    var htmlAttributes = new Dictionary<string, object> {
+        {"class", "text small"}
+    };
 
     if (Model.Required == true) {
         htmlAttributes["required"] = "required";

src/Orchard.Web/Core/Common/Views/Body-Textarea.Editor.cshtml

@@ -1,10 +1,5 @@
 @{
-
-    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";

src/Orchard.Web/Core/Common/Views/Body-Wide.Editor.cshtml

@@ -1,14 +1,7 @@
 @{
-    var htmlAttributes = (Dictionary<string, object>)Model.HtmlAttributes;
-
-    if (htmlAttributes == null) {
-        htmlAttributes = new Dictionary<string, object> {
-            {"class", "text medium"}
-        };
-    }
-    else {
-        htmlAttributes["class"] = "text medium";
-    }
+    var htmlAttributes = new Dictionary<string, object> {
+        {"class", "text medium"}
+    };
 
     if (Model.Required == true) {
         htmlAttributes["required"] = "required";

src/Orchard.Web/Core/Common/Views/Body.Editor.cshtml

@@ -1,16 +1,10 @@
 @using Orchard.Utility.Extensions;
 @{
     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";

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>
@@ -27,4 +21,4 @@
 </fieldset>
 <fieldset>
     @Display.DefinitionTemplate(TemplateName: "TextFieldDefaultValueEditor", Model: Model)
-</fieldset>
+</fieldset>

src/Orchard.Web/Core/Common/Views/EditorTemplates/Fields.Common.Text.Edit.cshtml

@@ -1,26 +1,15 @@
 @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", required = "required", maxlength = maxLength})
-            : Html.TextBoxFor(m => m.Text, new {@class = "text", maxlength = maxLength }))
+        @(Model.Settings.Required ? Html.TextBoxFor(m => m.Text, new {@class = "text", required = "required"}) : Html.TextBoxFor(m => m.Text, new {@class = "text"}))
         @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, Field: Model.Field, HtmlAttributes: htmlAttributes)
+       @Display.Body_Editor(Text: Model.Text, EditorFlavor: Model.Settings.Flavor, Required: Model.Settings.Required, ContentItem: Model.ContentItem, Field: Model.Field)
     }
     @if (HasText(Model.Settings.Hint)) {
-        <span class="hint">@Model.Settings.Hint</span>
+    <span class="hint">@Model.Settings.Hint</span>
     }
 </fieldset>

src/Orchard.Web/Core/Containers/AdminMenu.cs

@@ -1,93 +0,0 @@
-using System.Linq;
-using Orchard.ContentManagement;
-using Orchard.Core.Containers.Models;
-using Orchard.Core.Containers.Services;
-using Orchard.Localization;
-using Orchard.Security;
-using Orchard.UI.Navigation;
-using Orchard.Utility.Extensions;
-
-namespace Orchard.Core.Containers {
-    public class AdminMenu : INavigationProvider {
-        private readonly IContainerService _containerService;
-        private readonly IContentManager _contentManager;
-        private readonly IAuthorizationService _authorizationService;
-        private readonly IWorkContextAccessor _workContextAccessor;
-
-        public AdminMenu(
-            IContainerService containerService,
-            IContentManager contentManager,
-            IAuthorizationService authorizationService,
-            IWorkContextAccessor workContextAccessor) {
-            _containerService = containerService;
-            _contentManager = contentManager;
-            _authorizationService = authorizationService;
-            _workContextAccessor = workContextAccessor;
-        }
-
-        public Localizer T { get; set; }
-        public string MenuName { get { return "admin"; } }
-
-        public void GetNavigation(NavigationBuilder builder) {
-            builder.AddImageSet("container");
-
-            var containers = _containerService
-                .GetContainersQuery(VersionOptions.Latest)
-                .Where<ContainerPartRecord>(x => x.ShowOnAdminMenu)
-                .List()
-                .Where(content => _authorizationService.TryCheckAccess(
-                    Contents.Permissions.EditContent,
-                    _workContextAccessor.GetContext().CurrentUser,
-                    content))
-                .ToList();
-
-            foreach (var container in containers) {
-                var closureContainer = container;
-
-                if (!string.IsNullOrWhiteSpace(container.AdminMenuImageSet)) {
-                    builder.AddImageSet(container.AdminMenuImageSet.Trim());
-                }
-
-                builder.Add(T(container.AdminMenuText), container.AdminMenuPosition, item => {
-                    var containedItems = _containerService.GetContentItems(closureContainer.Id, VersionOptions.Latest).ToList();
-                    var actualContainer = closureContainer;
-                    var position = 0;
-
-                    // If the list has just a single item that happens to be a container itself,
-                    // we will treat that one as the actual container to provide a nice & quick way to manage that list.
-                    if (containedItems.Count == 1) {
-                        var containedItem = containedItems.First().As<ContainerPart>();
-
-                        if (containedItem != null) {
-                            actualContainer = containedItem;
-                            foreach (var itemContentType in containedItem.ItemContentTypes) {
-                                var closureItemContentType = itemContentType;
-                                item.Add(T("New {0}", itemContentType.DisplayName), string.Format("1.{0}", position++), subItem => subItem
-                                    .Action("Create", "Admin", new {
-                                        id = closureItemContentType.Name,
-                                        containerid = containedItem.Id,
-                                        area = "Contents"
-                                    }));
-                            }
-                        }
-                    }
-
-                    item.Action(_contentManager.GetItemMetadata(actualContainer).AdminRouteValues)
-                        .AddClass("section-container")
-                        .AddClass(closureContainer.AdminMenuText.HtmlClassify())
-                        .LinkToFirstChild(false);
-
-                    foreach (var itemContentType in closureContainer.ItemContentTypes) {
-                        var closureItemContentType = itemContentType;
-                        item.Add(T("New {0}", itemContentType.DisplayName), string.Format("1.{0}", position++), subItem => subItem
-                            .Action("Create", "Admin", new {
-                                id = closureItemContentType.Name,
-                                containerid = container.Id,
-                                area = "Contents"
-                            }));
-                    }
-                });
-            }
-        }
-    }
-}

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

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

src/Orchard.Web/Core/Containers/Styles/menu.container-admin.css

@@ -1,7 +0,0 @@
-.menu-admin > .section-container > h3 > a {
-    background-image: url(images/menu.container.png) !important;
-}
-
-.menu-admin > .section-container > h3 > a:hover {
-    background-position: 0 -30px !important;
-}

src/Orchard.Web/Core/Contents/Controllers/AdminController.cs

@@ -352,32 +352,6 @@ namespace Orchard.Core.Contents.Controllers {
             return EditPOST(id, returnUrl, contentItem => _contentManager.Publish(contentItem));
         }
 
-        /// <summary>
-        /// This action is specific to the submit button of the edit form.
-        /// Unpublish logic is the same of the Unpublish action, which is called by the content list.
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="returnUrl"></param>
-        /// <returns></returns>
-        [HttpPost, ActionName("Edit")]
-        [Mvc.FormValueRequired("submit.Unpublish")]
-        public ActionResult EditUnpublishPOST(int id, string returnUrl) {
-            return Unpublish(id, returnUrl);
-        }
-
-        /// <summary>
-        /// This action is specific to the submit button of the edit form.
-        /// Delete logic is the same of the Remove action, which is called by the content list.
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="returnUrl"></param>
-        /// <returns></returns>
-        [HttpPost, ActionName("Edit")]
-        [Mvc.FormValueRequired("submit.Delete")]
-        public ActionResult EditDeletePOST(int id, string returnUrl) {
-            return Remove(id, returnUrl);
-        }
-
         private ActionResult EditPOST(int id, string returnUrl, Action<ContentItem> conditionallyPublish) {
             var contentItem = _contentManager.Get(id, VersionOptions.DraftRequired);
 

src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs

@@ -21,14 +21,8 @@ namespace Orchard.Core.Contents.Drivers {
         protected override DriverResult Editor(ContentPart part, dynamic shapeHelper) {
             var results = new List<DriverResult> { ContentShape("Content_SaveButton", saveButton => saveButton) };
 
-            if (part.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable) {
+            if (part.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
                 results.Add(ContentShape("Content_PublishButton", publishButton => publishButton));
-                results.Add(ContentShape("Content_UnpublishButton", unpublishButton => unpublishButton));
-            }
-
-            if (part.Id > 0) {
-                results.Add(ContentShape("Content_DeleteButton", deleteButton => deleteButton));
-            }
 
             return Combined(results.ToArray());
         }

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The contents module enables the creation of custom content types. 
 Features:
     Contents

src/Orchard.Web/Core/Contents/Placement.info

@@ -6,10 +6,8 @@
         Parts_Contents_Publish_SummaryAdmin
     -->
     <!-- edit "shape" -->
+    <Place Content_PublishButton="Sidebar:24"/>
     <Place Content_SaveButton="Sidebar:23"/>
-    <Place Content_PublishButton="Sidebar:24"/>    
-    <Place Content_UnpublishButton="Sidebar:25"/>
-    <Place Content_DeleteButton="Sidebar:26"/>
     <Match DisplayType="Detail">
         <Place Parts_Contents_Publish="Content:5"/>
     </Match>

src/Orchard.Web/Core/Contents/Views/Content.DeleteButton.cshtml

@@ -1,8 +0,0 @@
-@using Orchard.ContentManagement;
-@using Orchard.Core.Contents;
-
-@if (Authorizer.Authorize(Permissions.DeleteContent, (IContent)Model.ContentItem)) {
-    <fieldset class="delete-button">
-        <button type="submit" name="submit.Delete" value="submit.Delete" itemprop="RemoveUrl">@T("Delete")</button>
-    </fieldset>
-}

src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml

@@ -1,12 +0,0 @@
-@using Orchard.ContentManagement;
-@using Orchard.Core.Contents;
-
-@{
-    var contentItem = Model.ContentItem as IContent;
-}
-
-@if (Authorizer.Authorize(Permissions.PublishContent, contentItem) && contentItem.IsPublished()) {
-    <fieldset class="unpublish-button">
-        <button type="submit" name="submit.Unpublish" value="submit.Unpublish">@T("Unpublish")</button>
-    </fieldset>
-}

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The dashboard module is providing the dashboard screen of the admininstration UI of the application.
 FeatureDescription: Standard admin dashboard.
 Category: Core

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

@@ -31,7 +31,7 @@
 
 <div class="help-item">
     <h2 class="advisory">@T("Stay up to date")</h2>
-<iframe id="advisory" src="https://orchardcore.net/advisory" frameborder="0" height="100%" width="100%" scrolling="no">
+<iframe id="advisory" src="http://www.orchardproject.net/advisory" frameborder="0" height="100%" width="100%" scrolling="no">
  <p>@T("Your browser does not support iframes. You can't see advisory messages.")</p>
 </iframe>
 </div>

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The Feeds module is providing RSS feeds to content items.
 FeatureDescription: RSS feeds for content items.
 Category: Syndication

src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs

@@ -1,75 +1,74 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
 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;
 using Orchard.Mvc.Extensions;
-using Orchard.Mvc.Html;
-using Orchard.Security;
 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)]
     public class AdminController : Controller, IUpdateModel {
-        private readonly IContentManager _contentManager;
-        private readonly ITransactionManager _transactionManager;
-        private readonly IAuthorizer _authorizer;
-        private readonly INotifier _notifier;
         private readonly IMenuService _menuService;
         private readonly INavigationManager _navigationManager;
         private readonly IEnumerable<IContentHandler> _handlers;
         private readonly IMenuManager _menuManager;
+        private readonly IContentManager _contentManager;
+        private readonly ITransactionManager _transactionManager;
 
         public AdminController(
             IOrchardServices orchardServices,
+            IContentManager contentManager,
+            ITransactionManager transactionManager,
             IMenuService menuService,
             IMenuManager menuManager,
             INavigationManager navigationManager,
             IEnumerable<IContentHandler> handlers) {
-            _contentManager = orchardServices.ContentManager;
-            _transactionManager = orchardServices.TransactionManager;
-            _authorizer = orchardServices.Authorizer;
-            _notifier = orchardServices.Notifier;
+            _contentManager = contentManager;
+            _transactionManager = transactionManager;
             _menuService = menuService;
             _menuManager = menuManager;
             _navigationManager = navigationManager;
             _handlers = handlers;
 
+            Services = orchardServices;
             T = NullLocalizer.Instance;
             Logger = NullLogger.Instance;
         }
 
         public Localizer T { get; set; }
         public ILogger Logger { get; set; }
+        public IOrchardServices Services { get; set; }
 
         public ActionResult Index(NavigationManagementViewModel model, int? menuId) {
-            var menus = _contentManager.Query("Menu").List().ToList()
+            var menus = Services.ContentManager.Query("Menu").List().ToList()
                 .OrderBy(x => x.ContentManager.GetItemMetadata(x).DisplayText);
 
             if (!menus.Any()) {
-                if (!_authorizer.Authorize(Permissions.ManageMenus, T("Not allowed to manage menus"))) {
+                if (!Services.Authorizer.Authorize(Permissions.ManageMenus, T("Not allowed to manage menus"))) {
                     return new HttpUnauthorizedResult();
                 }
 
                 return RedirectToAction("Create", "Admin", new { area = "Contents", id = "Menu", returnUrl = Request.RawUrl });
             }
 
-            var allowedMenus = menus.Where(menu => _authorizer.Authorize(Permissions.ManageMenus, menu)).ToList();
+            var allowedMenus = menus.Where(menu => Services.Authorizer.Authorize(Permissions.ManageMenus, menu)).ToList();
 
             if (!allowedMenus.Any()) {
                 return new HttpUnauthorizedResult();
@@ -88,11 +87,7 @@ namespace Orchard.Core.Navigation.Controllers {
             }
 
             if (model.MenuItemEntries == null || !model.MenuItemEntries.Any()) {
-                model.MenuItemEntries = _menuService
-                    .GetMenuParts(currentMenu.Id)
-                    .Select(CreateMenuItemEntries)
-                    .OrderBy(menuPartEntry => menuPartEntry.Position, new FlatPositionComparer())
-                    .ToList();
+                model.MenuItemEntries = _menuService.GetMenuParts(currentMenu.Id).Select(CreateMenuItemEntries).OrderBy(menuPartEntry => menuPartEntry.Position, new FlatPositionComparer()).ToList();
             }
 
             model.MenuItemDescriptors = _menuManager.GetMenuItemTypes();
@@ -105,10 +100,7 @@ namespace Orchard.Core.Navigation.Controllers {
 
         [HttpPost, ActionName("Index")]
         public ActionResult IndexPOST(IList<MenuItemEntry> menuItemEntries, int? menuId) {
-            if (!_authorizer.Authorize(
-                Permissions.ManageMenus,
-                menuId.HasValue ? _menuService.GetMenu(menuId.Value) : null,
-                T("Couldn't manage the menu")))
+            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, (menuId.HasValue) ? _menuService.GetMenu(menuId.Value) : null, T("Couldn't manage the main menu")))
                 return new HttpUnauthorizedResult();
 
             // See https://github.com/OrchardCMS/Orchard/issues/948
@@ -131,19 +123,25 @@ namespace Orchard.Core.Navigation.Controllers {
             return RedirectToAction("Index", new { menuId });
         }
 
-        [HttpPost, ActionName("Edit")]
-        [FormValueRequired("submit.Delete")]
-        public ActionResult EditDeletePOST(int id) => Delete(id);
+        private MenuItemEntry CreateMenuItemEntries(MenuPart menuPart) {
+            return new MenuItemEntry {
+                MenuItemId = menuPart.Id,
+                IsMenuItem = menuPart.Is<MenuItemPart>(),
+                Text = menuPart.MenuText,
+                Position = menuPart.MenuPosition,
+                Url = menuPart.Is<MenuItemPart>()
+                              ? menuPart.As<MenuItemPart>().Url
+                              : _navigationManager.GetUrl(null, Services.ContentManager.GetItemMetadata(menuPart).DisplayRouteValues),
+                ContentItem = menuPart.ContentItem,
+            };
+        }
 
         [HttpPost]
         public ActionResult Delete(int id) {
+
             MenuPart menuPart = _menuService.Get(id);
             int? menuId = null;
-
-            if (!_authorizer.Authorize(
-                Permissions.ManageMenus,
-                menuPart == null ? null : _menuService.GetMenu(menuPart.Menu.Id),
-                T("Couldn't manage the menu")))
+            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, (menuPart != null) ? _menuService.GetMenu(menuPart.Menu.Id) : null, T("Couldn't manage the main menu")))
                 return new HttpUnauthorizedResult();
 
             if (menuPart != null) {
@@ -156,9 +154,8 @@ namespace Orchard.Core.Navigation.Controllers {
                     .ToList();
 
                 foreach (var menuItem in menuItems.Concat(new[] { menuPart })) {
-                    // if the menu item is a concrete content item, don't delete it, just remove the menu reference
-                    if (!menuPart.ContentItem.TypeDefinition.Settings.ContainsKey("Stereotype")
-                        || menuPart.ContentItem.TypeDefinition.Settings["Stereotype"] != "MenuItem") {
+                    // if the menu item is a concrete content item, don't delete it, just unreference the menu
+                    if (!menuPart.ContentItem.TypeDefinition.Settings.ContainsKey("Stereotype") || menuPart.ContentItem.TypeDefinition.Settings["Stereotype"] != "MenuItem") {
                         menuPart.Menu = null;
                     }
                     else {
@@ -166,29 +163,31 @@ namespace Orchard.Core.Navigation.Controllers {
                     }
                 }
 
-                _notifier.Information(T.Plural(
-                    "The menu item '{1}' has been deleted.",
-                    "The menu item '{1}' and its children have been deleted.",
-                    menuItems.Count() + 1,
-                    menuPart.MenuText));
             }
 
             return RedirectToAction("Index", new { menuId });
         }
 
+        bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
+            return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
+        }
+
+        void IUpdateModel.AddModelError(string key, LocalizedString errorMessage) {
+            ModelState.AddModelError(key, errorMessage.ToString());
+        }
+
         public ActionResult CreateMenuItem(string id, int menuId, string returnUrl) {
-            if (!_authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the menu")))
+            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the main menu")))
                 return new HttpUnauthorizedResult();
 
             // create a new temporary menu item
-            var contentItem = _contentManager.New(id);
-            var menuPart = contentItem.As<MenuPart>();
+            var menuPart = Services.ContentManager.New<MenuPart>(id);
 
             if (menuPart == null)
                 return HttpNotFound();
 
             // load the menu
-            var menu = _contentManager.Get(menuId);
+            var menu = Services.ContentManager.Get(menuId);
 
             if (menu == null)
                 return HttpNotFound();
@@ -197,7 +196,7 @@ namespace Orchard.Core.Navigation.Controllers {
                 // filter the content items for this specific menu
                 menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
                 menuPart.Menu = menu;
-                var model = _contentManager.BuildEditor(contentItem);
+                var model = Services.ContentManager.BuildEditor(menuPart);
 
                 return View(model);
             }
@@ -207,41 +206,32 @@ namespace Orchard.Core.Navigation.Controllers {
                 }
 
                 Logger.Error(T("Creating menu item failed: {0}", exception.Message).Text);
-                _notifier.Error(T("Creating menu item failed: {0}", exception.Message));
+                Services.Notifier.Error(T("Creating menu item failed: {0}", exception.Message));
                 return this.RedirectLocal(returnUrl, () => RedirectToAction("Index"));
             }
         }
 
         [HttpPost, ActionName("CreateMenuItem")]
         public ActionResult CreateMenuItemPost(string id, int menuId, string returnUrl) {
-            if (!_authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the menu")))
+            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the main menu")))
                 return new HttpUnauthorizedResult();
-
-            var contentItem = _contentManager.New(id);
-            var menuPart = contentItem.As<MenuPart>();
-
+            var menuPart = Services.ContentManager.New<MenuPart>(id);
             if (menuPart == null)
                 return HttpNotFound();
-
             // load the menu
-            var menu = _contentManager.Get(menuId);
+            var menu = Services.ContentManager.Get(menuId);
             if (menu == null)
                 return HttpNotFound();
 
-            _contentManager.Create(contentItem);
-
             menuPart.Menu = menu;
+            var model = Services.ContentManager.UpdateEditor(menuPart, this);
             menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
-
-            var model = _contentManager.UpdateEditor(contentItem, this);
-
+            Services.ContentManager.Create(menuPart);
             if (!ModelState.IsValid) {
-                _transactionManager.Cancel();
+                Services.TransactionManager.Cancel();
                 return View(model);
             }
-
-            _notifier.Information(T("Your {0} has been added.", contentItem.TypeDefinition.DisplayName));
-
+            Services.Notifier.Information(T("Your {0} has been added.", menuPart.TypeDefinition.DisplayName));
             return this.RedirectLocal(returnUrl, () => RedirectToAction("Index"));
         }
 
@@ -251,7 +241,7 @@ namespace Orchard.Core.Navigation.Controllers {
             if (contentItem == null)
                 return HttpNotFound();
 
-            if (!_authorizer.Authorize(Permissions.ManageMenus, contentItem.Content.MenuPart.Menu, T("Couldn't manage the menu")))
+            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, contentItem.Content.MenuPart.Menu, T("Couldn't manage the main menu")))
                 return new HttpUnauthorizedResult();
 
             var model = _contentManager.BuildEditor(contentItem);
@@ -262,78 +252,17 @@ namespace Orchard.Core.Navigation.Controllers {
         [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
-                    && contentItem.IsPublished())
+                if (!contentItem.Has<IPublishingControlAspect>() && !contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable)
                     _contentManager.Publish(contentItem);
             });
         }
-
-        [HttpPost]
-        // Copy of Contents/AdminController/Publish, but with different permission check and redirect.
-        public ActionResult Publish(int id) {
-            var menuPart = _contentManager.GetLatest<MenuPart>(id);
-            if (menuPart == null)
-                return HttpNotFound();
-
-            if (!_authorizer.Authorize(Permissions.ManageMenus, menuPart.Menu, T("Couldn't manage the menu")))
-                return new HttpUnauthorizedResult();
-
-            _contentManager.Publish(menuPart.ContentItem);
-
-            _notifier.Information(
-                string.IsNullOrWhiteSpace(menuPart.MenuText)
-                    ? string.IsNullOrWhiteSpace(menuPart.TypeDefinition.DisplayName)
-                        ? T("Your content has been published.")
-                        : T("Your {0} has been published.", menuPart.TypeDefinition.DisplayName)
-                    : T("'{0}' has been published.", menuPart.MenuText));
-
-            return RedirectToAction("Index", new { menuId = menuPart.Menu.Id });
-        }
-
-        [HttpPost]
-        // Copy of Contents/AdminController/Unpublish, but with different permission check and redirect.
-        public ActionResult Unpublish(int id) {
-            var menuPart = _contentManager.GetLatest<MenuPart>(id);
-            if (menuPart == null)
-                return HttpNotFound();
-
-            if (!_authorizer.Authorize(Permissions.ManageMenus, menuPart.Menu, T("Couldn't manage the menu")))
-                return new HttpUnauthorizedResult();
-
-            _contentManager.Unpublish(menuPart.ContentItem);
-
-            _notifier.Information(
-                string.IsNullOrWhiteSpace(menuPart.MenuText)
-                    ? string.IsNullOrWhiteSpace(menuPart.TypeDefinition.DisplayName)
-                        ? T("Your content has been unpublished.")
-                        : T("Your {0} has been unpublished.", menuPart.TypeDefinition.DisplayName)
-                    : T("'{0}' has been unpublished.", menuPart.MenuText));
-
-            return RedirectToAction("Index", new { menuId = menuPart.Menu.Id });
-        }
-
-        private MenuItemEntry CreateMenuItemEntries(MenuPart menuPart) {
-            return new MenuItemEntry {
-                MenuItemId = menuPart.Id,
-                IsMenuItem = menuPart.Is<MenuItemPart>(),
-                Text = menuPart.MenuText,
-                Position = menuPart.MenuPosition,
-                Url = menuPart.Is<MenuItemPart>()
-                    ? menuPart.As<MenuItemPart>().Url
-                    : _navigationManager.GetUrl(null, _contentManager.GetItemMetadata(menuPart).DisplayRouteValues),
-                ContentItem = menuPart.ContentItem,
-            };
-        }
-
         private ActionResult EditPOST(int id, string returnUrl, Action<ContentItem> conditionallyPublish) {
-            var contentItem = _contentManager.GetLatest(id);
-            var menuPart = contentItem.As<MenuPart>();
+            var contentItem = _contentManager.Get(id, VersionOptions.DraftRequired);
 
-            if (menuPart == null)
+            if (contentItem == null)
                 return HttpNotFound();
 
-            if (!_authorizer.Authorize(Permissions.ManageMenus, menuPart.Menu, T("Couldn't manage the menu")))
+            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, contentItem.Content.MenuPart.Menu, T("Couldn't manage the main menu")))
                 return new HttpUnauthorizedResult();
 
             string previousRoute = null;
@@ -360,22 +289,11 @@ namespace Orchard.Core.Navigation.Controllers {
                 returnUrl = Url.ItemDisplayUrl(contentItem);
             }
 
-            _notifier.Information(
-                string.IsNullOrWhiteSpace(menuPart.MenuText)
-                    ? string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)
-                        ? T("Your content has been saved.")
-                        : T("Your {0} has been saved.", contentItem.TypeDefinition.DisplayName)
-                    : T("'{0}' has been saved.", menuPart.MenuText));
+            Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)
+                ? T("Your content has been saved.")
+                : T("Your {0} has been saved.", contentItem.TypeDefinition.DisplayName));
 
-            return RedirectToAction("Index", new { menuId = menuPart.Menu.Id });
-        }
-
-        bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
-            return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
-        }
-
-        void IUpdateModel.AddModelError(string key, LocalizedString errorMessage) {
-            ModelState.AddModelError(key, errorMessage.ToString());
+            return this.RedirectLocal(returnUrl, () => RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } }));
         }
     }
 }

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The navigation module creates and manages a simple navigation menu for the front-end of the application and allows you to add content items to the admin menu.
 FeatureDescription: Menu management.
 Category: Core

src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs

@@ -19,13 +19,13 @@ namespace Orchard.Core.Navigation.Services {
 
         public IEnumerable<MenuPart> GetMenuParts(int menuId) {
             return _contentManager
-                .Query<MenuPart, MenuPartRecord>(VersionOptions.Latest)
-                .Where(x => x.MenuId == menuId)
+                .Query<MenuPart, MenuPartRecord>()
+                .Where( x => x.MenuId == menuId)
                 .List();
         }
 
         public IContent GetMenu(string menuName) {
-            if (string.IsNullOrWhiteSpace(menuName)) {
+            if(string.IsNullOrWhiteSpace(menuName)) {
                 return null;
             }
 
@@ -37,19 +37,19 @@ namespace Orchard.Core.Navigation.Services {
         }
 
         public IContent GetMenu(int menuId) {
-            return _contentManager.Get(menuId, VersionOptions.Published);
+            return _contentManager.Get(menuId, VersionOptions.Published);    
         }
 
         public MenuPart Get(int menuPartId) {
-            return _contentManager.Get<MenuPart>(menuPartId, VersionOptions.Latest);
+            return _contentManager.Get<MenuPart>(menuPartId);
         }
 
         public IContent Create(string name) {
-
-            if (string.IsNullOrWhiteSpace(name)) {
+            
+            if(string.IsNullOrWhiteSpace(name)) {
                 throw new ArgumentNullException(name);
             }
-
+            
             var menu = _contentManager.Create("Menu");
             menu.As<TitlePart>().Title = name;
 

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; }
     }
 }

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

@@ -1,6 +1,4 @@
 @model NavigationManagementViewModel
-
-@using Orchard.ContentManagement;
 @using Orchard.Core.Navigation.ViewModels;
 @using Orchard.Utility.Extensions;
 
@@ -117,21 +115,8 @@
                     <span class="navigation-position"><input type="text" class="text" name="@Html.NameOf(m => m.MenuItemEntries[i].Position)" value="@menuPartEntry.Position" /></span>
                     <span class="navigation-actions">
                         <input type="hidden" name="@Html.NameOf(m => m.MenuItemEntries[i].MenuItemId)" value="@menuPartEntry.MenuItemId" />
-                        @{
-                            var menuItemHasPublished = menuPartEntry.ContentItem.HasPublished();
-                        }
-
-                        @Html.Link(
-                            menuItemHasPublished ? T("Unpublish").Text : T("Publish").Text,
-                            Url.Action(
-                                menuItemHasPublished ? "Unpublish": "Publish",
-                                "Admin",
-                                new { area = "Navigation", id = menuPartEntry.ContentItem.Id }),
-                            new { itemprop = "UnsafeUrl" })
-                        @T(" | ")
-                        @Html.ItemEditLink(T("Edit").Text, menuPartEntry.ContentItem, new { returnUrl = Request.RawUrl })
-                        @T(" | ")
-                        @Html.Link(T("Delete").Text, Url.ItemRemoveUrl(menuPartEntry.ContentItem, null), new { itemprop = "RemoveUrl UnsafeUrl" })
+                        @Html.ItemEditLink(T("Edit").Text, menuPartEntry.ContentItem, new { returnUrl = Request.RawUrl })@T(" | ")
+                        @Html.Link(T("Delete").Text, Url.ItemRemoveUrl(menuPartEntry.ContentItem,null), new { itemprop = "RemoveUrl UnsafeUrl" })
                     </span>
                 </div>
             

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">
@@ -119,7 +122,6 @@
     <Compile Include="Common\ViewModels\DateTimeEditor.cs" />
     <Compile Include="Common\ViewModels\TextFieldDriverViewModel.cs" />
     <Compile Include="Common\ViewModels\TextFieldSettingsEventsViewModel.cs" />
-    <Compile Include="Containers\AdminMenu.cs" />
     <Compile Include="Containers\Controllers\ItemController.cs" />
     <Compile Include="Containers\Drivers\ContainablePartDriver.cs" />
     <Compile Include="Containers\Drivers\ContainerPartDriver.cs" />
@@ -291,8 +293,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" />
@@ -319,8 +319,6 @@
     <Content Include="Common\Views\Parts.Common.Metadata.cshtml" />
     <Content Include="Common\Views\CommonMetadataLastModified.cshtml" />
     <Content Include="Containers\Module.txt" />
-    <Content Include="Containers\Styles\images\menu.container.png" />
-    <Content Include="Containers\Styles\menu.container-admin.css" />
     <Content Include="Shapes\Scripts\admin-localnavigation.js" />
     <Content Include="Contents\Styles\images\menu.content.png" />
     <Content Include="Contents\Styles\menu.content-admin.css" />
@@ -613,15 +611,7 @@
     <Content Include="Navigation\Views\Admin\Edit.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Contents\Views\Content.UnpublishButton.cshtml" />
-    <Content Include="Contents\Views\Content.DeleteButton.cshtml" />  
     <None Include="packages.config" />
-    <Content Include="Title\Views\DefinitionTemplates\TitlePartSettings.cshtml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Containers\Styles\Web.config">
-      <SubType>Designer</SubType>
-    </Content>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -667,4 +657,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>

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

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

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The dashboard module is providing the reports screen of the application.
 FeatureDescription: Reports management.
 Category: Core

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The scheduling module enables background task scheduling. 
 FeatureDescription: Scheduled background tasks.
 Category: Core

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The settings module creates site settings that other modules can contribute to.
 FeatureDescription: Site settings.
 Category: Core

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The shapes module contains core shape templates and display hooks.
 FeatureDescription: Core shape templates and display hooks.
 Category: Core

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);
         }

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

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The title module enables content items to have titles.
 FeatureDescription: Title content part.
 Category: Core

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;}
-
-    }
-}

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);
-        }
-    }
-}

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>

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>

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>
@@ -54,7 +55,7 @@
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                       <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+                       <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -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>

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

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The XmlRpc module enables creation of contents from client applications such as LiveWriter.
 FeatureDescription: XML-RPC opt-in implementation.
 Category: Content Publishing

src/Orchard.Web/Core/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>

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,6 +51,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
@@ -58,8 +61,8 @@
     <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">
@@ -167,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>

src/Orchard.Web/Modules/Lucene/Module.txt

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The Lucene module enables the site to be indexed using Lucene.NET. The index generated by this module can then be used by the search module to provide an integrated full-text search experience to a web site.
 FeatureDescription: Lucene indexing services.
 Dependencies: Orchard.Indexing

src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs

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

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>
@@ -53,7 +54,7 @@
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                       <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+                       <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -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>

src/Orchard.Web/Modules/Lucene/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="SharpZipLib" version="1.3.3" targetFramework="net48" />
 </packages>

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,27 +58,27 @@
     <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>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -231,4 +234,10 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+  <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>

src/Orchard.Web/Modules/Markdown/Module.txt

@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: The Markdown module enables rich text contents to be created using the Markdown syntax.
 FeatureDescription: Markdown editor.
 Category: Input Editor

src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs

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

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>
@@ -54,7 +55,7 @@
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                       <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+                       <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -68,27 +69,12 @@
                        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
                        <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
                 </dependentAssembly>
-             <dependentAssembly>
-                 <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                 <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
-             </dependentAssembly>
-             <dependentAssembly>
-                 <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                 <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-             </dependentAssembly>
-             <dependentAssembly>
-                 <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                 <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-             </dependentAssembly>
-             <dependentAssembly>
-                 <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                 <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-             </dependentAssembly>
          </assemblyBinding>
   </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>

src/Orchard.Web/Modules/Markdown/packages.config

@@ -4,10 +4,10 @@
   <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.6.0" targetFramework="net48" />
-  <package id="System.Memory" version="4.6.0" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net48" />
-</packages>
+  <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
+</packages>

src/Orchard.Web/Modules/Orchard.Alias/Module.txt

@@ -2,8 +2,8 @@ Name: Alias
 AntiForgery: enabled
 Author: The Orchard Team
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: Maps friendly urls to specific module actions.
 FeatureDescription: Maps friendly urls to specific module actions.
 Category: Content

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>

src/Orchard.Web/Modules/Orchard.Alias/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Security;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright <20> .NET Foundation")]
+[assembly: AssemblyCopyright("Copyright <20> .NET Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -30,6 +30,6 @@ using System.Security;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.10.4")]
-[assembly: AssemblyFileVersion("1.10.4")]
+[assembly: AssemblyVersion("1.10.3")]
+[assembly: AssemblyFileVersion("1.10.3")]
 

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>
             }

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>
                         @Html.ActionLink(T("Edit").Text, "Edit", new { path = alias.Path == String.Empty ? "/" : alias.Path })@T(" | ")

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>
@@ -54,7 +55,7 @@
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                       <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+                       <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
@@ -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>