Updating solution with GHA workflow files

* Navigation: Fixing that saving a menu item should not force creating a draft version

* Navigation: Adding support to the AdminController for the Delete button rendered by the Contents feature

* Navigation: Fixing that fields attached to a Menu Item should also be updated when creating the item

* MainMenuService: Fixing that unpublished menu items could not be deleted

* Adding notification when deleting a menu items

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

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

.github/workflows/compile.yml

@@ -13,53 +13,89 @@ jobs:
     name: Compile .NET solution
     defaults:
       run:
-        shell: pwsh
-    runs-on: windows-latest
+        shell: cmd
+    runs-on: windows-2025
     steps:
-      - name: Clone repository
-        uses: actions/checkout@v4.1.1
+      - name: Clone Repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
-      - name: Restore NuGet packages
+      - name: Restore NuGet Packages
         run: nuget restore src/Orchard.sln
 
-      - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v2
+      - 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
+        run: msbuild Orchard.proj /m /v:minimal /t:Compile /p:TreatWarningsAsErrors=true -WarnAsError /p:MvcBuildViews=true
 
       - 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: pwsh
-    runs-on: windows-latest
+        shell: cmd
+    runs-on: windows-2025
     steps:
-      - name: Clone repository
-        uses: actions/checkout@v4.1.1
+      - name: Clone Repository
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Setup NodeJS
-        uses: actions/setup-node@v4.0.2
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
         with:
-          node-version: '7'
+          node-version: 7
 
-      - name: Setup NPM packages
+      - name: Install Gulp Globally
         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: Rebuild client-side assets
+      - name: Install NPM Packages
         working-directory: ./src
-        run: |
-          gulp rebuild
+        run: npm install --loglevel warn
 
+      - name: Rebuild Client-side Assets
+        working-directory: ./src
+        run: gulp rebuild
+
+      - name: Check Client-side Assets
+        working-directory: ./src
+        shell: pwsh
+        run: |
           git add . # To make line ending changes "disappear".
           $gitStatus = (git status --porcelain)
           if ($gitStatus)

.github/workflows/release-package.yml

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

.github/workflows/specflow.yml

@@ -0,0 +1,59 @@
+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

CREDITS.txt

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

README.md

@@ -1,16 +1,14 @@
 # Orchard
 
-Orchard is a free, open source, community-focused Content Management System built on the ASP.NET MVC platform.
+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.
 
-[![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)
+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)!
 
-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)
+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).
 
 ## About The Orchard Project
 
-#### Please visit our website at https://orchardproject.net for the most current information about this project.
+#### Please visit our website at https://orchardcore.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.
 
@@ -22,14 +20,14 @@ Our mission is to empower our users and foster a dedicated and diverse community
 
 ## Project Status
 
-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*).
+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*).
 
