Updating ModuleRootWebConfig.txt codegen template according to the new Newtonsoft.Json version

Upgrading Newtonsoft.Json from 12.0.3 (vulnerable) to 13.0.3
Using System.IO.Compression instead of DotNetZip
2026-02-09 09:16:41 +08:00 · 2024-11-29 11:04:09 +01:00 · 2024-11-26 21:20:45 +01:00 · 2024-11-26 21:16:09 +01:00 · 2024-11-26 20:23:32 +01:00
256 changed files with 1750 additions and 2819 deletions
--- a/.github/workflows/build-crowdin-translation-packages.yml
+++ b/.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 }}
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -13,89 +13,53 @@ jobs:
    name: Compile .NET solution
    defaults:
      run:
-        shell: cmd
-    runs-on: windows-2025
+        shell: pwsh
+    runs-on: windows-latest
    steps:
-      - name: Clone Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - name: Clone repository
+        uses: actions/checkout@v4.1.1

-      - name: Restore NuGet Packages
+      - 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@v2

      - name: Compile
-        run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:TreatWarningsAsErrors=true -WarnAsError /p:MvcBuildViews=true
+        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: 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
+    name: Compile client-side assets
    defaults:
      run:
-        shell: cmd
-    runs-on: windows-2025
+        shell: pwsh
+    runs-on: windows-latest
    steps:
-      - name: Clone Repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - name: Clone repository
+        uses: actions/checkout@v4.1.1

      - name: Setup NodeJS
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@v4.0.2
        with:
-          node-version: 7
+          node-version: '7'

-      - name: Install Gulp Globally
+      - name: Setup NPM packages
        working-directory: ./src
-        shell: pwsh
        run: |
+          npm install --loglevel warn
+
          # Install gulp globally to be able to run the rebuild task, using the same version as in the project.
          $gulpVersion = (Get-Content Package.json -Raw | ConvertFrom-Json).devDependencies.gulp
          Start-Process npm -NoNewWindow -Wait -ArgumentList "install gulp@$gulpVersion -g --loglevel warn"

-      - name: Install NPM Packages
+      - name: Rebuild client-side assets
        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: |
+          gulp rebuild
+
          git add . # To make line ending changes "disappear".
          $gitStatus = (git status --porcelain)
          if ($gitStatus)
--- a/.github/workflows/release-package.yml
+++ b/.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
--- a/.github/workflows/specflow.yml
+++ b/.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
--- a/README.md
+++ b/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.
--- a/src/Orchard.Core.Tests/App.config
+++ b/src/Orchard.Core.Tests/App.config
@@ -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>
--- a/src/Orchard.Core.Tests/Properties/AssemblyInfo.cs
+++ b/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")]
--- a/src/Orchard.Profile/Properties/AssemblyInfo.cs
+++ b/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")]
--- a/src/Orchard.Specs/App.Config
+++ b/src/Orchard.Specs/App.Config
@@ -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>
--- a/src/Orchard.Specs/Hosting/Orchard.Web/Web.config
+++ b/src/Orchard.Specs/Hosting/Orchard.Web/Web.config
@@ -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" />
--- a/src/Orchard.Specs/Properties/AssemblyInfo.cs
+++ b/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")]
--- a/src/Orchard.Tests.Modules/App.config
+++ b/src/Orchard.Tests.Modules/App.config
@@ -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>
--- a/src/Orchard.Tests.Modules/Properties/AssemblyInfo.cs
+++ b/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")]
--- a/src/Orchard.Tests/Properties/AssemblyInfo.cs
+++ b/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")]
--- a/src/Orchard.WarmupStarter/Properties/AssemblyInfo.cs
+++ b/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]
--- a/src/Orchard.Web.Tests/Properties/AssemblyInfo.cs
+++ b/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")]
--- a/src/Orchard.Web.Tests/app.config
+++ b/src/Orchard.Web.Tests/app.config
@@ -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>
--- a/src/Orchard.Web/Core/Common/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Containers/AdminMenu.cs
+++ b/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"
-                            }));
-                    }
-                });
-            }
-        }
-    }
-}
--- a/src/Orchard.Web/Core/Containers/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Containers/Styles/menu.container-admin.css
+++ b/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;
-}
--- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
+++ b/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);

