OrchardCMS · TFleury · Dec 28, 2015 · Dec 16, 2015 · Dec 22, 2015 · Dec 22, 2015
diff --git a/.gitignore b/.gitignore
@@ -188,3 +188,4 @@ src/Orchard.Azure/Orchard.Azure.CloudService/Staging/
 #enable all /lib artifacts
 !lib/**/*.*
 */.vs/*
+src/Rebracer.xml
diff --git a/CREDITS.txt b/CREDITS.txt
@@ -2,12 +2,6 @@ Orchard Project - Copyright .NET Foundation
 
 Orchard includes works distributed under the licenses listed below. The full text for most of the licenses listed below can be found in the LICENSE.txt file accompanying each work. The original copyright notices have been preserved within the respective files and or packages. Please refer to the specific files and/or packages for more detailed information about the authors, copyright notices, and licenses.
 
-Antlr
------
-Website:      http://www.antlr.org/
-Copyright:    Copyright (c) 2003-2008 Terence Parr
-License:      New BSD
-
 ASP.NET MVC
 -----
 Website:      http://aspnet.codeplex.com/wikipage?title=MVC&referringTitle=Home
@@ -28,18 +22,18 @@ Website:      http://code.google.com/p/autofac/
 Copyright:    Copyright (c) 2007-2008 Autofac Contributors
 License:      http://code.google.com/p/autofac/source/browse/trunk/contrib/AutofacContrib%20License.txt
 
+CamanJS
+-----
+Website:      http://camanjs.com/
+Copyright:    Copyright (c) 2010-2015, Ryan LeFevre
+License:      https://raw.githubusercontent.com/meltingice/CamanJS/3dd24d1bba3aed91d7072d1039e488a3af4c394b/LICENSE
+
 Castle
 -----
 Website:      http://www.castleproject.org/container/index.html
 Copyright:    Copyright (c) 2004-2009 Castle Project
 License:      Apache Software Foundation License 2.0
 
-Clay
-----
-Website:      http://clay.codeplex.com/
-Copyright:    Copyright (c) 2010 Louis Dejardin
-License:      MS-PL
-
 CodeMirror
 ----------
 Website:      http://codemirror.net/2/
@@ -167,6 +161,12 @@ Website:      http://flesler.blogspot.com
 Copyright:    Copyright (c) 2007-2009 Ariel Flesler
 License:      MIT
 
+Json.NET
+-----
+Website:      http://www.newtonsoft.com/json
+Copyright:    Copyright (c) 2007 James Newton-King
+License:      MIT - https://github.com/JamesNK/Newtonsoft.Json/blob/master/LICENSE.md
+
 jsPlumb
 -----
 Website:      http://jsplumb.org
@@ -191,6 +191,12 @@ Website:      http://incubator.apache.org/projects/lucene.net.html
 Copyright:    Copyright (c) 2009 Apache Software Foundation
 License:      Apache Software Foundation License 2.0
 
+MarkdownSharp
+-----
+Website:     http://code.google.com/p/markdownsharp/
+Copyright:   Copyright (c) 2009-2011 Jeff Atwood
+License:     MIT
+
 Mono Class Library
 -----
 Website:      http://www.mono-project.com/The_Class_Library
@@ -206,9 +212,9 @@ License:      New BSD
 MySQL Connectors
 -----
 Copyright:    Copyright (c) 2004, 2011, Oracle and/or its affiliates
-License:      GNU GENERAL PUBLIC LICENSE Version 2; Oracle�s Free and Open Source Software ("FOSS") License Exception
+License:      GNU GENERAL PUBLIC LICENSE Version 2; Oracle�s Free and Open Source Software ("FOSS") License Exception
 
-In order to comply with Section 2(a) of the FOSS License Exception, .NET Foundation hereby offers any recipient of this package a machine-readable copy of the corresponding source code for Oracle's MySQL Client Libraries upon written demand.� This offer is good for three years.
+In order to comply with Section 2(a) of the FOSS License Exception, .NET Foundation hereby offers any recipient of this package a machine-readable copy of the corresponding source code for Oracle's MySQL Client Libraries upon written demand.� This offer is good for three years.
 
 NHibernate, NHibernate Linq
 -----

diff --git a/CleanSolution.ps1 b/CleanSolution.ps1
@@ -0,0 +1,43 @@
+<#
+.Synopsis
+   Cleans the solution: removes all bin and obj folders under src, deletes Dependencies, cache.dat and all mappings.bin files from App_Data.
+   Just run the script where it is, don't move or run elsewhere.
+
+.EXAMPLE
+	PS> .\CleanSolution.ps1
+
+#>
+
+# Deleting bin and obj folders.
+$currentPath = (Get-Item -Path ".\").FullName
+# Add relative file paths here what you want to keep.
+$whiteList = @("\src\Orchard.Azure\Orchard.Azure.CloudService\Orchard.Azure.WebContent\Bin\Startup\SetIdleTimeout.cmd")
+# Also add the bin/obj folder's path of the paths in the whiteList here. This is needed for performance reasons, the script will run faster this way.
+$whiteListFolders = @("\src\Orchard.Azure\Orchard.Azure.CloudService\Orchard.Azure.WebContent\Bin")
+
+Get-ChildItem -Path ($currentPath + "\src\") -Recurse | 
+Where-Object { $PSItem.PSIsContainer -and ( $PSItem.Name -eq "bin" -or $PSItem.Name -eq "obj") } | 
+ForEach-Object {
+	if($whiteListFolders.Contains($PSItem.FullName.Substring($currentPath.Length)))
+	{
+		Get-ChildItem -Path $PSItem.FullName -Recurse -File |
+		ForEach-Object {
+			if(!$whiteList.Contains($PSItem.FullName.Substring($currentPath.Length)))
+			{
+				Remove-Item $PSItem.FullName -Force
+			}
+		}
+	}
+	else
+	{
+		Remove-Item $PSItem.FullName -Recurse -Force
+	}
+}
+
+# Deleting Dependencies and cache.dat from App_Data.
+Remove-Item -Path ($currentPath + "\src\Orchard.Web\App_Data\Dependencies\") -Recurse -Force
+Remove-Item -Path ($currentPath + "\src\Orchard.Web\App_Data\cache.dat") -Force
+
+# Deleting all mappings.bin files from App_Data.
+Get-ChildItem -Path ($currentPath + "\src\Orchard.Web\App_Data\Sites") -Recurse -Include "mappings.bin" |
+Remove-Item -Force
diff --git a/ClickToBuild.cmd b/ClickToBuild.cmd
@@ -1,4 +1,8 @@
-FOR %%b in ( 
+FOR %%b in (
+       "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat"
+       "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
+       "%ProgramFiles%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" 
+
        "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat"
        "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"
        "%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" 
@@ -23,6 +27,8 @@ SET project=%2
 IF "%target%" == "" SET target=Build
 IF "%project%" =="" SET project=Orchard.proj
 
+lib\nuget\nuget.exe restore .\src\Orchard.sln
+
 msbuild /t:%target% %project%
 
 pause

diff --git a/Orchard.proj b/Orchard.proj
@@ -33,7 +33,8 @@
     <Version>$(BUILD_NUMBER)</Version>
   </PropertyGroup>
 
-  <Import Project="$(LibFolder)\msbuild\MSBuild.Community.Tasks.Targets"/>
+  <Import Project="$(LibFolder)\msbuildtasks\MSBuild.Community.Tasks.Targets"/>
+  <Import Project="$(LibFolder)\slowcheetah\SlowCheetah.Transforms.targets"/>
 
   <!-- Coordinating Targets -->
 
@@ -52,7 +53,6 @@
 
   <Target Name="FullBuild">
     <CallTarget Targets="Clean"/>
-    <CallTarget Targets="TypeScript"/>
     <CallTarget Targets="Compile"/>
     <CallTarget Targets="Test"/>
     <CallTarget Targets="Package"/>
@@ -110,8 +110,8 @@
     <RemoveDir Directories="$(BuildFolder)" ContinueOnError="true"/>
     <RemoveDir Directories="$(ArtifactsFolder)" />
   </Target>
-
-  <Target Name ="Compile">
+  
+  <Target Name="Compile">
     <!-- Compile to "OutputFolder" -->
     <MSBuild
       Projects="$(SrcFolder)\Orchard.sln"
@@ -130,18 +130,6 @@
       Properties="Configuration=$(Configuration);OutputPath=$(MsBuildTasksFolder)" />
   </Target>
 
-  <Target Name="TypeScript" DependsOnTargets="CompileMsBuildTasks">
-    <ItemGroup>
-      <TypeScriptSources Include="$(SrcFolder)\**\Scripts\**\*.ts"/>
-    </ItemGroup>
-    <CompileTypeScriptFiles
-      InputFiles="@(TypeScriptSources)"
-      CompilerPath="$(LibFolder)\typescript\tsc.exe"
-      CompilerOptions="--target ES5">
-      <Output TaskParameter="OutputFiles" ItemName="Content" />
-    </CompileTypeScriptFiles>
-  </Target>
-
   <!-- Testing -->
 
   <Target Name ="Test">
@@ -174,13 +162,10 @@
 
   <!-- Packaging (Stage) -->
 
-  <UsingTask AssemblyFile="$(LibFolder)\slowcheetah\SlowCheetah.Xdt.dll" TaskName="SlowCheetah.Xdt.TransformXml" />
-
   <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FilterModuleBinaries" />
   <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.FileUpdateLines" />
   <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.ValidateExtensionProjectFiles" />
   <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.XmlDelete" />
-  <UsingTask AssemblyFile="$(MsBuildTasksFolder)\MSBuild.Orchard.Tasks.dll" TaskName="MSBuild.Orchard.Tasks.CompileTypeScriptFiles" />
 
   <Target Name="Package-Stage" DependsOnTargets="Compile">
     <CallTarget Targets="CompileMsBuildTasks"/>
@@ -302,9 +287,12 @@
       <!--<MsDeploy-Folder-Input Include="$(StageFolder)\**\*" Exclude="$(StageFolder)\**\bin\**\*.pdb;$(StageFolder)\**\bin\**\*.xml" />-->
 
       <MsDeploy-Exclude-Modules Include="
+        $(StageFolder)\**\Modules\Orchard.CustomForms\**;
+        $(StageFolder)\**\Modules\Orchard.jQuery\**;
         $(StageFolder)\**\Modules\Orchard.Media\**;
         $(StageFolder)\**\Modules\Orchard.MediaPicker\**;
         $(StageFolder)\**\Modules\Orchard.Rules\**;
+        $(StageFolder)\**\Modules\Orchard.TaskLease\**;
         " />
 
       <MsDeploy-Folder-Input Include="$(StageFolder)\**\*" Exclude="$(StageFolder)\**\bin\**\*.xml;$(StageFolder)\**\obj\**\*;@(MsDeploy-Exclude-Modules)" />
@@ -335,9 +323,11 @@
     <ItemGroup>
 
       <Zip-Exclude Include="
+        $(MSBuildProjectDirectory)\src\**\packages\**\*;
         $(MSBuildProjectDirectory)\src\**\bin\**\*;
         $(MSBuildProjectDirectory)\src\**\obj\**\*;
         $(MSBuildProjectDirectory)\**\App_Data\**\*;
+        $(MSBuildProjectDirectory)\**\node_modules\**\*;
         $(MSBuildProjectDirectory)\**\_ReSharper*\**\*;
         $(MSBuildProjectDirectory)\**\*.sln.cache;
         $(MSBuildProjectDirectory)\**\*.suo;
@@ -350,7 +340,7 @@
 
       <Zip-Stage Include="$(StageFolder)\**\*" />
 
-      <Zip-MsDeploy Include="$(MsDeployFolder)\**\*" />
+      <Zip-MsDeploy Include="$(MsDeployFolder)\**\*" Exclude="$(MSBuildProjectDirectory)\**\bin\**\*.pdb;"/>
 
       <Zip-Source Include="
         $(MSBuildProjectDirectory)\lib\**\*;

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Orchard is a free, open source, community-focused Content Management System buil
 
 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://ms.portal.azure.com/#create/OutercurveFoundation.OrchardCMS.0.5.9)
+[![Deploy to Azure](https://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/OutercurveFoundation.OrchardCMS.1.0.4)
 
 ## About The Orchard Project
 
@@ -51,4 +51,4 @@ There are many ways you can [contribute to Orchard](http://orchardproject.net/co
 
 ## The Future Of Orchard CMS: Orchard 2
 
-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 2 is the next generation of Orchard releases that is based on [ASP.NET vNext](http://www.asp.net/vnext). Just like the current Orchard project, it's fully [open-source and is publicly available on GitHub](https://github.com/OrchardCMS/Orchard2). Orchard 2 (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 of Orchard.
+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 2 is the next generation of Orchard releases that is based on [ASP.NET vNext](http://www.asp.net/vnext). Just like the current Orchard project, it's fully [open-source and is publicly available on GitHub](https://github.com/OrchardCMS/Orchard2). Orchard 2 (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 of Orchard.
diff --git a/lib/aspnetmvc/Microsoft.Web.Infrastructure.dll b/lib/aspnetmvc/Microsoft.Web.Infrastructure.dll
diff --git a/lib/aspnetmvc/Microsoft.Web.Infrastructure.xml b/lib/aspnetmvc/Microsoft.Web.Infrastructure.xml
diff --git a/lib/aspnetmvc/System.Web.Helpers.dll b/lib/aspnetmvc/System.Web.Helpers.dll