-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.orchardproject.net/en/latest/Documentation/Feature-roadmap/)
-* [Docs and designs/specs](https://docs.orchardproject.net)
+* [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/)
 
 ## How To Get Involved
 
@@ -42,11 +40,7 @@ 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)
-* [Participate in our gitter.im chatroom](https://gitter.im/OrchardCMS/Orchard)
-* [Submit a pull request](https://docs.orchardproject.net/en/latest/Documentation/Contributing-patches/)
+* [Join us on Discord](https://orchardcore.net/discord)
+* [Submit a pull request](https://docs.orchardcore.net/projects/O1/en/latest/Documentation/Contributing-patches/)
 * [Translate Orchard](https://crowdin.com/project/orchard-cms)
-* [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.
+* [Contribute modules and themes to our gallery](https://gallery.orchardproject.net)

src/Orchard.Core.Tests/App.config

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

src/Orchard.Core.Tests/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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]

src/Orchard.Specs/App.Config

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

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

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

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]

src/Orchard.Tests.Modules/App.config

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

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

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

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

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

src/Orchard.Tests.Modules/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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]

src/Orchard.Tests.Modules/packages.config

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

src/Orchard.Tests/App.config

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

src/Orchard.Tests/Orchard.Framework.Tests.csproj

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

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]

src/Orchard.Tests/packages.config

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

src/Orchard.WarmupStarter/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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 
 // Enable web application to call this assembly in Full Trust
 [assembly: AllowPartiallyTrustedCallers]

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]

src/Orchard.Web.Tests/app.config

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

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

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

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

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

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

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

src/Orchard.Web/Core/Containers/Styles/Web.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <system.webServer>
         <staticContent>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,74 +1,75 @@
-using System.Collections.Generic;
+using System;
+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.Localization;
-using Orchard.Mvc.Extensions;
-using Orchard.UI;
-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;
+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.Utility;
+using Orchard.Utility.Extensions;
 
 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 = contentManager;
-            _transactionManager = transactionManager;
+            _contentManager = orchardServices.ContentManager;
+            _transactionManager = orchardServices.TransactionManager;
+            _authorizer = orchardServices.Authorizer;
+            _notifier = orchardServices.Notifier;
             _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 = Services.ContentManager.Query("Menu").List().ToList()
+            var menus = _contentManager.Query("Menu").List().ToList()
                 .OrderBy(x => x.ContentManager.GetItemMetadata(x).DisplayText);
 
             if (!menus.Any()) {
-                if (!Services.Authorizer.Authorize(Permissions.ManageMenus, T("Not allowed to manage menus"))) {
+                if (!_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 => Services.Authorizer.Authorize(Permissions.ManageMenus, menu)).ToList();
+            var allowedMenus = menus.Where(menu => _authorizer.Authorize(Permissions.ManageMenus, menu)).ToList();
 
             if (!allowedMenus.Any()) {
                 return new HttpUnauthorizedResult();
@@ -87,7 +88,11 @@ 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();
@@ -100,7 +105,10 @@ namespace Orchard.Core.Navigation.Controllers {
 
         [HttpPost, ActionName("Index")]
         public ActionResult IndexPOST(IList<MenuItemEntry> menuItemEntries, int? menuId) {
-            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, (menuId.HasValue) ? _menuService.GetMenu(menuId.Value) : null, T("Couldn't manage the main menu")))
+            if (!_authorizer.Authorize(
+                Permissions.ManageMenus,
+                menuId.HasValue ? _menuService.GetMenu(menuId.Value) : null,
+                T("Couldn't manage the menu")))
                 return new HttpUnauthorizedResult();
 
             // See https://github.com/OrchardCMS/Orchard/issues/948
@@ -123,25 +131,19 @@ namespace Orchard.Core.Navigation.Controllers {
             return RedirectToAction("Index", new { menuId });
         }
 
-        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, ActionName("Edit")]
+        [FormValueRequired("submit.Delete")]
+        public ActionResult EditDeletePOST(int id) => Delete(id);
 
         [HttpPost]
         public ActionResult Delete(int id) {
-
             MenuPart menuPart = _menuService.Get(id);
             int? menuId = null;
-            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, (menuPart != null) ? _menuService.GetMenu(menuPart.Menu.Id) : null, T("Couldn't manage the main menu")))
+
+            if (!_authorizer.Authorize(
+                Permissions.ManageMenus,
+                menuPart == null ? null : _menuService.GetMenu(menuPart.Menu.Id),
+                T("Couldn't manage the menu")))
                 return new HttpUnauthorizedResult();
 
             if (menuPart != null) {
@@ -154,8 +156,9 @@ 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 unreference the menu
-                    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 remove the menu reference
+                    if (!menuPart.ContentItem.TypeDefinition.Settings.ContainsKey("Stereotype")
+                        || menuPart.ContentItem.TypeDefinition.Settings["Stereotype"] != "MenuItem") {
                         menuPart.Menu = null;
                     }
                     else {
@@ -163,31 +166,29 @@ 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 (!Services.Authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the main menu")))
+            if (!_authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the menu")))
                 return new HttpUnauthorizedResult();
 
             // create a new temporary menu item
-            var menuPart = Services.ContentManager.New<MenuPart>(id);
+            var contentItem = _contentManager.New(id);
+            var menuPart = contentItem.As<MenuPart>();
 
             if (menuPart == null)
                 return HttpNotFound();
 
             // load the menu
-            var menu = Services.ContentManager.Get(menuId);
+            var menu = _contentManager.Get(menuId);
 
             if (menu == null)
                 return HttpNotFound();
@@ -196,7 +197,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 = Services.ContentManager.BuildEditor(menuPart);
+                var model = _contentManager.BuildEditor(contentItem);
 
                 return View(model);
             }
@@ -206,32 +207,41 @@ namespace Orchard.Core.Navigation.Controllers {
                 }
 
                 Logger.Error(T("Creating menu item failed: {0}", exception.Message).Text);
-                Services.Notifier.Error(T("Creating menu item failed: {0}", exception.Message));
+                _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 (!Services.Authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the main menu")))
+            if (!_authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the menu")))
                 return new HttpUnauthorizedResult();
-            var menuPart = Services.ContentManager.New<MenuPart>(id);
+
+            var contentItem = _contentManager.New(id);
+            var menuPart = contentItem.As<MenuPart>();
+
             if (menuPart == null)
                 return HttpNotFound();
+
             // load the menu
-            var menu = Services.ContentManager.Get(menuId);
+            var menu = _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));
-            Services.ContentManager.Create(menuPart);
+
+            var model = _contentManager.UpdateEditor(contentItem, this);
+
             if (!ModelState.IsValid) {
-                Services.TransactionManager.Cancel();
+                _transactionManager.Cancel();
                 return View(model);
             }
-            Services.Notifier.Information(T("Your {0} has been added.", menuPart.TypeDefinition.DisplayName));
+
+            _notifier.Information(T("Your {0} has been added.", contentItem.TypeDefinition.DisplayName));
+
             return this.RedirectLocal(returnUrl, () => RedirectToAction("Index"));
         }
 
@@ -241,7 +251,7 @@ namespace Orchard.Core.Navigation.Controllers {
             if (contentItem == null)
                 return HttpNotFound();
 
-            if (!Services.Authorizer.Authorize(Permissions.ManageMenus, contentItem.Content.MenuPart.Menu, T("Couldn't manage the main menu")))
+            if (!_authorizer.Authorize(Permissions.ManageMenus, contentItem.Content.MenuPart.Menu, T("Couldn't manage the menu")))
                 return new HttpUnauthorizedResult();
 
             var model = _contentManager.BuildEditor(contentItem);
@@ -252,17 +262,78 @@ 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)
+                if (!contentItem.Has<IPublishingControlAspect>()
+                    && !contentItem.TypeDefinition.Settings.GetModel<ContentTypeSettings>().Draftable
+                    && contentItem.IsPublished())
                     _contentManager.Publish(contentItem);
             });
         }
-        private ActionResult EditPOST(int id, string returnUrl, Action<ContentItem> conditionallyPublish) {
-            var contentItem = _contentManager.Get(id, VersionOptions.DraftRequired);
 
-            if (contentItem == null)
+        [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 (!Services.Authorizer.Authorize(Permissions.ManageMenus, contentItem.Content.MenuPart.Menu, T("Couldn't manage the main menu")))
+            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>();
+
+            if (menuPart == null)
+                return HttpNotFound();
+
+            if (!_authorizer.Authorize(Permissions.ManageMenus, menuPart.Menu, T("Couldn't manage the menu")))
                 return new HttpUnauthorizedResult();
 
             string previousRoute = null;
@@ -289,11 +360,22 @@ namespace Orchard.Core.Navigation.Controllers {
                 returnUrl = Url.ItemDisplayUrl(contentItem);
             }
 
-            Services.Notifier.Information(string.IsNullOrWhiteSpace(contentItem.TypeDefinition.DisplayName)
-                ? T("Your content has been saved.")
-                : T("Your {0} has been saved.", contentItem.TypeDefinition.DisplayName));
+            _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));
 
-            return this.RedirectLocal(returnUrl, () => RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } }));
+            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());
         }
     }
 }

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

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

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

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

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