--- a/src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
+++ b/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());
        }
--- a/src/Orchard.Web/Core/Contents/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Contents/Placement.info
+++ b/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>
--- a/src/Orchard.Web/Core/Contents/Views/Content.DeleteButton.cshtml
+++ b/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>
-}
--- a/src/Orchard.Web/Core/Contents/Views/Content.UnpublishButton.cshtml
+++ b/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>
-}
--- a/src/Orchard.Web/Core/Dashboard/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Dashboard/Views/Admin/Index.cshtml
+++ b/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>
--- a/src/Orchard.Web/Core/Feeds/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
+++ b/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 } }));
        }
    }
 }
--- a/src/Orchard.Web/Core/Navigation/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs
+++ b/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;

--- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
+++ b/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>
            
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -119,7 +119,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" />
@@ -319,8 +318,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,16 +610,9 @@
    <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>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
--- a/src/Orchard.Web/Core/Properties/AssemblyInfo.cs
+++ b/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")]

--- a/src/Orchard.Web/Core/Reports/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Scheduling/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Settings/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Shapes/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/Title/Module.txt
+++ b/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
--- a/src/Orchard.Web/Core/XmlRpc/Module.txt
+++ b/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
--- a/src/Orchard.Web/Modules/Lucene/Module.txt
+++ b/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
--- a/src/Orchard.Web/Modules/Lucene/Properties/AssemblyInfo.cs
+++ b/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")]

--- a/src/Orchard.Web/Modules/Markdown/Markdown.csproj
+++ b/src/Orchard.Web/Modules/Markdown/Markdown.csproj
@@ -62,20 +62,20 @@
      <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 +231,4 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
-</Project>
+</Project>
--- a/src/Orchard.Web/Modules/Markdown/Module.txt
+++ b/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
--- a/src/Orchard.Web/Modules/Markdown/Properties/AssemblyInfo.cs
+++ b/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")]

--- a/src/Orchard.Web/Modules/Markdown/Web.config
+++ b/src/Orchard.Web/Modules/Markdown/Web.config
@@ -68,22 +68,6 @@
                       <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>
--- a/src/Orchard.Web/Modules/Markdown/packages.config
+++ b/src/Orchard.Web/Modules/Markdown/packages.config
@@ -6,8 +6,8 @@
  <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.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>
--- a/src/Orchard.Web/Modules/Orchard.Alias/Module.txt
+++ b/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
--- a/src/Orchard.Web/Modules/Orchard.Alias/Properties/AssemblyInfo.cs
+++ b/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")]

--- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Module.txt
@@ -2,8 +2,8 @@ Name: AntiSpam
 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: Provides anti-spam services to protect your content from malicious submissions.
 Features:
    Orchard.AntiSpam:
--- a/src/Orchard.Web/Modules/Orchard.AntiSpam/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.AntiSpam/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Orchard")]
-[assembly: AssemblyCopyright("Copyright <20> .NET Foundation")]
+[assembly: AssemblyCopyright("Copyright <20> .NET Foundation")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -29,6 +29,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")]

--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/Module.txt
@@ -3,8 +3,8 @@ Path: ArchiveLater
 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 ArchiveLater module introduces scheduled archiving functionality.
 FeatureDescription: Scheduled archiving.
 Category: Content
--- a/src/Orchard.Web/Modules/Orchard.ArchiveLater/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ArchiveLater/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")]

--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/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: Provides a log for recording and viewing back-end changes.
 Features:
    Orchard.AuditTrail:
--- a/src/Orchard.Web/Modules/Orchard.AuditTrail/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.AuditTrail/Properties/AssemblyInfo.cs
@@ -32,6 +32,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")]

--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Module.txt
@@ -2,8 +2,8 @@ Name: Autoroute
 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: Description for the module
 Features:
    Orchard.Autoroute:
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/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")]

--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Module.txt
@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: Microsoft Open Technologies, Inc
 Website: http://msopentech.com
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
 Features:
    Orchard.Azure.MediaServices:
--- a/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Properties/AssemblyInfo.cs
@@ -32,6 +32,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")]

--- a/src/Orchard.Web/Modules/Orchard.Azure/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Azure/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: Provides a set of Orchard service implementations targeting Microsoft Azure services.
 Category: Hosting
 Features:
--- a/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Azure/Properties/AssemblyInfo.cs
@@ -10,7 +10,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("")]

@@ -31,6 +31,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")]

--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using System.Reflection;
 using System.Web.Mvc;
 using Orchard.Blogs.Extensions;
 using Orchard.Blogs.Models;
@@ -137,12 +138,6 @@ namespace Orchard.Blogs.Controllers {
            });
        }

-        [HttpPost, ActionName("Edit")]
-        [Mvc.FormValueRequired("submit.Delete")]
-        public ActionResult EditDeletePOST(int blogId, int postId, string returnUrl) {
-            return Delete(blogId, postId);
-        }
-
        [HttpPost, ActionName("Edit")]
        [FormValueRequired("submit.Publish")]
        public ActionResult EditAndPublishPOST(int blogId, int postId, string returnUrl) {
@@ -161,12 +156,6 @@ namespace Orchard.Blogs.Controllers {
            return EditPOST(blogId, postId, returnUrl, contentItem => Services.ContentManager.Publish(contentItem));
        }

-        [HttpPost, ActionName("Edit")]
-        [Mvc.FormValueRequired("submit.Unpublish")]
-        public ActionResult EditUnpublishPOST(int blogId, int postId, string returnUrl) {
-            return Unpublish(blogId, postId);
-        }
-
        public ActionResult EditPOST(int blogId, int postId, string returnUrl, Action<ContentItem> conditionallyPublish) {
            var blog = _blogService.Get(blogId, VersionOptions.Latest);
            if (blog == null)
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/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 Orchard Blogs module is implementing basic blogging features. 
 FeatureDescription: A simple web log.
 Dependencies: Shapes, Common, Feeds, Navigation, Orchard.Widgets, Orchard.Resources, Orchard.PublishLater, Orchard.Autoroute
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Properties/AssemblyInfo.cs
@@ -29,6 +29,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")]

--- a/src/Orchard.Web/Modules/Orchard.Blogs/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Web.config
@@ -68,22 +68,6 @@
                       <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>
--- a/src/Orchard.Web/Modules/Orchard.Caching/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Caching/Module.txt
@@ -2,8 +2,8 @@
 AntiForgery: enabled
 Author: Sébastien Ros
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: Provides an API to cache business data.
 Features:
    Orchard.Caching:
--- a/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Caching/Properties/AssemblyInfo.cs
@@ -10,7 +10,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("")]

@@ -31,6 +31,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")]

--- a/src/Orchard.Web/Modules/Orchard.Caching/Services/ICacheStorageProvider.cs
+++ b/src/Orchard.Web/Modules/Orchard.Caching/Services/ICacheStorageProvider.cs
@@ -8,8 +8,4 @@ namespace Orchard.Caching.Services {
        void Remove(string key);
        void Clear();
    }
-
-    public interface ICacheStorageProviderWithKeyPrefix : ICacheStorageProvider {
-        void Clear(string key);
-    }
 }
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssemblyInfo.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleAssemblyInfo.txt
@@ -32,6 +32,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")]

--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleManifest.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleManifest.txt
@@ -3,7 +3,7 @@ AntiForgery: enabled
 Author: The Orchard Team
 Website: https://orchardproject.net
 Version: 1.0
-OrchardVersion: 1.10.4
+OrchardVersion: 1.10.3
 Description: Description for the module
 Features:
    $$ModuleName$$:
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsCsProj.txt
@@ -21,7 +21,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>..\..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\..\..\OrchardBasicCorrectness.ruleset</CodeAnalysisRuleSet>
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -35,16 +35,16 @@
    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+    <Reference Include="Autofac">
      <HintPath>..\..\..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
    </Reference>
    <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="NHibernate, Version=4.1.0.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\packages\NHibernate.4.1.2.4000\lib\net40\NHibernate.dll</HintPath>
+    <Reference Include="NHibernate">
+      <HintPath>..\..\..\..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
    </Reference>