@@ -1,4 +1,6 @@
 @model NavigationManagementViewModel
+
+@using Orchard.ContentManagement;
 @using Orchard.Core.Navigation.ViewModels;
 @using Orchard.Utility.Extensions;
 
@@ -115,8 +117,21 @@
                     <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" />
-                        @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" })
+                        @{
+                            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" })
                     </span>
                 </div>
             

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -119,6 +119,7 @@
     <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" />
@@ -318,6 +319,8 @@
     <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" />
@@ -610,9 +613,16 @@
     <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>

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

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

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

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

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

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

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

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

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

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

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

src/Orchard.Web/Core/Web.config

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

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

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

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

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

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

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

src/Orchard.Web/Modules/Lucene/Web.config

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

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.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    <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>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <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 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>
     <Reference Include="System.Numerics" />
-    <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 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>
-    <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 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>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.ApplicationServices" />
@@ -231,4 +231,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

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

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

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

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

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

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

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.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>
+  <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>

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 Description: Maps friendly urls to specific module actions.
 FeatureDescription: Maps friendly urls to specific module actions.
 Category: Content

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

src/Orchard.Web/Modules/Orchard.Alias/Web.config

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

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 Description: Provides anti-spam services to protect your content from malicious submissions.
 Features:
     Orchard.AntiSpam:

src/Orchard.Web/Modules/Orchard.AntiSpam/Orchard.AntiSpam.csproj

@@ -59,8 +59,8 @@
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -250,4 +250,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

src/Orchard.Web/Modules/Orchard.AntiSpam/Web.config

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

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

@@ -5,5 +5,5 @@
   <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="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
-</packages>
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+</packages>

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 Description: The ArchiveLater module introduces scheduled archiving functionality.
 FeatureDescription: Scheduled archiving.
 Category: Content

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

src/Orchard.Web/Modules/Orchard.ArchiveLater/Web.config

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

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 Description: Provides a log for recording and viewing back-end changes.
 Features:
     Orchard.AuditTrail:

src/Orchard.Web/Modules/Orchard.AuditTrail/Orchard.AuditTrail.csproj

@@ -61,8 +61,8 @@
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <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>

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

src/Orchard.Web/Modules/Orchard.AuditTrail/Web.config

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

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

@@ -6,7 +6,7 @@
   <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="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="NHibernate" version="4.1.2.4000" targetFramework="net48" />
   <package id="XMLDiffPatch" version="1.0.8.28" targetFramework="net48" />
-</packages>
+</packages>

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 Description: Description for the module
 Features:
     Orchard.Autoroute:

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

src/Orchard.Web/Modules/Orchard.Autoroute/Web.config

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

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
 Features:
     Orchard.Azure.MediaServices:

src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj

@@ -76,14 +76,14 @@
     <Reference Include="Microsoft.Data.Services.Client, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.8.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.2.4\lib\net451\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.IdentityModel.JsonWebTokens.5.7.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Logging, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Logging.5.2.4\lib\net451\Microsoft.IdentityModel.Logging.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Logging.5.7.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Tokens.5.2.4\lib\net451\Microsoft.IdentityModel.Tokens.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.IdentityModel.Tokens.5.7.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Practices.TransientFaultHandling.Core, Version=5.1.1209.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll</HintPath>
@@ -109,8 +109,8 @@
     <Reference Include="Microsoft.WindowsAzure.Storage, Version=5.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\WindowsAzure.Storage.5.0.2\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <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>
@@ -121,8 +121,8 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.IdentityModel.Tokens.Jwt.5.2.4\lib\net451\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.IdentityModel.Tokens.Jwt.5.7.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Spatial, Version=5.8.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config

@@ -51,7 +51,7 @@
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-                       <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+                       <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
                 </dependentAssembly>
                 <dependentAssembly>
                        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />

src/Orchard.Web/Modules/Orchard.Azure.MediaServices/packages.config

@@ -11,15 +11,15 @@
   <package id="Microsoft.Data.Edm" version="5.8.4" targetFramework="net48" />
   <package id="Microsoft.Data.OData" version="5.8.4" targetFramework="net48" />
   <package id="Microsoft.Data.Services.Client" version="5.8.4" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.2.4" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.Logging" version="5.2.4" targetFramework="net48" />
-  <package id="Microsoft.IdentityModel.Tokens" version="5.2.4" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="5.7.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Logging" version="5.7.0" targetFramework="net48" />
+  <package id="Microsoft.IdentityModel.Tokens" version="5.7.0" targetFramework="net48" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.1.0" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="NHibernate" version="4.1.2.4000" targetFramework="net48" />
   <package id="Orchard.WindowsAzure.Diagnostics" version="2.7.0.0" targetFramework="net48" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="5.2.4" targetFramework="net48" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="5.7.0" targetFramework="net48" />
   <package id="System.Spatial" version="5.8.4" targetFramework="net48" />
   <package id="TransientFaultHandling.Core" version="5.1.1209.1" targetFramework="net48" />
   <package id="windowsazure.mediaservices" version="3.4.0.0" targetFramework="net48" />

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 Description: Provides a set of Orchard service implementations targeting Microsoft Azure services.
 Category: Hosting
 Features:

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

@@ -100,8 +100,8 @@
     <Reference Include="Microsoft.WindowsFabric.Data.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Caching.2.4.0.0\lib\net40-full\Microsoft.WindowsFabric.Data.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <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>
@@ -218,4 +218,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

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

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

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

@@ -12,9 +12,9 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
   <package id="Microsoft.WindowsAzure.Caching" version="2.4.0.0" targetFramework="net48" />
   <package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.1.0" targetFramework="net48" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="NHibernate" version="4.1.2.4000" targetFramework="net48" />
   <package id="Orchard.WindowsAzure.ServiceRuntime" version="2.7.0.0" targetFramework="net48" />
   <package id="System.Spatial" version="5.8.4" targetFramework="net48" />
   <package id="WindowsAzure.Storage" version="5.0.2" targetFramework="net48" />
-</packages>
+</packages>

src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Reflection;
 using System.Web.Mvc;
 using Orchard.Blogs.Extensions;
 using Orchard.Blogs.Models;
@@ -138,6 +137,12 @@ 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) {
@@ -156,6 +161,12 @@ 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)

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 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

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