-    <Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework">
      <HintPath>..\..\..\..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
    </Reference>
    <Reference Include="System" />
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsPackagesConfig.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleTestsPackagesConfig.txt
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Autofac" version="3.5.2" targetFramework="net48" />
-  <package id="Moq" version="4.2.1510.2205" targetFramework="net48" />
-  <package id="NHibernate" version="4.1.2.4000" targetFramework="net48" />
-  <package id="NUnit" version="2.5.10.11092" targetFramework="net48" />
-</packages>
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
@@ -161,8 +161,6 @@ namespace Orchard.CodeGeneration.Commands {
            templateText = templateText.Replace("$$ModuleTypeLibGuid$$", Guid.NewGuid().ToString());
            File.WriteAllText(propertiesPath + "\\AssemblyInfo.cs", templateText);
            content.Add(propertiesPath + "\\AssemblyInfo.cs");
-            File.WriteAllText(testsPath + "packages.config", File.ReadAllText(_codeGenTemplatePath + "ModuleTestsPackagesConfig.txt"));
-            content.Add(testsPath + "packages.config");

            var itemGroup = CreateProjectItemGroup(testsPath, content, folders);

@@ -170,7 +168,7 @@ namespace Orchard.CodeGeneration.Commands {
            csprojText = csprojText.Replace("$$ProjectName$$", projectName);
            csprojText = csprojText.Replace("$$TestsProjectGuid$$", projectGuid);
            csprojText = csprojText.Replace("$$FileIncludes$$", itemGroup ?? "");
-            csprojText = csprojText.Replace("$$OrchardReferences$$", GetOrchardReferences(modulesFolderRelativeDepth: 3));
+            csprojText = csprojText.Replace("$$OrchardReferences$$", GetOrchardReferences());

            File.WriteAllText(testsPath + projectName + ".csproj", csprojText);

@@ -329,17 +327,15 @@ namespace Orchard.CodeGeneration.Commands {
            return text;
        }

-        private static string GetOrchardReferences(int modulesFolderRelativeDepth = 2) {
-            var frameworkRelativeDepth = string.Join("\\", Enumerable.Repeat("..", modulesFolderRelativeDepth + 1));
-            var coreRelativeDepth = string.Join("\\", Enumerable.Repeat("..", modulesFolderRelativeDepth));
+        private static string GetOrchardReferences() {
            return IsSourceEnlistment() ?
-$@"<ProjectReference Include=""{frameworkRelativeDepth}\Orchard\Orchard.Framework.csproj"">
-      <Project>{{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}}</Project>
+@"<ProjectReference Include=""..\..\..\Orchard\Orchard.Framework.csproj"">
+      <Project>{2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6}</Project>
      <Name>Orchard.Framework</Name>
      <Private>$(MvcBuildViews)</Private>
    </ProjectReference>
-    <ProjectReference Include=""{coreRelativeDepth}\Core\Orchard.Core.csproj"">
-      <Project>{{9916839C-39FC-4CEB-A5AF-89CA7E87119F}}</Project>
+    <ProjectReference Include=""..\..\Core\Orchard.Core.csproj"">
+      <Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
      <Name>Orchard.Core</Name>
      <Private>$(MvcBuildViews)</Private>
    </ProjectReference>" :
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/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: Tools to create Orchard components.
 FeatureDescription: Tools to create Orchard components.
 Category: Developer
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/Orchard.CodeGeneration.csproj
@@ -88,7 +88,6 @@
    <Compile Include="Services\CodeGenerationCommandInterpreter.cs" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="CodeGenerationTemplates\ModuleTestsPackagesConfig.txt" />
    <Content Include="CodeGenerationTemplates\ModuleStylesMinCss.txt" />
    <Content Include="CodeGenerationTemplates\ModuleStylesCss.txt" />
    <Content Include="CodeGenerationTemplates\ModuleStylesLess.txt" />
@@ -159,4 +158,4 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
-</Project>
+</Project>
--- a/src/Orchard.Web/Modules/Orchard.CodeGeneration/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.CodeGeneration/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")]

--- a/src/Orchard.Web/Modules/Orchard.Comments/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Comments/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 comments system implemented by this module can be applied to arbitrary Orchard content types, such as blogs and pages. It includes comment validation and spam protection through the Akismet service.
 Features:
    Orchard.Comments:
--- a/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@ 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")]
--- a/src/Orchard.Web/Modules/Orchard.Conditions/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Conditions/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: Provides a rules API that evaluate to true or false.
 Features:
    Orchard.Conditions:
--- a/src/Orchard.Web/Modules/Orchard.Conditions/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Conditions/Properties/AssemblyInfo.cs
@@ -32,6 +32,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")]

--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Module.txt
@@ -1,9 +1,9 @@
 Name: Orchard.ContentPermissions
 AntiForgery: enabled
-Author: Chris Pyle, Sébastien Ros
+Author: Chris Pyle, S<EFBFBD>bastien Ros
 Website: http://orchardproject.net
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: Allows item-level front end view permissions.
 Features:
    Orchard.ContentPermissions:
--- a/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPermissions/Properties/AssemblyInfo.cs
@@ -10,7 +10,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("")]

@@ -31,5 +31,5 @@ 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")]
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Module.txt
@@ -2,8 +2,8 @@ Name: Orchard.ContentPicker
 AntiForgery: enabled
 Author: The Orchard Team
 Website: https://github.com/OrchardCMS/Orchard
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 Description: UI for selecting Content Items.
 Features:
    Orchard.ContentPicker:
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Properties/AssemblyInfo.cs
@@ -10,7 +10,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("")]

@@ -31,6 +31,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")]

--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/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: ContentTypes modules enables the creation and alteration of content types not based on code.
 Dependencies: Contents
 Category: Content
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/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")]

--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Module.txt
@@ -2,8 +2,8 @@ Name: Custom Forms
 AntiForgery: enabled
 Author: The Orchard Team
 Website: https://github.com/OrchardCMS/Orchard
-Version: 1.10.4
-OrchardVersion: 1.10.4
+Version: 1.10.3
+OrchardVersion: 1.10.3
 LifecycleStatus: Deprecated
 Description: Create custom forms like contact forms or content contributions.
 Features:
--- a/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.CustomForms/Properties/AssemblyInfo.cs
@@ -10,7 +10,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("")]

@@ -31,5 +31,5 @@ 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")]
--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/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 Dashboards module enables administrators to customize the dashboard screen of the administration UI of the application.
 Features:
    Orchard.Dashboards:
--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Orchard.Dashboards.csproj
@@ -94,6 +94,7 @@
    <Content Include="Placement.info" />
    <Content Include="Styles\dashboard.css" />
    <Content Include="Web.config" />
+    <Content Include="Scripts\Web.config" />
    <Content Include="Styles\Web.config" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Content Include="Module.txt" />
@@ -188,4 +189,4 @@
      </FlavorProperties>
    </VisualStudio>
  </ProjectExtensions>
-</Project>
+</Project>
--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Properties/AssemblyInfo.cs
@@ -32,6 +32,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")]

--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Scripts/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Scripts/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
    <system.webServer>
        <staticContent>
--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Services/DefaultDashboardSelector.cs
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Services/DefaultDashboardSelector.cs
--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Views/StaticDashboard.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Views/StaticDashboard.cshtml
@@ -30,7 +30,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>
--- a/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.Dashboards/Web.config
@@ -69,22 +69,6 @@
                       <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>
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/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: Contains designer tools to ease the Themes development process
 FeatureName: Shape Tracing
 Category: Designer
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ 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")]
--- a/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config
+++ b/src/Orchard.Web/Modules/Orchard.DesignerTools/Web.config
@@ -69,22 +69,6 @@
                       <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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Benedek Farkas	d6af405d3a	Updating ModuleRootWebConfig.txt codegen template according to the new Newtonsoft.Json version	2024-11-29 11:04:09 +01:00
Benedek Farkas	4bcc35cbf5	Upgrading Newtonsoft.Json from 12.0.3 (vulnerable) to 13.0.3	2024-11-26 21:20:45 +01:00
Benedek Farkas	38ab52c9e6	Using System.IO.Compression instead of DotNetZip	2024-11-26 21:16:09 +01:00
Benedek Farkas	13614d0451	Updating System.IdentityModel.Tokens.Jwt and its dependencies in Orchard.Azure.MediaServices	2024-11-26 20:23:32 +01:00