src/Orchard.Web/Modules/Orchard.Blogs/Web.config

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

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.3
-OrchardVersion: 1.10.3
+Version: 1.10.4
+OrchardVersion: 1.10.4
 Description: Provides an API to cache business data.
 Features:
     Orchard.Caching:

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

src/Orchard.Web/Modules/Orchard.Caching/Services/ICacheStorageProvider.cs

@@ -8,4 +8,8 @@ namespace Orchard.Caching.Services {
         void Remove(string key);
         void Clear();
     }
+
+    public interface ICacheStorageProviderWithKeyPrefix : ICacheStorageProvider {
+        void Clear(string key);
+    }
 }

src/Orchard.Web/Modules/Orchard.Caching/Web.config

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

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.3")]
-[assembly: AssemblyFileVersion("1.10.3")]
+[assembly: AssemblyVersion("1.10.4")]
+[assembly: AssemblyFileVersion("1.10.4")]
 

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.3
+OrchardVersion: 1.10.4
 Description: Description for the module
 Features:
     $$ModuleName$$:

src/Orchard.Web/Modules/Orchard.CodeGeneration/CodeGenerationTemplates/ModuleRootWebConfig.txt

@@ -47,7 +47,7 @@
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
                 <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
-                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+                <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
                 <assemblyIdentity name="NHibernate" publicKeyToken="AA95F207798DFDB4" culture="neutral"/>