Merge remote-tracking branch 'origin/7.3.8' into dev-v7

Conflicts:
	src/Umbraco.Web.UI/packages.config

README.md

@@ -15,11 +15,11 @@ If you're interested in making changes to Belle make sure to read the [Belle Rea
 
 **More than 177,000 sites trust Umbraco** 
 
-For the first time on the Microsoft platform a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developers dream and your users will love it too. 
+For the first time on the Microsoft platform, there is a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. It's a developer's dream and your users will love it too. 
 
-Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)) you can be sure that the technology is proven, stable and scales.  
+Used by more than 177,000 active websites including [http://daviscup.com](http://daviscup.com), [http://heinz.com](http://heinz.com), [http://peugeot.com](http://peugeot.com), [http://www.hersheys.com/](http://www.hersheys.com/) and **The Official ASP.NET and IIS.NET website from Microsoft** ([http://asp.net](http://asp.net) / [http://iis.net](http://iis.net)), you can be sure that the technology is proven, stable and scales.  
 
-To view more examples please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
+To view more examples, please visit [http://umbraco.com/why-umbraco/#caseStudies](http://umbraco.com/why-umbraco/#caseStudies)
 
 ## Downloading ##
 
@@ -35,6 +35,6 @@ If you want to contribute back to Umbraco you should check out our [guide to con
 
 ## Found a bug? ##
 
-Another way you can contribute to Umbraco is by providing issue reports, for information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
+Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](http://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
 
-To view existing issues please visit [http://issues.umbraco.org](http://issues.umbraco.org)
+To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).

build/Build.proj

@@ -175,8 +175,8 @@
     <!-- Copy SQL CE -->
     <ItemGroup>
       <SQLCE4Files
-     Include="..\src\packages\SqlServerCE.4.0.0.0\**\*.*"
-     Exclude="..\src\packages\SqlServerCE.4.0.0.0\lib\**\*;..\src\packages\SqlServerCE.4.0.0.0\**\*.nu*"
+     Include="..\src\packages\SqlServerCE.4.0.0.1\**\*.*"
+     Exclude="..\src\packages\SqlServerCE.4.0.0.1\lib\**\*;..\src\packages\SqlServerCE.4.0.0.1\**\*.nu*"
 		/>
     </ItemGroup>
 

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -32,8 +32,8 @@
       <dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
       <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
       <dependency id="Examine" version="[0.1.68, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.3.2, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.5.1, 5.0.0)" />
+      <dependency id="ImageProcessor" version="[2.3.3, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.5.3, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 2.0.0)" />
       <dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />	  
       <dependency id="Markdown" version="[1.14.4, 2.0.0)" />	  

build/NuSpecs/UmbracoCms.nuspec

@@ -16,8 +16,8 @@
     <tags>umbraco</tags>
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[6.0.5, 7.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.0-RC1, 3.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.0, 4.0.0)" />
     </dependencies>
   </metadata>
   <files>
@@ -37,7 +37,6 @@
     <file src="tools\Readme.txt" target="tools\Readme.txt" />
     <file src="tools\ReadmeUpgrade.txt" target="tools\ReadmeUpgrade.txt" />
     <file src="tools\Web.config.install.xdt" target="Content\Web.config.install.xdt" />
-    <file src="tools\Web.config.uninstall.xdt" target="Content\Web.config.uninstall.xdt" />
     <file src="tools\applications.config.install.xdt" target="Content\config\applications.config.install.xdt" />
     <file src="tools\ClientDependency.config.install.xdt" target="Content\config\ClientDependency.config.install.xdt" />
     <file src="tools\Dashboard.config.install.xdt" target="Content\config\Dashboard.config.install.xdt" />

build/NuSpecs/tools/Web.config.install.xdt

@@ -7,8 +7,8 @@
     <section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="SetAttributes(type,requirePermission)" />
 
     <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
-		<section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-	</sectionGroup>
+      <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+    </sectionGroup>
     <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
     <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing">
       <section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
@@ -22,7 +22,7 @@
   <appSettings>
     <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key)" xdt:Transform="InsertIfMissing" />
   </appSettings>
-  
+
   <umbracoConfiguration xdt:Transform="InsertIfMissing">
     <settings configSource="config\umbracoSettings.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
     <BaseRestExtensions configSource="config\BaseRestExtensions.config" xdt:Locator="Match(configSource)" xdt:Transform="InsertIfMissing" />
@@ -37,7 +37,7 @@
     <DbProviderFactories xdt:Transform="InsertIfMissing">
       <remove invariant="System.Data.SqlServerCe.4.0" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
       <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(invariant,description,type)" />
-      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />	  
+      <remove invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
       <add invariant="MySql.Data.MySqlClient" xdt:Locator="Match(invariant)" xdt:Transform="Remove" />
       <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="InsertIfMissing" />
       <add invariant="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" xdt:Locator="Match(invariant)" xdt:Transform="SetAttributes(type)" />
@@ -48,13 +48,15 @@
   <system.web xdt:Transform="InsertIfMissing" />
   <system.web>
     <siteMap xdt:Transform="Remove" />
-	<siteMap xdt:Transform="InsertIfMissing">
+    <siteMap xdt:Transform="InsertIfMissing">
       <providers xdt:Transform="InsertIfMissing">
         <remove name="MySqlSiteMapProvider"  xdt:Transform="InsertIfMissing" />
       </providers>
-      </siteMap>	
+    </siteMap>
     <httpRuntime xdt:Transform="InsertIfMissing" />
-    <httpRuntime targetFramework="4.5" maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(targetFramework,fcnMode,maxRequestLength)" />
+    <httpRuntime maxRequestLength="51200" fcnMode="Single" xdt:Transform="SetAttributes(fcnMode,maxRequestLength)" />
+    <httpRuntime targetFramework="4.5" xdt:Locator="Condition(count(@targetFramework) != 1)" xdt:Transform="SetAttributes(targetFramework)" />
+    
     <membership defaultProvider="DefaultMembershipProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove" />
     <roleManager defaultProvider="DefaultRoleProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>
     <profile defaultProvider="DefaultProfileProvider" xdt:Locator="Match(defaultProvider)" xdt:Transform="Remove"/>>
@@ -63,8 +65,7 @@
     <compilation>
       <assemblies xdt:Transform="InsertIfMissing" />
       <assemblies>
-        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)"
-    xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
         <add assembly="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
         <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
         <add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
@@ -78,6 +79,56 @@
         <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
         <add assembly="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
         <add assembly="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <add assembly="System.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Collections.Concurrent, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ComponentModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ComponentModel.Annotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ComponentModel.EventBasedAsync, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Diagnostics.Contracts, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Diagnostics.Debug, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Diagnostics.Tools, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Diagnostics.Tracing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Dynamic.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Globalization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.IO, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Linq.Expressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Linq.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Linq.Queryable, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Net.NetworkInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Net.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Net.Requests, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ObjectModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Reflection, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Reflection.Emit, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Reflection.Emit.ILGeneration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Reflection.Emit.Lightweight, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Reflection.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Reflection.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Resources.ResourceManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Runtime.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Runtime.InteropServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Runtime.InteropServices.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Runtime.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Runtime.Serialization.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Runtime.Serialization.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Runtime.Serialization.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Security.Principal, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ServiceModel.Duplex, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ServiceModel.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ServiceModel.NetTcp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ServiceModel.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.ServiceModel.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Text.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Text.Encoding.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Text.RegularExpressions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Threading, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Threading.Tasks, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Threading.Tasks.Parallel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Xml.ReaderWriter, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Xml.XDocument, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
+        <add assembly="System.Xml.XmlSerializer, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" xdt:Locator="Match(assembly)" xdt:Transform="InsertIfMissing" />
       </assemblies>
     </compilation>
 
@@ -86,11 +137,113 @@
         <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
         <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
         <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
+        <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="Remove" />
       </assemblies>
+    </compilation>
+    <compilation>
       <assemblies>
         <remove assembly="System.Web.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
         <remove assembly="System.Net.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
         <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Collections" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Collections.Concurrent" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ComponentModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ComponentModel.Annotations" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ComponentModel.EventBasedAsync" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Diagnostics.Contracts" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Diagnostics.Debug" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Diagnostics.Tools" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Diagnostics.Tracing" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Dynamic.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Globalization" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.IO" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Linq" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Linq.Expressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Linq.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Linq.Queryable" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Net.NetworkInformation" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Net.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Net.Requests" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ObjectModel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Reflection" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Reflection.Emit" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Reflection.Emit.ILGeneration" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Reflection.Emit.Lightweight" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Reflection.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Reflection.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Resources.ResourceManager" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Runtime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Runtime.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Runtime.InteropServices" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Runtime.InteropServices.WindowsRuntime" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Runtime.Numerics" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Runtime.Serialization.Json" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Runtime.Serialization.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Runtime.Serialization.Xml" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Security.Principal" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ServiceModel.Duplex" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ServiceModel.Http" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ServiceModel.NetTcp" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ServiceModel.Primitives" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.ServiceModel.Security" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Text.Encoding" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Text.Encoding.Extensions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Text.RegularExpressions" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Threading" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Threading.Tasks" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Threading.Tasks.Parallel" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Xml.ReaderWriter" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Xml.XDocument" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
+        <remove assembly="System.Xml.XmlSerializer" xdt:Locator="Match(assembly)" xdt:Transform="InsertBefore(/configuration/system.web/compilation/assemblies/add)" />
       </assemblies>
     </compilation>
 
@@ -125,6 +278,8 @@
       <add name="umbracoRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
       <add name="viewstateMoverModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
       <add name="umbracoBaseRequestModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
+      <!-- Note, we're removing the one that starts with a space here, don't correct it -->
+      <!-- This to fix a quirk we for a lot of releases where we added it with the space by default -->
       <add name=" UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
       <add name="UmbracoModule" type="Umbraco.Web.UmbracoModule,umbraco" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
     </modules>
@@ -149,16 +304,14 @@
         <requestLimits maxAllowedContentLength="52428800" xdt:Transform="InsertIfMissing" />
       </requestFiltering>
     </security>
-    
-  </system.webServer>
 
-  <system.codedom xdt:Transform="Remove" />
+  </system.webServer>
 
   <runtime xdt:Transform="InsertIfMissing" />
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" xdt:Transform="InsertIfMissing" />
   </runtime>
-  
+
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='HtmlAgilityPack')" xdt:Transform="Remove" />
@@ -171,7 +324,7 @@
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.OAuth')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.Owin.Security.Cookies')" xdt:Transform="Remove" />
-	  <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
     </assemblyBinding>
   </runtime>
 
@@ -180,7 +333,7 @@
       <dependentAssembly>
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
-      </dependentAssembly>	
+      </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
@@ -196,7 +349,7 @@
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.WebPages.Razor" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>		  
+      </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
@@ -208,16 +361,16 @@
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>	  
+      </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>	  
+      </dependentAssembly>
       <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
-      </dependentAssembly>	  	 
-	  <dependentAssembly xdt:Transform="Insert">
+      </dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
@@ -225,19 +378,19 @@
   </runtime>
 
   <system.web.webPages.razor xdt:Transform="Remove" />
-  
+
   <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
   <location path="umbraco" xdt:Locator="Match(path)">
     <system.webServer xdt:Transform="InsertIfMissing">
-	  <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
     </system.webServer>
   </location>
-  
+
   <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="InsertIfMissing" />
   <location path="App_Plugins" xdt:Locator="Match(path)">
     <system.webServer xdt:Transform="InsertIfMissing">
-	  <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
+      <urlCompression doStaticCompression="false" doDynamicCompression="false" dynamicCompressionBeforeCache="false" xdt:Transform="SetAttributes(doStaticCompression,doDynamicCompression,dynamicCompressionBeforeCache)" />
     </system.webServer>
   </location>
-  
+
 </configuration>

build/NuSpecs/tools/Web.config.uninstall.xdt

@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-  <configSections xdt:Transform="InsertIfMissing" />
-  <configSections>
-    <section name="BaseRestExtensions" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <section name="FileSystemProviders" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <section name="ExamineLuceneIndexSets" type="Examine.LuceneEngine.Config.IndexSets, Examine" requirePermission="false" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="applicationSettings" xdt:Locator="Match(name)">
-      <section name="umbraco.presentation.Properties.Settings" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </sectionGroup>
-    <sectionGroup name="system.web.webPages.razor" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <sectionGroup name="umbracoConfiguration" xdt:Locator="Match(name)" xdt:Transform="Remove"/>
-  </configSections>
-
-  <ExamineLuceneIndexSets xdt:Transform="Remove"/>
-  <urlrewritingnet xdt:Transform="Remove"/>
-  <microsoft.scripting xdt:Transform="Remove"/>
-  <clientDependency xdt:Transform="Remove"/>
-  <Examine xdt:Transform="Remove"/>
-  <log4net xdt:Transform="Remove"/>
-
-  <appSettings>
-    <add key="umbracoConfigurationStatus" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="umbracoReservedUrls" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="umbracoReservedPaths" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="umbracoPath" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="umbracoHideTopLevelNodeFromPath" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="umbracoUseDirectoryUrls" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="umbracoTimeOutInMinutes" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="umbracoDefaultUILanguage" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="umbracoUseSSL" xdt:Locator="Match(key)" xdt:Transform="Remove"/>
-    <add key="owin:appStartup" value="UmbracoDefaultOwinStartup" xdt:Locator="Match(key,value)" xdt:Transform="Remove" />
-  </appSettings>
-
-  <umbracoConfiguration xdt:Transform="Remove"/>
-  <FileSystemProviders xdt:Transform="Remove" />
-  <BaseRestExtensions xdt:Transform="Remove" />
-  <connectionStrings>
-    <remove name="umbracoDbDSN" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    <add name="umbracoDbDSN" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-  </connectionStrings>
-
-  <system.web>
-    <pages>
-      <controls>
-        <add tagPrefix="umbraco" xdt:Locator="Match(tagPrefix)" xdt:Transform="Remove" />
-      </controls>
-    </pages>
-    <httpModules>
-      <add name="UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </httpModules>
-    <httpHandlers>
-      <add type="umbraco.presentation.channels.api, umbraco" xdt:Locator="Match(type)" xdt:Transform="Remove" />
-      <add type="umbraco.presentation.channels.wordApi, umbraco" xdt:Locator="Match(type)" xdt:Transform="Remove" />
-    </httpHandlers>
-    <compilation>
-      <buildProviders>
-        <add type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" xdt:Locator="Match(type)" xdt:Transform="Remove" />
-        <add type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" xdt:Locator="Match(type)" xdt:Transform="Remove" />
-        <add type="umbraco.MacroEngines.RazorBuildProvider, umbraco.MacroEngines" xdt:Locator="Match(type)" xdt:Transform="Remove" />
-      </buildProviders>
-    </compilation>
-    <membership>
-      <providers>
-        <add name="UmbracoMembershipProvider" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-        <add name="UsersMembershipProvider" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      </providers>
-    </membership>
-    <roleManager>
-      <providers>
-        <add name="UmbracoRoleProvider" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      </providers>
-    </roleManager>
-  </system.web>
-  <system.webServer>
-    <modules>
-      <remove name="UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="UmbracoModule" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </modules>
-    <handlers>
-      <remove name="Channels" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <remove name="Channels_Word" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="Channels" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-      <add name="Channels_Word" xdt:Locator="Match(name)" xdt:Transform="Remove" />
-    </handlers>
-  </system.webServer>
-  <location path="umbraco" xdt:Locator="Match(path)" xdt:Transform="Remove" />/>
-  <location path="App_Plugins" xdt:Locator="Match(path)" xdt:Transform="Remove" />/>
-
-</configuration>

build/NuSpecs/tools/install.core.ps1

@@ -49,6 +49,7 @@ if ($project) {
 		if(Test-Path $umbracoBinFolder\umbraco.editorControls.dll) { Remove-Item $umbracoBinFolder\umbraco.editorControls.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\umbraco.MacroEngines.dll) { Remove-Item $umbracoBinFolder\umbraco.MacroEngines.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.dll -Force -Confirm:$false }
+		if(Test-Path $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll) { Remove-Item $umbracoBinFolder\Umbraco.ModelsBuilder.AspNet.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\umbraco.providers.dll) { Remove-Item $umbracoBinFolder\umbraco.providers.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\Umbraco.Web.UI.dll) { Remove-Item $umbracoBinFolder\Umbraco.Web.UI.dll -Force -Confirm:$false }
 		if(Test-Path $umbracoBinFolder\UmbracoExamine.dll) { Remove-Item $umbracoBinFolder\UmbracoExamine.dll -Force -Confirm:$false }

build/UmbracoVersion.txt

@@ -1,3 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.4.0
-RC1
+7.4.1

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -47,13 +47,15 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.dll</HintPath>
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
-      <Private>True</Private>
-      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

src/SQLCE4Umbraco/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
+  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
 </packages>

src/SolutionInfo.cs

@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.4.0")]
-[assembly: AssemblyInformationalVersion("7.4.0-RC1")]
+[assembly: AssemblyFileVersion("7.4.1")]
+[assembly: AssemblyInformationalVersion("7.4.1")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.4.0");
+        private static readonly Version Version = new Version("7.4.1");
 
         /// <summary>
         /// Gets the current version of Umbraco.
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "RC1"; } }
+        public static string CurrentComment { get { return ""; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

src/Umbraco.Core/Constants-Web.cs

@@ -10,6 +10,12 @@ namespace Umbraco.Core
         /// </summary>
         public static class Web
         {
+            public const string UmbracoContextDataToken = "umbraco-context";
+            public const string UmbracoDataToken = "umbraco";
+            public const string PublishedDocumentRequestDataToken = "umbraco-doc-request";
+            public const string CustomRouteDataToken = "umbraco-custom-route";
+            public const string UmbracoRouteDefinitionDataToken = "umbraco-route-def";
+
             /// <summary>
             /// The preview cookie name
             /// </summary>

src/Umbraco.Core/Dynamics/CaseInsensitiveDynamicObject.cs

@@ -0,0 +1,93 @@
+using System;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
+using System.Reflection;
+
+namespace Umbraco.Core.Dynamics
+{
+    /// <summary>
+    /// This will check enable dynamic access to properties and methods in a case insensitive manner
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <remarks>
+    /// This works by using reflection on the type - the reflection lookup is lazy so it will not execute unless a dynamic method needs to be accessed
+    /// </remarks>
+    public abstract class CaseInsensitiveDynamicObject<T> : DynamicObject
+        where T: class
+    {
+        /// <summary>
+        /// Used for dynamic access for case insensitive property access
+        /// </summary>`
+        private static readonly Lazy<IDictionary<string, Func<T, object>>> CaseInsensitivePropertyAccess = new Lazy<IDictionary<string, Func<T, object>>>(() =>
+        {
+            var props = typeof(T).GetProperties(BindingFlags.Instance | BindingFlags.Public)
+                .DistinctBy(x => x.Name);
+            return props.Select(propInfo =>
+            {
+                var name = propInfo.Name.ToLowerInvariant();
+                Func<T, object> getVal = propInfo.GetValue;
+                return new KeyValuePair<string, Func<T, object>>(name, getVal);
+
+            }).ToDictionary(x => x.Key, x => x.Value);
+        });
+
+        /// <summary>
+        /// Used for dynamic access for case insensitive property access
+        /// </summary>
+        private static readonly Lazy<IDictionary<string, Tuple<ParameterInfo[], Func<T, object[], object>>>> CaseInsensitiveMethodAccess
+            = new Lazy<IDictionary<string, Tuple<ParameterInfo[], Func<T, object[], object>>>>(() =>
+            {
+                var props = typeof(T).GetMethods(BindingFlags.Instance | BindingFlags.Public)
+                    .Where(x => x.IsSpecialName == false && x.IsVirtual == false)
+                    .DistinctBy(x => x.Name);
+                return props.Select(methodInfo =>
+                {
+                    var name = methodInfo.Name.ToLowerInvariant();
+                    Func<T, object[], object> getVal = methodInfo.Invoke;
+                    var val = new Tuple<ParameterInfo[], Func<T, object[], object>>(methodInfo.GetParameters(), getVal);
+                    return new KeyValuePair<string, Tuple<ParameterInfo[], Func<T, object[], object>>>(name, val);
+
+                }).ToDictionary(x => x.Key, x => x.Value);
+            });
+
+        public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, out object result)
+        {
+            var name = binder.Name.ToLowerInvariant();
+            if (CaseInsensitiveMethodAccess.Value.ContainsKey(name) == false)
+                return base.TryInvokeMember(binder, args, out result);
+
+            var val = CaseInsensitiveMethodAccess.Value[name];
+            var parameters = val.Item1;
+            var callback = val.Item2;
+            var fullArgs = new List<object>(args);
+            if (args.Length <= parameters.Length)
+            {
+                //need to fill them up if they're optional
+                for (var i = args.Length; i < parameters.Length; i++)
+                {
+                    if (parameters[i].IsOptional)
+                    {
+                        fullArgs.Add(parameters[i].DefaultValue);
+                    }
+                }
+                if (fullArgs.Count == parameters.Length)
+                {
+                    result = callback((T)(object)this, fullArgs.ToArray());
+                    return true;
+                }
+            }
+            return base.TryInvokeMember(binder, args, out result);
+        }
+
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            var name = binder.Name.ToLowerInvariant();
+            if (CaseInsensitivePropertyAccess.Value.ContainsKey(name) == false)
+                return base.TryGetMember(binder, out result);
+
+            result = CaseInsensitivePropertyAccess.Value[name]((T)(object)this);
+            return true;
+        }
+    }
+}

src/Umbraco.Core/Dynamics/DynamicXmlConverter.cs

@@ -64,7 +64,7 @@ namespace Umbraco.Core.Dynamics
 	/// </summary>
 	public class DynamicXmlConverter : TypeConverter
 	{
-		public override bool CanConvertTo(ITypeDescriptorContext context, Type sourceType)
+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)
 		{
 			var convertableTypes = new[]
 			    {
@@ -78,8 +78,8 @@ namespace Umbraco.Core.Dynamics
                     typeof(RawXmlDocument)
 			    };
 
-			return convertableTypes.Any(x => TypeHelper.IsTypeAssignableFrom(x, sourceType)) 
-			       || base.CanConvertFrom(context, sourceType);
+			return convertableTypes.Any(x => TypeHelper.IsTypeAssignableFrom(x, destinationType)) 
+			       || base.CanConvertFrom(context, destinationType);
 		}
 
 		public override object ConvertTo(

src/Umbraco.Core/Models/MediaExtensions.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors.ValueConverters;
+
+namespace Umbraco.Core.Models
+{
+    internal static class MediaExtensions
+    {
+        /// <summary>
+        /// Hack: we need to put this in a real place, this is currently just used to render the urls for a media item in the back office
+        /// </summary>
+        /// <returns></returns>
+        public static string GetUrl(this IMedia media, string propertyAlias, ILogger logger)
+        {
+            var propertyType = media.PropertyTypes.FirstOrDefault(x => x.Alias.InvariantEquals(propertyAlias));
+            if (propertyType != null)
+            {
+                var val = media.Properties[propertyType];
+                if (val != null)
+                {
+                    var jsonString = val.Value as string;
+                    if (jsonString != null)
+                    {
+                        if (propertyType.PropertyEditorAlias == Constants.PropertyEditors.ImageCropperAlias)
+                        {
+                            if (jsonString.DetectIsJson())
+                            {
+                                try
+                                {
+                                    var json = JsonConvert.DeserializeObject<JObject>(jsonString);
+                                    if (json["src"] != null)
+                                    {
+                                        return json["src"].Value<string>();
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    logger.Error<ImageCropperValueConverter>("Could not parse the string " + jsonString + " to a json object", ex);
+                                    return string.Empty;
+                                }
+                            }
+                            else
+                            {
+                                return jsonString;
+                            }
+                        }
+                        else if (propertyType.PropertyEditorAlias == Constants.PropertyEditors.UploadFieldAlias)
+                        {
+                            return jsonString;
+                        }
+                        //hrm, without knowing what it is, just adding a string here might not be very nice
+                    }
+                }
+            }
+            return string.Empty;
+        }
+
+        /// <summary>
+        /// Hack: we need to put this in a real place, this is currently just used to render the urls for a media item in the back office
+        /// </summary>
+        /// <returns></returns>
+        public static string[] GetUrls(this IMedia media, IContentSection contentSection, ILogger logger)
+        {
+            var links = new List<string>();
+            var autoFillProperties = contentSection.ImageAutoFillProperties.ToArray();
+            if (autoFillProperties.Any())
+            {
+                links.AddRange(
+                    autoFillProperties
+                        .Select(field => media.GetUrl(field.Alias, logger))
+                        .Where(link => link.IsNullOrWhiteSpace() == false));
+            }
+            return links.ToArray();
+        }
+    }
+}

src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs

@@ -164,6 +164,9 @@ namespace Umbraco.Core.Models.PublishedContent
 
         private void InitializeConverters()
         {
+            //TODO: Look at optimizing this method, it gets run for every property type for the document being rendered at startup,
+            // every precious second counts!
+
             var converters = PropertyValueConvertersResolver.Current.Converters.ToArray();            
             var defaultConvertersWithAttributes = PropertyValueConvertersResolver.Current.DefaultConverters;
 

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenFourZero/RemoveParentIdPropertyTypeGroupColumn.cs

@@ -20,7 +20,17 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFourZer
             if (columns.Any(x => x.TableName.InvariantEquals("cmsPropertyTypeGroup") && x.ColumnName.InvariantEquals("parentGroupId")) == false)
                 return;
 
-            Delete.ForeignKey("FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup_id").OnTable("cmsPropertyTypeGroup");
+            //This constraing can be based on old aliases, before removing them, check they exist
+            var constraints = SqlSyntax.GetConstraintsPerColumn(Context.Database).Distinct().ToArray();
+            if (constraints.Any(x => x.Item1.InvariantEquals("cmsPropertyTypeGroup") && x.Item3.InvariantEquals("FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup_id")))
+            {
+                Delete.ForeignKey("FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup_id").OnTable("cmsPropertyTypeGroup");
+            }
+            if (constraints.Any(x => x.Item1.InvariantEquals("cmsPropertyTypeGroup") && x.Item3.InvariantEquals("FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup")))
+            {
+                Delete.ForeignKey("FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup").OnTable("cmsPropertyTypeGroup");
+            }
+            
             Delete.Column("parentGroupId").FromTable("cmsPropertyTypeGroup");
         }
 

src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs

@@ -8,6 +8,7 @@ namespace Umbraco.Core.PropertyEditors
     /// <summary>
 	/// Manages the list of IPropertyEditorValueConverter's
     /// </summary>
+    [Obsolete("IPropertyEditorValueConverter is obsolete, but we need to support them until v8, to resolve the correct converter types use: PropertyValueConvertersResolver")]
     internal sealed class PropertyEditorValueConvertersResolver : ManyObjectsResolverBase<PropertyEditorValueConvertersResolver, IPropertyEditorValueConverter>
 	{
         /// <summary>

src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs

@@ -1,8 +1,11 @@
 using System;
+using System.Globalization;
+using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.PropertyEditors.ValueConverters
 {
@@ -14,11 +17,80 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
     [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
     public class ImageCropperValueConverter : JsonValueConverter
     {
+        private readonly IDataTypeService _dataTypeService;
+
+        public ImageCropperValueConverter()
+        {
+            _dataTypeService = ApplicationContext.Current.Services.DataTypeService;
+        }
+
+        public ImageCropperValueConverter(IDataTypeService dataTypeService)
+        {
+            if (dataTypeService == null) throw new ArgumentNullException("dataTypeService");
+            _dataTypeService = dataTypeService;
+        }
+
         public override bool IsConverter(PublishedPropertyType propertyType)
         {
             return propertyType.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditors.ImageCropperAlias);
         }
 
+        internal static void MergePreValues(JObject currentValue, IDataTypeService dataTypeService, int dataTypeId)
+        {
+            //need to lookup the pre-values for this data type
+            //TODO: Change all singleton access to use ctor injection in v8!!!
+            var dt = dataTypeService.GetPreValuesCollectionByDataTypeId(dataTypeId);
+
+            if (dt != null && dt.IsDictionaryBased && dt.PreValuesAsDictionary.ContainsKey("crops"))
+            {
+                var cropsString = dt.PreValuesAsDictionary["crops"].Value;
+                JArray preValueCrops;
+                try
+                {
+                    preValueCrops = JsonConvert.DeserializeObject<JArray>(cropsString);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<ImageCropperValueConverter>("Could not parse the string " + cropsString + " to a json object", ex);
+                    return;
+                }
+
+                //now we need to merge the crop values - the alias + width + height comes from pre-configured pre-values,
+                // however, each crop can store it's own coordinates
+
+                JArray existingCropsArray;
+                if (currentValue["crops"] != null)
+                {
+                    existingCropsArray = (JArray)currentValue["crops"];
+                }
+                else
+                {
+                    currentValue["crops"] = existingCropsArray = new JArray();
+                }
+
+                foreach (var preValueCrop in preValueCrops.Where(x => x.HasValues))
+                {
+                    var found = existingCropsArray.FirstOrDefault(x =>
+                    {
+                        if (x.HasValues && x["alias"] != null)
+                        {
+                            return x["alias"].Value<string>() == preValueCrop["alias"].Value<string>();
+                        }
+                        return false;
+                    });
+                    if (found != null)
+                    {
+                        found["width"] = preValueCrop["width"];
+                        found["height"] = preValueCrop["height"];
+                    }
+                    else
+                    {
+                        existingCropsArray.Add(preValueCrop);
+                    }
+                }
+            }
+        }
+
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
             if (source == null) return null;
@@ -29,7 +101,11 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                 JObject obj;
                 try
                 {
-                    obj = JsonConvert.DeserializeObject<JObject>(sourceString);
+                    obj = JsonConvert.DeserializeObject<JObject>(sourceString, new JsonSerializerSettings
+                    {
+                        Culture = CultureInfo.InvariantCulture,
+                        FloatParseHandling = FloatParseHandling.Decimal
+                    });
                 }
                 catch (Exception ex)
                 {
@@ -37,26 +113,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                     return sourceString;
                 }
 
-                //need to lookup the pre-values for this data type
-                //TODO: Change all singleton access to use ctor injection in v8!!!
-                var dt = ApplicationContext.Current.Services.DataTypeService.GetPreValuesCollectionByDataTypeId(propertyType.DataTypeId);
+                MergePreValues(obj, _dataTypeService, propertyType.DataTypeId);
 
-                if (dt != null && dt.IsDictionaryBased && dt.PreValuesAsDictionary.ContainsKey("crops"))
-                {
-                    var cropsString = dt.PreValuesAsDictionary["crops"].Value;
-                    JArray crops;
-                    try
-                    {
-                        crops = JsonConvert.DeserializeObject<JArray>(cropsString);
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.Error<ImageCropperValueConverter>("Could not parse the string " + cropsString + " to a json object", ex);
-                        return sourceString;
-                    }
-                    obj["crops"] = crops;
-                }
-                
                 return obj;
             }
 

src/Umbraco.Core/PropertyEditors/ValueConverters/LabelValueConverter.cs

@@ -0,0 +1,28 @@
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Core.PropertyEditors.ValueConverters
+{
+    /// <summary>
+    /// We need this property converter so that we always force the value of a label to be a string
+    /// </summary>
+    /// <remarks>
+    /// Without a property converter defined for the label type, the value will be converted with
+    /// the `ConvertUsingDarkMagic` method which will try to parse the value into it's correct type, but this
+    /// can cause issues if the string is detected as a number and then strips leading zeros. 
+    /// Example: http://issues.umbraco.org/issue/U4-7929
+    /// </remarks>
+    [DefaultPropertyValueConverter]
+    [PropertyValueType(typeof (string))]
+    [PropertyValueCache(PropertyCacheValue.All, PropertyCacheLevel.Content)]
+    public class LabelValueConverter : PropertyValueConverterBase
+    {
+        public override bool IsConverter(PublishedPropertyType propertyType)
+        {
+            return Constants.PropertyEditors.NoEditAlias.Equals(propertyType.PropertyEditorAlias);
+        }
+        public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
+        {
+            return source == null ? string.Empty : source.ToString();
+        }
+    }
+}

src/Umbraco.Core/Serialization/NoTypeConverterJsonConverter.cs

@@ -0,0 +1,52 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
+
+namespace Umbraco.Core.Serialization
+{
+    /// <summary>
+    /// This is required if we want to force JSON.Net to not use .Net TypeConverters during serialization/deserialization
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <remarks>
+    /// In some cases thsi is required if your model has an explicit type converter, see: http://stackoverflow.com/a/31328131/694494
+    /// 
+    /// NOTE: I was going to use this for the ImageCropDataSetConverter to convert to String, which would have worked by putting this attribute:
+    /// [JsonConverter(typeof(NoTypeConverterJsonConverter{ImageCropDataSet}))] on top of the ImageCropDataSet class, however it turns out we 
+    /// don't require this because to convert to string, we just override ToString().
+    /// I'll leave this class here for the future though.
+    /// </remarks>
+    internal class NoTypeConverterJsonConverter<T> : JsonConverter
+    {
+        static readonly IContractResolver resolver = new NoTypeConverterContractResolver();
+
+        private class NoTypeConverterContractResolver : DefaultContractResolver
+        {
+            protected override JsonContract CreateContract(Type objectType)
+            {
+                if (typeof(T).IsAssignableFrom(objectType))
+                {
+                    var contract = this.CreateObjectContract(objectType);
+                    contract.Converter = null; // Also null out the converter to prevent infinite recursion.
+                    return contract;
+                }
+                return base.CreateContract(objectType);
+            }
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return typeof(T).IsAssignableFrom(objectType);
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            return JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = resolver }).Deserialize(reader, objectType);
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            JsonSerializer.CreateDefault(new JsonSerializerSettings { ContractResolver = resolver }).Serialize(writer, value);
+        }
+    }
+}

src/Umbraco.Core/Services/ContentTypeService.cs

@@ -229,7 +229,7 @@ namespace Umbraco.Core.Services
 
         public EntityContainer GetContentTypeContainer(Guid containerId)
         {
-            return GetContainer(containerId, Constants.ObjectTypes.DocumentTypeGuid);
+            return GetContainer(containerId, Constants.ObjectTypes.DocumentTypeContainerGuid);
         }
 
         public IEnumerable<EntityContainer> GetContentTypeContainers(int[] containerIds)
@@ -258,7 +258,7 @@ namespace Umbraco.Core.Services
 
         public EntityContainer GetMediaTypeContainer(Guid containerId)
         {
-            return GetContainer(containerId, Constants.ObjectTypes.MediaTypeGuid);
+            return GetContainer(containerId, Constants.ObjectTypes.MediaTypeContainerGuid);
         }
 
         private EntityContainer GetContainer(Guid containerId, Guid containerObjectType)

src/Umbraco.Core/Services/FileService.cs

@@ -255,7 +255,12 @@ namespace Umbraco.Core.Services
         /// </returns>
         public Attempt<OperationStatus<ITemplate, OperationStatusType>> CreateTemplateForContentType(string contentTypeAlias, string contentTypeName, int userId = 0)
         {
-            var template = new Template(contentTypeName, contentTypeAlias);
+            var template = new Template(contentTypeName,
+                //NOTE: We are NOT passing in the content type alias here, we want to use it's name since we don't
+                // want to save template file names as camelCase, the Template ctor will clean the alias as
+                // `alias.ToCleanString(CleanStringType.UnderscoreAlias)` which has been the default.
+                // This fixes: http://issues.umbraco.org/issue/U4-7953
+                contentTypeName);
 
             var evtMsgs = EventMessagesFactory.Get();
 

src/Umbraco.Core/Services/IMediaService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 

src/Umbraco.Core/Services/PackagingService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -365,8 +365,7 @@ namespace Umbraco.Core.Services
                     var dependencies = new HashSet<string>();
 
                     //Add the Master as a dependency
-                    if (infoElement.Element("Master") != null &&
-                        string.IsNullOrEmpty(infoElement.Element("Master").Value) == false)
+                    if (string.IsNullOrEmpty((string)infoElement.Element("Master")) == false)
                     {
                         dependencies.Add(infoElement.Element("Master").Value);
                     }
@@ -627,7 +626,7 @@ namespace Umbraco.Core.Services
                 contentType.AllowedTemplates = allowedTemplates;
             }
 
-            if (string.IsNullOrEmpty(defaultTemplateElement.Value) == false)
+            if (string.IsNullOrEmpty((string)defaultTemplateElement) == false)
             {
                 var defaultTemplate = _fileService.GetTemplate(defaultTemplateElement.Value.ToSafeAlias());
                 if (defaultTemplate != null)
@@ -698,7 +697,7 @@ namespace Umbraco.Core.Services
                                                   : _dataTypeService.GetDataTypeDefinitionByPropertyEditorAlias(propertyEditorAlias);
                     if (dataTypeDefinitions != null && dataTypeDefinitions.Any())
                     {
-                        dataTypeDefinition = dataTypeDefinitions.First();
+                        dataTypeDefinition = dataTypeDefinitions.FirstOrDefault();
                     }
                 }
                 else if (legacyPropertyEditorId != Guid.Empty && dataTypeDefinition.ControlId != legacyPropertyEditorId)
@@ -706,7 +705,7 @@ namespace Umbraco.Core.Services
                     var dataTypeDefinitions = _dataTypeService.GetDataTypeDefinitionByControlId(legacyPropertyEditorId);
                     if (dataTypeDefinitions != null && dataTypeDefinitions.Any())
                     {
-                        dataTypeDefinition = dataTypeDefinitions.First();
+                        dataTypeDefinition = dataTypeDefinitions.FirstOrDefault();
                     }
                 }
                 else if (dataTypeDefinition.PropertyEditorAlias != propertyEditorAlias)
@@ -714,7 +713,7 @@ namespace Umbraco.Core.Services
                     var dataTypeDefinitions = _dataTypeService.GetDataTypeDefinitionByPropertyEditorAlias(propertyEditorAlias);
                     if (dataTypeDefinitions != null && dataTypeDefinitions.Any())
                     {
-                        dataTypeDefinition = dataTypeDefinitions.First();
+                        dataTypeDefinition = dataTypeDefinitions.FirstOrDefault();
                     }
                 }
 
@@ -741,13 +740,13 @@ namespace Umbraco.Core.Services
                 var propertyType = new PropertyType(dataTypeDefinition, property.Element("Alias").Value)
                 {
                     Name = property.Element("Name").Value,
-                    Description = property.Element("Description") != null ? property.Element("Description").Value : null,
+                    Description = (string)property.Element("Description"),
                     Mandatory = property.Element("Mandatory") != null ? property.Element("Mandatory").Value.ToLowerInvariant().Equals("true") : false,
-                    ValidationRegExp = property.Element("Validation") != null ? property.Element("Validation").Value : null,
+                    ValidationRegExp = (string)property.Element("Validation"),
                     SortOrder = sortOrder
                 };
 
-                var tab = property.Element("Tab").Value;
+                var tab = (string)property.Element("Tab");
                 if (string.IsNullOrEmpty(tab))
                 {
                     contentType.AddPropertyType(propertyType);
@@ -797,14 +796,14 @@ namespace Umbraco.Core.Services
             using (var repository = _repositoryFactory.CreateContentTypeRepository(_uowProvider.GetUnitOfWork()))
             {
                 var query = Query<IContentType>.Builder.Where(x => x.Alias == contentTypeAlias);
-                var types = repository.GetByQuery(query);
+                var types = repository.GetByQuery(query).ToArray();
 
-                if (!types.Any())
+                if (types.Any() == false)
                     throw new Exception(
                         string.Format("No ContentType matching the passed in Alias: '{0}' was found",
                                       contentTypeAlias));
 
-                var contentType = types.First();
+                var contentType = types.FirstOrDefault();
 
                 if (contentType == null)
                     throw new Exception(string.Format("ContentType matching the passed in Alias: '{0}' was null",
@@ -889,7 +888,7 @@ namespace Umbraco.Core.Services
             {
                 var dataTypeDefinitionName = dataTypeElement.Attribute("Name").Value;
 
-                var legacyPropertyEditorId = Guid.Empty;
+                Guid legacyPropertyEditorId;
                 Guid.TryParse(dataTypeElement.Attribute("Id").Value, out legacyPropertyEditorId);
 
                 var dataTypeDefinitionId = new Guid(dataTypeElement.Attribute("Definition").Value);
@@ -1026,23 +1025,30 @@ namespace Umbraco.Core.Services
                 if (prevaluesElement == null) continue;
 
                 var dataTypeDefinitionName = dataTypeElement.Attribute("Name").Value;
-                var dataTypeDefinition = dataTypes.First(x => x.Name == dataTypeDefinitionName);
+                var dataTypeDefinition = dataTypes.FirstOrDefault(x => x.Name == dataTypeDefinitionName);
 
-                var valuesWithoutKeys = prevaluesElement.Elements("PreValue")
-                                                        .Where(x => ((string)x.Attribute("Alias")).IsNullOrWhiteSpace())
-                                                        .Select(x => x.Attribute("Value").Value);
+                if (dataTypeDefinition != null)
+                {
+                    var valuesWithoutKeys = prevaluesElement.Elements("PreValue")
+                        .Where(x => ((string) x.Attribute("Alias")).IsNullOrWhiteSpace())
+                        .Select(x => x.Attribute("Value").Value);
 
-                var valuesWithKeys = prevaluesElement.Elements("PreValue")
-                    .Where(x => ((string)x.Attribute("Alias")).IsNullOrWhiteSpace() == false)
-                    .ToDictionary(
-                        key => (string)key.Attribute("Alias"),
-                        val => new PreValue((string)val.Attribute("Value")));
+                    var valuesWithKeys = prevaluesElement.Elements("PreValue")
+                        .Where(x => ((string) x.Attribute("Alias")).IsNullOrWhiteSpace() == false)
+                        .ToDictionary(
+                            key => (string) key.Attribute("Alias"),
+                            val => new PreValue((string) val.Attribute("Value")));
 
-                //save the values with keys
-                _dataTypeService.SavePreValues(dataTypeDefinition, valuesWithKeys);
+                    //save the values with keys
+                    _dataTypeService.SavePreValues(dataTypeDefinition, valuesWithKeys);
 
-                //save the values without keys (this is legacy)
-                _dataTypeService.SavePreValues(dataTypeDefinition.Id, valuesWithoutKeys);
+                    //save the values without keys (this is legacy)
+                    _dataTypeService.SavePreValues(dataTypeDefinition.Id, valuesWithoutKeys);
+                }
+                else
+                {
+                    _logger.Warn<PackagingService>("No data type found with name " + dataTypeDefinitionName + " data type pre-values will not be saved");
+                }
             }
         }
 
@@ -1329,31 +1335,31 @@ namespace Umbraco.Core.Services
             //Following xml elements are treated as nullable properties
             var useInEditorElement = macroElement.Element("useInEditor");
             var useInEditor = false;
-            if (useInEditorElement != null && string.IsNullOrEmpty(useInEditorElement.Value) == false)
+            if (useInEditorElement != null && string.IsNullOrEmpty((string)useInEditorElement) == false)
             {
                 useInEditor = bool.Parse(useInEditorElement.Value);
             }
             var cacheDurationElement = macroElement.Element("refreshRate");
             var cacheDuration = 0;
-            if (cacheDurationElement != null && string.IsNullOrEmpty(cacheDurationElement.Value) == false)
+            if (cacheDurationElement != null && string.IsNullOrEmpty((string)cacheDurationElement) == false)
             {
                 cacheDuration = int.Parse(cacheDurationElement.Value);
             }
             var cacheByMemberElement = macroElement.Element("cacheByMember");
             var cacheByMember = false;
-            if (cacheByMemberElement != null && string.IsNullOrEmpty(cacheByMemberElement.Value) == false)
+            if (cacheByMemberElement != null && string.IsNullOrEmpty((string)cacheByMemberElement) == false)
             {
                 cacheByMember = bool.Parse(cacheByMemberElement.Value);
             }
             var cacheByPageElement = macroElement.Element("cacheByPage");
             var cacheByPage = false;
-            if (cacheByPageElement != null && string.IsNullOrEmpty(cacheByPageElement.Value) == false)
+            if (cacheByPageElement != null && string.IsNullOrEmpty((string)cacheByPageElement) == false)
             {
                 cacheByPage = bool.Parse(cacheByPageElement.Value);
             }
             var dontRenderElement = macroElement.Element("dontRender");
             var dontRender = true;
-            if (dontRenderElement != null && string.IsNullOrEmpty(dontRenderElement.Value) == false)
+            if (dontRenderElement != null && string.IsNullOrEmpty((string)dontRenderElement) == false)
             {
                 dontRender = bool.Parse(dontRenderElement.Value);
             }
@@ -1526,23 +1532,20 @@ namespace Umbraco.Core.Services
                 var dependencies = new List<string>();
                 var elementCopy = tempElement;
                 //Ensure that the Master of the current template is part of the import, otherwise we ignore this dependency as part of the dependency sorting.
-                if (elementCopy.Element("Master") != null &&
-                    string.IsNullOrEmpty(elementCopy.Element("Master").Value) == false &&
-                    templateElements.Any(x => x.Element("Alias").Value == elementCopy.Element("Master").Value))
+                if (string.IsNullOrEmpty((string)elementCopy.Element("Master")) == false &&
+                    templateElements.Any(x => (string)x.Element("Alias") == (string)elementCopy.Element("Master")))
                 {
-                    dependencies.Add(elementCopy.Element("Master").Value);
+                    dependencies.Add((string)elementCopy.Element("Master"));
                 }
-                else if (elementCopy.Element("Master") != null &&
-                         string.IsNullOrEmpty(elementCopy.Element("Master").Value) == false &&
-                         templateElements.Any(x => x.Element("Alias").Value == elementCopy.Element("Master").Value) ==
-                         false)
+                else if (string.IsNullOrEmpty((string)elementCopy.Element("Master")) == false &&
+                    templateElements.Any(x => (string)x.Element("Alias") == (string)elementCopy.Element("Master")) == false)
                 {
-                    _logger.Info<PackagingService>(string.Format("Template '{0}' has an invalid Master '{1}', so the reference has been ignored.", elementCopy.Element("Alias").Value, elementCopy.Element("Master").Value));
+                    _logger.Info<PackagingService>(string.Format("Template '{0}' has an invalid Master '{1}', so the reference has been ignored.", (string)elementCopy.Element("Alias"), (string)elementCopy.Element("Master")));
                 }
 
                 var field = new TopologicalSorter.DependencyField<XElement>
                 {
-                    Alias = elementCopy.Element("Alias").Value,
+                    Alias = (string)elementCopy.Element("Alias"),
                     Item = new Lazy<XElement>(() => elementCopy),
                     DependsOn = dependencies.ToArray()
                 };
@@ -1564,7 +1567,7 @@ namespace Umbraco.Core.Services
                 var existingTemplate = _fileService.GetTemplate(alias) as Template;
                 var template = existingTemplate ?? new Template(path, templateName, alias);
                 template.Content = design;
-                if (masterElement != null && string.IsNullOrEmpty(masterElement.Value) == false)
+                if (masterElement != null && string.IsNullOrEmpty((string)masterElement) == false)
                 {
                     template.MasterTemplateAlias = masterElement.Value;
                     var masterTemplate = templates.FirstOrDefault(x => x.Alias == masterElement.Value);

src/Umbraco.Core/Sync/DatabaseServerMessenger.cs

@@ -171,9 +171,11 @@ namespace Umbraco.Core.Sync
                     // go get the last id in the db and store it
                     // note: do it BEFORE initializing otherwise some instructions might get lost
                     // when doing it before, some instructions might run twice - not an issue
-                    var lastId = _appContext.DatabaseContext.Database.ExecuteScalar<int>("SELECT MAX(id) FROM umbracoCacheInstruction");
-                    if (lastId > 0)
-                        SaveLastSynced(lastId);
+                    var maxId = _appContext.DatabaseContext.Database.ExecuteScalar<int>("SELECT MAX(id) FROM umbracoCacheInstruction");
+
+                    //if there is a max currently, or if we've never synced
+                    if (maxId > 0 || _lastId < 0)
+                        SaveLastSynced(maxId);
 
                     // execute initializing callbacks
                     if (_options.InitializingCallbacks != null)

src/Umbraco.Core/Umbraco.Core.csproj

@@ -102,13 +102,13 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data.Entity" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.dll</HintPath>
+      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
@@ -309,6 +309,7 @@
     <Compile Include="DictionaryExtensions.cs" />
     <Compile Include="Dictionary\CultureDictionaryFactoryResolver.cs" />
     <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />
+    <Compile Include="Dynamics\CaseInsensitiveDynamicObject.cs" />
     <Compile Include="Dynamics\DynamicInstanceHelper.cs" />
     <Compile Include="Dynamics\DynamicXmlConverter.cs" />
     <Compile Include="Events\CancellableEventArgs.cs" />
@@ -477,6 +478,7 @@
     <Compile Include="PropertyEditors\DecimalValidator.cs" />
     <Compile Include="PropertyEditors\ValueConverters\GridValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\DecimalValueConverter.cs" />
+    <Compile Include="PropertyEditors\ValueConverters\LabelValueConverter.cs" />
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
     <Compile Include="Publishing\UnPublishedStatusType.cs" />
     <Compile Include="Publishing\UnPublishStatus.cs" />
@@ -489,6 +491,7 @@
     <Compile Include="Security\IBackOfficeUserPasswordChecker.cs" />
     <Compile Include="Security\MembershipPasswordHasher.cs" />
     <Compile Include="SemVersionExtensions.cs" />
+    <Compile Include="Serialization\NoTypeConverterJsonConverter.cs" />
     <Compile Include="ServiceProviderExtensions.cs" />
     <Compile Include="IO\ResizedImage.cs" />
     <Compile Include="IO\UmbracoMediaFile.cs" />
@@ -511,6 +514,7 @@
     <Compile Include="Services\IServerRegistrationService.cs" />
     <Compile Include="Services\ITaskService.cs" />
     <Compile Include="Services\LocalizedTextServiceSupplementaryFileSource.cs" />
+    <Compile Include="Models\MediaExtensions.cs" />
     <Compile Include="Services\MigrationEntryService.cs" />
     <Compile Include="Services\MoveOperationStatusType.cs" />
     <Compile Include="Services\PublicAccessService.cs" />

src/Umbraco.Core/packages.config

@@ -15,5 +15,5 @@
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="semver" version="1.1.2" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net4" />
-  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net4" />
+  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
 </packages>

src/Umbraco.Tests/App.config

@@ -72,7 +72,7 @@
   <system.data>
     <DbProviderFactories>
       <remove invariant="System.Data.SqlServerCe.4.0" />
-      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
+      <add name="Microsoft SQL Server Compact Data Provider 4.0" invariant="System.Data.SqlServerCe.4.0" description=".NET Framework Data Provider for Microsoft SQL Server Compact" type="System.Data.SqlServerCe.SqlCeProviderFactory, System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
       <remove invariant="MySql.Data.MySqlClient" />
       <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.6.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
     </DbProviderFactories>

src/Umbraco.Tests/Cache/DistributedCache/DistributedCacheTests.cs

@@ -42,7 +42,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
         {
             for (var i = 1; i < 11; i++)
             {
-                Web.Cache.DistributedCache.Instance.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
+                global::Umbraco.Web.Cache.DistributedCache.Instance.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
             }
             Assert.AreEqual(10, ((TestServerMessenger)ServerMessengerResolver.Current.Messenger).IntIdsRefreshed.Count);
         }
@@ -52,7 +52,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
         {
             for (var i = 0; i < 10; i++)
             {
-                Web.Cache.DistributedCache.Instance.Refresh(
+                global::Umbraco.Web.Cache.DistributedCache.Instance.Refresh(
                     Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"),
                     x => x.Id,
                     new TestObjectWithId{Id = i});
@@ -65,7 +65,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
         {
             for (var i = 0; i < 11; i++)
             {
-                Web.Cache.DistributedCache.Instance.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), Guid.NewGuid());
+                global::Umbraco.Web.Cache.DistributedCache.Instance.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), Guid.NewGuid());
             }
             Assert.AreEqual(11, ((TestServerMessenger)ServerMessengerResolver.Current.Messenger).GuidIdsRefreshed.Count);
         }
@@ -75,7 +75,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
         {
             for (var i = 1; i < 13; i++)
             {
-                Web.Cache.DistributedCache.Instance.Remove(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
+                global::Umbraco.Web.Cache.DistributedCache.Instance.Remove(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
             }
             Assert.AreEqual(12, ((TestServerMessenger)ServerMessengerResolver.Current.Messenger).IntIdsRemoved.Count);
         }
@@ -85,7 +85,7 @@ namespace Umbraco.Tests.Cache.DistributedCache
         {
             for (var i = 0; i < 13; i++)
             {
-                Web.Cache.DistributedCache.Instance.RefreshAll(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"));
+                global::Umbraco.Web.Cache.DistributedCache.Instance.RefreshAll(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"));
             }
             Assert.AreEqual(13, ((TestServerMessenger)ServerMessengerResolver.Current.Messenger).CountOfFullRefreshes);
         }

src/Umbraco.Tests/Integration/GetCultureTests.cs

@@ -56,22 +56,64 @@ namespace Umbraco.Tests.Integration
             ServiceContext.DomainService.Save(new UmbracoDomain("*100112") { DomainName = "*100112", RootContentId = c3.Id, LanguageId = l2.Id });
 
             var content = c2;
-            var culture = Web.Models.ContentExtensions.GetCulture(null,
+            var culture = global::Umbraco.Web.Models.ContentExtensions.GetCulture(null,
                 ServiceContext.DomainService, ServiceContext.LocalizationService, ServiceContext.ContentService,
                 content.Id, content.Path, new Uri("http://domain1.com/"));
             Assert.AreEqual("en-US", culture.Name);
 
             content = c2;
-            culture = Web.Models.ContentExtensions.GetCulture(null,
+            culture = global::Umbraco.Web.Models.ContentExtensions.GetCulture(null,
                 ServiceContext.DomainService, ServiceContext.LocalizationService, ServiceContext.ContentService, 
                 content.Id, content.Path, new Uri("http://domain1.fr/"));
             Assert.AreEqual("fr-FR", culture.Name);
 
             content = c4;
-            culture = Web.Models.ContentExtensions.GetCulture(null,
+            culture = global::Umbraco.Web.Models.ContentExtensions.GetCulture(null,
                 ServiceContext.DomainService, ServiceContext.LocalizationService, ServiceContext.ContentService, 
                 content.Id, content.Path, new Uri("http://domain1.fr/"));
             Assert.AreEqual("de-DE", culture.Name);
         }
+
+        [Test]
+        public void GetCultureWithWildcard()
+        {
+            var contentTypeService = ServiceContext.ContentTypeService;
+            var contentType = MockedContentTypes.CreateSimpleContentType("umbBlah", "test Doc Type");
+            contentTypeService.Save(contentType);
+            var contentService = ServiceContext.ContentService;
+
+            var c1 = contentService.CreateContentWithIdentity("content", -1, "umbBlah");
+            var c2 = contentService.CreateContentWithIdentity("content", c1, "umbBlah");
+            var c3 = contentService.CreateContentWithIdentity("content", c1, "umbBlah");
+            var c4 = contentService.CreateContentWithIdentity("content", c3, "umbBlah");
+
+            foreach (var l in ServiceContext.LocalizationService.GetAllLanguages().Where(x => x.CultureName != "en-US").ToArray())
+                ServiceContext.LocalizationService.Delete(l);
+
+            var l0 = ServiceContext.LocalizationService.GetLanguageByIsoCode("en-US");
+            var l1 = new Core.Models.Language("fr-FR");
+            var l2 = new Core.Models.Language("de-DE");
+            ServiceContext.LocalizationService.Save(l1);
+            ServiceContext.LocalizationService.Save(l2);
+
+            foreach (var d in ServiceContext.DomainService.GetAll(true).ToArray())
+                ServiceContext.DomainService.Delete(d);
+
+            ServiceContext.DomainService.Save(new UmbracoDomain("*0000") { DomainName = "*0000", RootContentId = c1.Id, LanguageId = l2.Id });
+            ServiceContext.DomainService.Save(new UmbracoDomain("*0001") { DomainName = "*0001", RootContentId = c3.Id, LanguageId = l1.Id });
+            //ServiceContext.DomainService.Save(new UmbracoDomain("*100112") { DomainName = "*100112", RootContentId = c3.Id, LanguageId = l2.Id });
+
+            var content = c2;
+            var culture = Umbraco.Web.Models.ContentExtensions.GetCulture(null,
+                ServiceContext.DomainService, ServiceContext.LocalizationService, ServiceContext.ContentService,
+                content.Id, content.Path, new Uri("http://domain1.com/"));
+            Assert.AreEqual("de-DE", culture.Name);
+
+            content = c4;
+            culture = Umbraco.Web.Models.ContentExtensions.GetCulture(null,
+                ServiceContext.DomainService, ServiceContext.LocalizationService, ServiceContext.ContentService,
+                content.Id, content.Path, new Uri("http://domain1.fr/"));
+            Assert.AreEqual("fr-FR", culture.Name);
+        }
     }
 }

src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs

@@ -1,6 +1,17 @@
-using System.Linq;
+using System;
+using System.Globalization;
+using System.Linq;
+using Moq;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using Newtonsoft.Json.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Core.ObjectResolution;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 using Umbraco.Web.Models;
 using Umbraco.Web.PropertyEditors;
 using Umbraco.Web;
@@ -10,14 +21,155 @@ namespace Umbraco.Tests.PropertyEditors
     [TestFixture]
     public class ImageCropperTest
     {
-        private const string cropperJson = "{\"focalPoint\": {\"left\": 0.96,\"top\": 0.80827067669172936},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\":\"thumb\",\"width\": 100,\"height\": 100,\"coordinates\": {\"x1\": 0.58729977382575338,\"y1\": 0.055768992440203169,\"x2\": 0,\"y2\": 0.32457553600198386}}]}";
-
+        private const string cropperJson1 = "{\"focalPoint\": {\"left\": 0.96,\"top\": 0.80827067669172936},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\":\"thumb\",\"width\": 100,\"height\": 100,\"coordinates\": {\"x1\": 0.58729977382575338,\"y1\": 0.055768992440203169,\"x2\": 0,\"y2\": 0.32457553600198386}}]}";        
+        private const string cropperJson2 = "{\"focalPoint\": {\"left\": 0.98,\"top\": 0.80827067669172936},\"src\": \"/media/1005/img_0672.jpg\",\"crops\": [{\"alias\":\"thumb\",\"width\": 100,\"height\": 100,\"coordinates\": {\"x1\": 0.58729977382575338,\"y1\": 0.055768992440203169,\"x2\": 0,\"y2\": 0.32457553600198386}}]}";
+        private const string cropperJson3 = "{\"focalPoint\": {\"left\": 0.98,\"top\": 0.80827067669172936},\"src\": \"/media/1005/img_0672.jpg\",\"crops\": []}";
         private const string mediaPath = "/media/1005/img_0671.jpg";
 
+        [Test]
+        public void ImageCropData_Properties_As_Dynamic()
+        {
+            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            dynamic d = sourceObj;
+
+            var index = 0;
+            foreach (var crop in d.crops)
+            {
+                var realObjCrop = sourceObj.Crops.ElementAt(index);
+                Assert.AreEqual(realObjCrop.Alias, crop.Alias);
+                Assert.AreEqual(realObjCrop.Alias, crop.alias);
+
+                Assert.AreEqual(realObjCrop.Height, crop.Height);
+                Assert.AreEqual(realObjCrop.Height, crop.height);
+
+                Assert.AreEqual(realObjCrop.Coordinates.X1, crop.Coordinates.X1);
+                Assert.AreEqual(realObjCrop.Coordinates.X1, crop.coordinates.x1);
+
+                Assert.AreEqual(realObjCrop.Coordinates.X2, crop.Coordinates.X2);
+                Assert.AreEqual(realObjCrop.Coordinates.X2, crop.coordinates.x2);
+
+                Assert.AreEqual(realObjCrop.Coordinates.Y1, crop.Coordinates.Y1);
+                Assert.AreEqual(realObjCrop.Coordinates.Y1, crop.coordinates.y1);
+
+                Assert.AreEqual(realObjCrop.Coordinates.Y2, crop.Coordinates.Y2);
+                Assert.AreEqual(realObjCrop.Coordinates.Y2, crop.coordinates.y2);
+                index++;
+            }
+
+            Assert.AreEqual(index, 1);            
+        }
+
+        [Test]
+        public void ImageCropFocalPoint_Properties_As_Dynamic()
+        {
+            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            dynamic d = sourceObj;
+
+            Assert.AreEqual(sourceObj.FocalPoint.Left, d.FocalPoint.Left);
+            Assert.AreEqual(sourceObj.FocalPoint.Left, d.focalPoint.left);
+
+            Assert.AreEqual(sourceObj.FocalPoint.Top, d.FocalPoint.Top);
+            Assert.AreEqual(sourceObj.FocalPoint.Top, d.focalPoint.top);
+        }
+
+        [Test]
+        public void ImageCropDataSet_Properties_As_Dynamic()
+        {
+            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            dynamic d = sourceObj;
+
+            Assert.AreEqual(sourceObj.Src, d.Src);
+            Assert.AreEqual(sourceObj.Src, d.src);
+
+            Assert.AreEqual(sourceObj.FocalPoint, d.FocalPoint);
+            Assert.AreEqual(sourceObj.FocalPoint, d.focalPoint);
+
+            Assert.AreEqual(sourceObj.Crops, d.Crops);
+            Assert.AreEqual(sourceObj.Crops, d.crops);
+        }
+
+        [Test]
+        public void ImageCropDataSet_Methods_As_Dynamic()
+        {
+            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            dynamic d = sourceObj;
+
+            Assert.AreEqual(sourceObj.HasCrop("thumb"), d.HasCrop("thumb"));
+            Assert.AreEqual(sourceObj.HasCrop("thumb"), d.hasCrop("thumb"));
+
+            Assert.AreEqual(sourceObj.GetCropUrl("thumb"), d.GetCropUrl("thumb"));
+            Assert.AreEqual(sourceObj.GetCropUrl("thumb"), d.getCropUrl("thumb"));
+
+            Assert.AreEqual(sourceObj.HasFocalPoint(), d.HasFocalPoint());
+            Assert.AreEqual(sourceObj.HasFocalPoint(), d.hasFocalPoint());
+        }
+
+        [Test]
+        public void CanConvertImageCropperDataSetSrcToString()
+        {
+            //cropperJson3 - has not crops
+            var sourceObj = cropperJson3.SerializeToCropDataSet();
+            var destObj = sourceObj.TryConvertTo<string>();
+            Assert.IsTrue(destObj.Success);
+            Assert.AreEqual(destObj.Result, "/media/1005/img_0672.jpg");
+        }
+
+        [Test]
+        public void CanConvertImageCropperDataSetJObject()
+        {
+            //cropperJson3 - has not crops
+            var sourceObj = cropperJson3.SerializeToCropDataSet();
+            var destObj = sourceObj.TryConvertTo<JObject>();
+            Assert.IsTrue(destObj.Success);
+            Assert.AreEqual(sourceObj, destObj.Result.ToObject<ImageCropDataSet>());
+        }
+
+        [Test]
+        public void CanConvertImageCropperDataSetJsonToString()
+        {
+            var sourceObj = cropperJson1.SerializeToCropDataSet();
+            var destObj = sourceObj.TryConvertTo<string>();
+            Assert.IsTrue(destObj.Success);
+            Assert.IsTrue(destObj.Result.DetectIsJson());
+            var obj = JsonConvert.DeserializeObject<ImageCropDataSet>(cropperJson1, new JsonSerializerSettings {Culture = CultureInfo.InvariantCulture, FloatParseHandling = FloatParseHandling.Decimal});
+            Assert.AreEqual(sourceObj, obj);
+        }
+
+        [TestCase(cropperJson1, cropperJson1, true)]
+        [TestCase(cropperJson1, cropperJson2, false)]        
+        public void CanConvertImageCropperPropertyEditor(string val1, string val2, bool expected)
+        {
+            try
+            {
+                PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(new ActivatorServiceProvider(), Mock.Of<ILogger>());
+                Resolution.Freeze();
+
+                var dataTypeService = new Mock<IDataTypeService>();
+                dataTypeService.Setup(x => x.GetPreValuesCollectionByDataTypeId(It.IsAny<int>())).Returns(new PreValueCollection(Enumerable.Empty<PreValue>()));
+
+                var converter = new Umbraco.Web.PropertyEditors.ValueConverters.ImageCropperValueConverter(dataTypeService.Object);
+                var result = converter.ConvertDataToSource(new PublishedPropertyType("test", 0, "test"), val1, false); // does not use type for conversion
+
+                var resultShouldMatch = val2.SerializeToCropDataSet();
+                if (expected)
+                {
+                    Assert.AreEqual(resultShouldMatch, result);
+                }
+                else
+                {
+                    Assert.AreNotEqual(resultShouldMatch, result);
+                }
+            }
+            finally
+            {
+                PropertyValueConvertersResolver.Reset(true);
+            }
+        }
+
         [Test]
         public void GetCropUrl_CropAliasTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, cropAlias: "Thumb", useCropDimensions: true);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, cropAlias: "Thumb", useCropDimensions: true);
             Assert.AreEqual(mediaPath + "?crop=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&cropmode=percentage&width=100&height=100", urlString);
         }
 
@@ -27,28 +179,28 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetCropUrl_CropAliasIgnoreWidthHeightTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, cropAlias: "Thumb", useCropDimensions: true, width: 50, height: 50);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, cropAlias: "Thumb", useCropDimensions: true, width: 50, height: 50);
             Assert.AreEqual(mediaPath + "?crop=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&cropmode=percentage&width=100&height=100", urlString);
         }
 
         [Test]
         public void GetCropUrl_WidthHeightTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, width: 200, height: 300);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 200, height: 300);
             Assert.AreEqual(mediaPath + "?center=0.80827067669172936,0.96&mode=crop&width=200&height=300", urlString);
         }
 
         [Test]
         public void GetCropUrl_FocalPointTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, cropAlias: "thumb", preferFocalPoint: true, useCropDimensions: true);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, cropAlias: "thumb", preferFocalPoint: true, useCropDimensions: true);
             Assert.AreEqual(mediaPath + "?center=0.80827067669172936,0.96&mode=crop&width=100&height=100", urlString);
         }
 
         [Test]
         public void GetCropUrlFurtherOptionsTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, width: 200, height: 300, furtherOptions: "&filter=comic&roundedcorners=radius-26|bgcolor-fff");
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 200, height: 300, furtherOptions: "&filter=comic&roundedcorners=radius-26|bgcolor-fff");
             Assert.AreEqual(mediaPath + "?center=0.80827067669172936,0.96&mode=crop&width=200&height=300&filter=comic&roundedcorners=radius-26|bgcolor-fff", urlString);
         }
 
@@ -58,7 +210,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetCropUrlNullTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, cropAlias: "Banner", useCropDimensions: true);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, cropAlias: "Banner", useCropDimensions: true);
             Assert.AreEqual(null, urlString);
         }
 
@@ -68,7 +220,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetBaseCropUrlFromModelTest()
         {
-            var cropDataSet = cropperJson.SerializeToCropDataSet();
+            var cropDataSet = cropperJson1.SerializeToCropDataSet();
             var urlString = cropDataSet.GetCropUrl("thumb");
             Assert.AreEqual("?crop=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&cropmode=percentage&width=100&height=100", urlString);
         }
@@ -79,7 +231,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetCropUrl_CropAliasHeightRatioModeTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, cropAlias: "Thumb", useCropDimensions: true, ratioMode:ImageCropRatioMode.Height);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, cropAlias: "Thumb", useCropDimensions: true, ratioMode:ImageCropRatioMode.Height);
             Assert.AreEqual(mediaPath + "?crop=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&cropmode=percentage&width=100&heightratio=1", urlString);
         }
 
@@ -89,7 +241,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetCropUrl_WidthHeightRatioModeTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, width: 300, height: 150, ratioMode:ImageCropRatioMode.Height);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, ratioMode:ImageCropRatioMode.Height);
             Assert.AreEqual(mediaPath + "?center=0.80827067669172936,0.96&mode=crop&width=300&heightratio=0.5", urlString);
         }
 
@@ -99,7 +251,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetCropUrl_HeightWidthRatioModeTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, width: 300, height: 150, ratioMode: ImageCropRatioMode.Width);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, ratioMode: ImageCropRatioMode.Width);
             Assert.AreEqual(mediaPath + "?center=0.80827067669172936,0.96&mode=crop&height=150&widthratio=2", urlString);
         }
 
@@ -109,7 +261,7 @@ namespace Umbraco.Tests.PropertyEditors
         [Test]
         public void GetCropUrl_SpecifiedCropModeTest()
         {
-            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson, width: 300, height: 150, imageCropMode:ImageCropMode.Max);
+            var urlString = mediaPath.GetCropUrl(imageCropperValue: cropperJson1, width: 300, height: 150, imageCropMode:ImageCropMode.Max);
             Assert.AreEqual(mediaPath + "?mode=max&width=300&height=150", urlString);
         }
 

src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs

@@ -380,7 +380,7 @@ namespace Umbraco.Tests.Routing
             var content = umbracoContext.ContentCache.GetById(nodeId);
             Assert.IsNotNull(content);
 
-            var culture = Web.Models.ContentExtensions.GetCulture(umbracoContext, domainService, ServiceContext.LocalizationService, null, content.Id, content.Path, new Uri(currentUrl));
+            var culture = global::Umbraco.Web.Models.ContentExtensions.GetCulture(umbracoContext, domainService, ServiceContext.LocalizationService, null, content.Id, content.Path, new Uri(currentUrl));
             Assert.AreEqual(expectedCulture, culture.Name);
         }
     }

src/Umbraco.Tests/Routing/RoutesCacheTests.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Web.PublishedCache.XmlPublishedCache;
+
+namespace Umbraco.Tests.Routing
+{
+    [DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
+    [TestFixture]
+    public class RoutesCacheTests : BaseRoutingTest
+    {
+        [Test]
+        public void U4_7939()
+        {
+            //var routingContext = GetRoutingContext("/test", 1111);
+            var umbracoContext = GetUmbracoContext("/test", 0);
+            var cache = umbracoContext.ContentCache.InnerCache as PublishedContentCache;
+            if (cache == null) throw new Exception("Unsupported IPublishedContentCache, only the Xml one is supported.");
+
+            PublishedContentCache.UnitTesting = false; // else does not write to routes cache
+            Assert.IsFalse(PublishedContentCache.UnitTesting);
+
+            var z = cache.GetByRoute(umbracoContext, false, "/home/sub1");
+            Assert.IsNotNull(z);
+            Assert.AreEqual(1173, z.Id);
+
+            var routes = cache.RoutesCache.GetCachedRoutes();
+            Assert.AreEqual(1, routes.Count);
+
+            // before the fix, the following assert would fail because the route would
+            // have been stored as { 0, "/home/sub1" } - essentially meaning we were NOT
+            // storing anything in the route cache!
+
+            Assert.AreEqual(1173, routes.Keys.First());
+            Assert.AreEqual("/home/sub1", routes.Values.First());
+        }
+    }
+}

src/Umbraco.Tests/Security/BackOfficeCookieManagerTests.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Web;
+using Microsoft.Owin;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.Profiling;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Web;
+using Umbraco.Web.Routing;
+using Umbraco.Web.Security;
+using Umbraco.Web.Security.Identity;
+
+namespace Umbraco.Tests.Security
+{
+    [TestFixture]
+    public class BackOfficeCookieManagerTests
+    {
+        [Test]
+        public void ShouldAuthenticateRequest_When_Not_Configured()
+        {
+            //should force app ctx to show not-configured
+            ConfigurationManager.AppSettings.Set("umbracoConfigurationStatus", "");
+
+            var dbCtx = new Mock<DatabaseContext>(Mock.Of<IDatabaseFactory>(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), "test");
+            dbCtx.Setup(x => x.IsDatabaseConfigured).Returns(false);
+
+            var appCtx = new ApplicationContext(
+                dbCtx.Object,
+                MockHelper.GetMockedServiceContext(),
+                CacheHelper.CreateDisabledCacheHelper(),
+                new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            
+            var umbCtx = UmbracoContext.CreateContext(
+                Mock.Of<HttpContextBase>(), 
+                appCtx, 
+                new WebSecurity(Mock.Of<HttpContextBase>(), appCtx), 
+                Mock.Of<IUmbracoSettingsSection>(), new List<IUrlProvider>(), false);
+
+            var mgr = new BackOfficeCookieManager(Mock.Of<IUmbracoContextAccessor>(accessor => accessor.Value == umbCtx));
+
+            var result = mgr.ShouldAuthenticateRequest(Mock.Of<IOwinContext>(), new Uri("http://localhost/umbraco"));
+
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void ShouldAuthenticateRequest_When_Configured()
+        {
+            var dbCtx = new Mock<DatabaseContext>(Mock.Of<IDatabaseFactory>(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), "test");
+            dbCtx.Setup(x => x.IsDatabaseConfigured).Returns(true);
+
+            var appCtx = new ApplicationContext(
+                dbCtx.Object,
+                MockHelper.GetMockedServiceContext(),
+                CacheHelper.CreateDisabledCacheHelper(),
+                new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+
+            var umbCtx = UmbracoContext.CreateContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new WebSecurity(Mock.Of<HttpContextBase>(), appCtx),
+                Mock.Of<IUmbracoSettingsSection>(), new List<IUrlProvider>(), false);
+
+            var mgr = new BackOfficeCookieManager(Mock.Of<IUmbracoContextAccessor>(accessor => accessor.Value == umbCtx));
+
+            var request = new Mock<OwinRequest>();
+            request.Setup(owinRequest => owinRequest.Uri).Returns(new Uri("http://localhost/umbraco"));
+
+            var result = mgr.ShouldAuthenticateRequest(
+                Mock.Of<IOwinContext>(context => context.Request == request.Object), 
+                new Uri("http://localhost/umbraco"));
+
+            Assert.IsTrue(result);
+        }
+
+        //TODO : Write remaining tests for `ShouldAuthenticateRequest`
+    }
+}

src/Umbraco.Tests/Security/UmbracoBackOfficeIdentityTests.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Text;
@@ -9,6 +8,7 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Security;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Tests.Security
 {

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -75,6 +75,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Owin, Version=3.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
@@ -94,6 +98,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+      <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Semver">
       <HintPath>..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
     </Reference>
@@ -102,13 +110,13 @@
     <Reference Include="System.configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Entity.Design" />
-    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <Private>True</Private>
-      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.dll</HintPath>
+      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <Private>True</Private>
-      <HintPath>..\packages\SqlServerCE.4.0.0.0\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
+      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
@@ -167,10 +175,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AngularIntegration\AngularAntiForgeryTests.cs" />
-    <Compile Include="AngularIntegration\ContentModelSerializationTests.cs" />
-    <Compile Include="AngularIntegration\JsInitializationTests.cs" />
-    <Compile Include="AngularIntegration\ServerVariablesParserTests.cs" />
+    <Compile Include="Web\AngularIntegration\AngularAntiForgeryTests.cs" />
+    <Compile Include="Web\AngularIntegration\ContentModelSerializationTests.cs" />
+    <Compile Include="Web\AngularIntegration\JsInitializationTests.cs" />
+    <Compile Include="Web\AngularIntegration\ServerVariablesParserTests.cs" />
     <Compile Include="ApplicationContextTests.cs" />
     <Compile Include="AttemptTests.cs" />
     <Compile Include="Cache\CacheRefresherTests.cs" />
@@ -180,12 +188,12 @@
     <Compile Include="Cache\FullDataSetCachePolicyTests.cs" />
     <Compile Include="Cache\SingleItemsOnlyCachePolicyTests.cs" />
     <Compile Include="Collections\DeepCloneableListTests.cs" />
-    <Compile Include="Controllers\BackOfficeControllerUnitTests.cs" />
+    <Compile Include="Web\Controllers\BackOfficeControllerUnitTests.cs" />
     <Compile Include="DelegateExtensionsTests.cs" />
     <Compile Include="Logging\AsyncRollingFileAppenderTest.cs" />
     <Compile Include="Logging\DebugAppender.cs" />
     <Compile Include="Logging\ParallelForwarderTest.cs" />
-    <Compile Include="Mvc\RenderIndexActionSelectorAttributeTests.cs" />
+    <Compile Include="Web\Mvc\RenderIndexActionSelectorAttributeTests.cs" />
     <Compile Include="Persistence\Repositories\AuditRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\DomainRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\PartialViewRepositoryTests.cs" />
@@ -193,7 +201,9 @@
     <Compile Include="Persistence\Repositories\TaskRepositoryTest.cs" />
     <Compile Include="Persistence\Repositories\TaskTypeRepositoryTest.cs" />
     <Compile Include="Resolvers\ResolverBaseTest.cs" />
+    <Compile Include="Routing\RoutesCacheTests.cs" />
     <Compile Include="Routing\UrlRoutingTestBase.cs" />
+    <Compile Include="Security\BackOfficeCookieManagerTests.cs" />
     <Compile Include="Security\UmbracoBackOfficeIdentityTests.cs" />
     <Compile Include="Services\ContentTypeServiceExtensionsTests.cs" />
     <Compile Include="Services\PublicAccessServiceTests.cs" />
@@ -234,8 +244,8 @@
     <Compile Include="Models\UmbracoEntityTests.cs" />
     <Compile Include="Models\UserTests.cs" />
     <Compile Include="Models\UserTypeTests.cs" />
-    <Compile Include="Mvc\SurfaceControllerTests.cs" />
-    <Compile Include="Mvc\UmbracoViewPageTests.cs" />
+    <Compile Include="Web\Mvc\SurfaceControllerTests.cs" />
+    <Compile Include="Web\Mvc\UmbracoViewPageTests.cs" />
     <Compile Include="BootManagers\CoreBootManagerTests.cs" />
     <Compile Include="BootManagers\WebBootManagerTests.cs" />
     <Compile Include="Cache\ObjectCacheProviderTests.cs" />
@@ -310,9 +320,9 @@
     <Compile Include="Configurations\UmbracoSettings\ViewstateMoverModuleElementTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\WebRoutingElementDefaultTests.cs" />
     <Compile Include="Configurations\UmbracoSettings\WebRoutingElementTests.cs" />
-    <Compile Include="Controllers\WebApiEditors\ContentControllerUnitTests.cs" />
-    <Compile Include="Controllers\WebApiEditors\FilterAllowedOutgoingContentAttributeTests.cs" />
-    <Compile Include="Controllers\WebApiEditors\MediaControllerUnitTests.cs" />
+    <Compile Include="Web\Controllers\WebApiEditors\ContentControllerUnitTests.cs" />
+    <Compile Include="Web\Controllers\WebApiEditors\FilterAllowedOutgoingContentAttributeTests.cs" />
+    <Compile Include="Web\Controllers\WebApiEditors\MediaControllerUnitTests.cs" />
     <Compile Include="CoreXml\FrameworkXmlTests.cs" />
     <Compile Include="DynamicsAndReflection\QueryableExtensionTests.cs" />
     <Compile Include="DynamicsAndReflection\ExtensionMethodFinderTests.cs" />
@@ -322,8 +332,8 @@
     <Compile Include="Migrations\Upgrades\ValidateV7UpgradeTest.cs" />
     <Compile Include="Models\ContentExtensionsTests.cs" />
     <Compile Include="Models\UserExtensionsTests.cs" />
-    <Compile Include="Mvc\MergeParentContextViewDataAttributeTests.cs" />
-    <Compile Include="Mvc\ViewDataDictionaryExtensionTests.cs" />
+    <Compile Include="Web\Mvc\MergeParentContextViewDataAttributeTests.cs" />
+    <Compile Include="Web\Mvc\ViewDataDictionaryExtensionTests.cs" />
     <Compile Include="Persistence\PetaPocoExtensionsTest.cs" />
     <Compile Include="Persistence\Querying\ContentTypeSqlMappingTests.cs" />
     <Compile Include="Persistence\Repositories\MacroRepositoryTest.cs" />
@@ -420,7 +430,7 @@
     <Compile Include="PublishedContent\PublishedContentTests.cs" />
     <Compile Include="PublishedContent\PublishedMediaTests.cs" />
     <Compile Include="HashCodeCombinerTests.cs" />
-    <Compile Include="Mvc\HtmlHelperExtensionMethodsTests.cs" />
+    <Compile Include="Web\Mvc\HtmlHelperExtensionMethodsTests.cs" />
     <Compile Include="IO\IOHelperTest.cs" />
     <Compile Include="LibraryTests.cs" />
     <Compile Include="PropertyEditors\PropertyEditorValueConverterTests.cs" />
@@ -505,7 +515,7 @@
       <DependentUpon>ImportResources.resx</DependentUpon>
     </Compile>
     <Compile Include="Services\ThreadSafetyServiceTest.cs" />
-    <Compile Include="Controllers\PluginControllerAreaTests.cs" />
+    <Compile Include="Web\Controllers\PluginControllerAreaTests.cs" />
     <Compile Include="Cache\DistributedCache\DistributedCacheTests.cs" />
     <Compile Include="Templates\MasterPageHelperTests.cs" />
     <Compile Include="TestHelpers\BaseDatabaseFactoryTest.cs" />
@@ -569,6 +579,7 @@
     <Compile Include="Plugins\TypeFinderTests.cs" />
     <Compile Include="Routing\UmbracoModuleTests.cs" />
     <Compile Include="VersionExtensionTests.cs" />
+    <Compile Include="Web\WebExtensionMethodTests.cs" />
     <Compile Include="XmlExtensionsTests.cs" />
     <Compile Include="XmlHelperTests.cs" />
   </ItemGroup>
@@ -738,8 +749,13 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /D
-xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\x86\*.* "$(TargetDir)x86\" /Y /F /E /D</PostBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /I /C /D
+xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\" /Y /F /E /I /C /D</PreBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/Umbraco.Tests/Web/AngularIntegration/AngularAntiForgeryTests.cs

@@ -1,20 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
+using System.IO;
 using System.Net;
-using System.Security.Claims;
 using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web;
-using System.Web.Security;
 using NUnit.Framework;
-using Umbraco.Core.Security;
-using Umbraco.Tests.TestHelpers;
 using Umbraco.Web.WebApi.Filters;
 
-namespace Umbraco.Tests.AngularIntegration
+namespace Umbraco.Tests.Web.AngularIntegration
 {
     [TestFixture]
     public class AngularAntiForgeryTests

src/Umbraco.Tests/Web/AngularIntegration/ContentModelSerializationTests.cs

@@ -1,80 +1,77 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core;
-using Umbraco.Web.Models.ContentEditing;
-
-namespace Umbraco.Tests.AngularIntegration
-{
-    [TestFixture]
-    public class ContentModelSerializationTests
-    {
-        [Test]
-        public void Content_Display_To_Json()
-        {
-            //create 3 tabs with 3 properties each
-            var tabs = new List<Tab<ContentPropertyDisplay>>();
-            for (var tabIndex = 0; tabIndex < 3; tabIndex ++)
-            {
-                var props = new List<ContentPropertyDisplay>();
-                for (var propertyIndex = 0; propertyIndex < 3; propertyIndex ++)
-                {
-                    props.Add(new ContentPropertyDisplay
-                        {
-                            Alias = "property" + propertyIndex,
-                            Label = "Property " + propertyIndex,
-                            Id = propertyIndex,
-                            Value = "value" + propertyIndex,
-                            Config = new Dictionary<string, object> {{ propertyIndex.ToInvariantString(), "value" }},
-                            Description = "Description " + propertyIndex,
-                            View = "~/Views/View" + propertyIndex,
-                            HideLabel = false
-                        });                    
-                }
-                tabs.Add(new Tab<ContentPropertyDisplay>()
-                    {
-                        Alias = "Tab" + tabIndex,
-                        Label = "Tab" + tabIndex,
-                        Properties = props
-                    });
-            }
-
-            var displayModel = new ContentItemDisplay
-                {
-                    Id = 1234,
-                    Name = "Test",
-                    Tabs = tabs
-                };
-
-            var json = JsonConvert.SerializeObject(displayModel);
-
-            var jObject = JObject.Parse(json);
-
-            Assert.AreEqual("1234", jObject["id"].ToString());
-            Assert.AreEqual("Test", jObject["name"].ToString());
-            Assert.AreEqual(3, jObject["tabs"].Count());
-            for (var tab = 0; tab < jObject["tabs"].Count(); tab++)
-            {
-                Assert.AreEqual("Tab" + tab, jObject["tabs"][tab]["alias"].ToString());
-                Assert.AreEqual("Tab" + tab, jObject["tabs"][tab]["label"].ToString());
-                Assert.AreEqual(3, jObject["tabs"][tab]["properties"].Count());
-                for (var prop = 0; prop < jObject["tabs"][tab]["properties"].Count(); prop++)
-                {
-                    Assert.AreEqual("property" + prop, jObject["tabs"][tab]["properties"][prop]["alias"].ToString());
-                    Assert.AreEqual("Property " + prop, jObject["tabs"][tab]["properties"][prop]["label"].ToString());
-                    Assert.AreEqual(prop, jObject["tabs"][tab]["properties"][prop]["id"].Value<int>());
-                    Assert.AreEqual("value" + prop, jObject["tabs"][tab]["properties"][prop]["value"].ToString());
-                    Assert.AreEqual("{\"" + prop + "\":\"value\"}", jObject["tabs"][tab]["properties"][prop]["config"].ToString(Formatting.None));
-                    Assert.AreEqual("Description " + prop, jObject["tabs"][tab]["properties"][prop]["description"].ToString());
-                    Assert.AreEqual(false, jObject["tabs"][tab]["properties"][prop]["hideLabel"].Value<bool>());
-                }
-            }                
-        }
-
-    }
-}
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.Tests.Web.AngularIntegration
+{
+    [TestFixture]
+    public class ContentModelSerializationTests
+    {
+        [Test]
+        public void Content_Display_To_Json()
+        {
+            //create 3 tabs with 3 properties each
+            var tabs = new List<Tab<ContentPropertyDisplay>>();
+            for (var tabIndex = 0; tabIndex < 3; tabIndex ++)
+            {
+                var props = new List<ContentPropertyDisplay>();
+                for (var propertyIndex = 0; propertyIndex < 3; propertyIndex ++)
+                {
+                    props.Add(new ContentPropertyDisplay
+                        {
+                            Alias = "property" + propertyIndex,
+                            Label = "Property " + propertyIndex,
+                            Id = propertyIndex,
+                            Value = "value" + propertyIndex,
+                            Config = new Dictionary<string, object> {{ propertyIndex.ToInvariantString(), "value" }},
+                            Description = "Description " + propertyIndex,
+                            View = "~/Views/View" + propertyIndex,
+                            HideLabel = false
+                        });                    
+                }
+                tabs.Add(new Tab<ContentPropertyDisplay>()
+                    {
+                        Alias = "Tab" + tabIndex,
+                        Label = "Tab" + tabIndex,
+                        Properties = props
+                    });
+            }
+
+            var displayModel = new ContentItemDisplay
+                {
+                    Id = 1234,
+                    Name = "Test",
+                    Tabs = tabs
+                };
+
+            var json = JsonConvert.SerializeObject(displayModel);
+
+            var jObject = JObject.Parse(json);
+
+            Assert.AreEqual("1234", jObject["id"].ToString());
+            Assert.AreEqual("Test", jObject["name"].ToString());
+            Assert.AreEqual(3, jObject["tabs"].Count());
+            for (var tab = 0; tab < jObject["tabs"].Count(); tab++)
+            {
+                Assert.AreEqual("Tab" + tab, jObject["tabs"][tab]["alias"].ToString());
+                Assert.AreEqual("Tab" + tab, jObject["tabs"][tab]["label"].ToString());
+                Assert.AreEqual(3, jObject["tabs"][tab]["properties"].Count());
+                for (var prop = 0; prop < jObject["tabs"][tab]["properties"].Count(); prop++)
+                {
+                    Assert.AreEqual("property" + prop, jObject["tabs"][tab]["properties"][prop]["alias"].ToString());
+                    Assert.AreEqual("Property " + prop, jObject["tabs"][tab]["properties"][prop]["label"].ToString());
+                    Assert.AreEqual(prop, jObject["tabs"][tab]["properties"][prop]["id"].Value<int>());
+                    Assert.AreEqual("value" + prop, jObject["tabs"][tab]["properties"][prop]["value"].ToString());
+                    Assert.AreEqual("{\"" + prop + "\":\"value\"}", jObject["tabs"][tab]["properties"][prop]["config"].ToString(Formatting.None));
+                    Assert.AreEqual("Description " + prop, jObject["tabs"][tab]["properties"][prop]["description"].ToString());
+                    Assert.AreEqual(false, jObject["tabs"][tab]["properties"][prop]["hideLabel"].Value<bool>());
+                }
+            }                
+        }
+
+    }
+}

src/Umbraco.Tests/Web/AngularIntegration/JsInitializationTests.cs

@@ -1,41 +1,36 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using NUnit.Framework;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core.Manifest;
-using Umbraco.Web.UI.JavaScript;
-
-namespace Umbraco.Tests.AngularIntegration
-{
-    [TestFixture]
-    public class JsInitializationTests
-    {
-
-        [Test]
-        public void Get_Default_Init()
-        {
-            var init = JsInitialization.GetDefaultInitialization();
-            Assert.IsTrue(init.Any());
-        }
-
-        [Test]
-        public void Parse_Main()
-        {
-            var result = JsInitialization.ParseMain(new[] {"[World]", "Hello" });
-
-            Assert.AreEqual(@"LazyLoad.js([World], function () {
-    //we need to set the legacy UmbClientMgr path
-    UmbClientMgr.setUmbracoPath('Hello');
-
-    jQuery(document).ready(function () {
-
-        angular.bootstrap(document, ['umbraco']);
-
-    });
-});", result);
-        }
-    }
-}
+using System.Linq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Web.UI.JavaScript;
+
+namespace Umbraco.Tests.Web.AngularIntegration
+{
+    [TestFixture]
+    public class JsInitializationTests
+    {
+
+        [Test]
+        public void Get_Default_Init()
+        {
+            var init = JsInitialization.GetDefaultInitialization();
+            Assert.IsTrue(init.Any());
+        }
+
+        [Test]
+        public void Parse_Main()
+        {
+            var result = JsInitialization.ParseMain(new[] {"[World]", "Hello" });
+
+            Assert.AreEqual(@"LazyLoad.js([World], function () {
+    //we need to set the legacy UmbClientMgr path
+    UmbClientMgr.setUmbracoPath('Hello');
+
+    jQuery(document).ready(function () {
+
+        angular.bootstrap(document, ['umbraco']);
+
+    });
+});".StripWhitespace(), result.StripWhitespace());
+        }
+    }
+}

src/Umbraco.Tests/Web/AngularIntegration/ServerVariablesParserTests.cs

@@ -1,33 +1,34 @@
-using System.Collections.Generic;
-using NUnit.Framework;
-using Umbraco.Web.UI.JavaScript;
-
-namespace Umbraco.Tests.AngularIntegration
-{
-    [TestFixture]
-    public class ServerVariablesParserTests
-    {
-       
-
-        [Test]
-        public void Parse()
-        {
-            var d = new Dictionary<string, object>();
-            d.Add("test1", "Test 1");
-            d.Add("test2", "Test 2");
-            d.Add("test3", "Test 3");
-            d.Add("test4", "Test 4");
-            d.Add("test5", "Test 5");
-
-            var output = ServerVariablesParser.Parse(d);
-
-            Assert.IsTrue(output.Contains(@"Umbraco.Sys.ServerVariables = {
-  ""test1"": ""Test 1"",
-  ""test2"": ""Test 2"",
-  ""test3"": ""Test 3"",
-  ""test4"": ""Test 4"",
-  ""test5"": ""Test 5""
-} ;"));
-        }
-    }
+using System.Collections.Generic;
+using NUnit.Framework;
+using Umbraco.Web.UI.JavaScript;
+using Umbraco.Core;
+
+namespace Umbraco.Tests.Web.AngularIntegration
+{
+    [TestFixture]
+    public class ServerVariablesParserTests
+    {
+       
+
+        [Test]
+        public void Parse()
+        {
+            var d = new Dictionary<string, object>();
+            d.Add("test1", "Test 1");
+            d.Add("test2", "Test 2");
+            d.Add("test3", "Test 3");
+            d.Add("test4", "Test 4");
+            d.Add("test5", "Test 5");
+
+            var output = ServerVariablesParser.Parse(d).StripWhitespace();
+
+            Assert.IsTrue(output.Contains(@"Umbraco.Sys.ServerVariables = {
+  ""test1"": ""Test 1"",
+  ""test2"": ""Test 2"",
+  ""test3"": ""Test 3"",
+  ""test4"": ""Test 4"",
+  ""test5"": ""Test 5""
+} ;".StripWhitespace()));
+        }
+    }
 }

src/Umbraco.Tests/Web/Controllers/BackOfficeControllerUnitTests.cs

@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Umbraco.Web.Editors;
 
-namespace Umbraco.Tests.Controllers
+namespace Umbraco.Tests.Web.Controllers
 {
     [TestFixture]
     public class BackOfficeControllerUnitTests

src/Umbraco.Tests/Web/Controllers/PluginControllerAreaTests.cs

@@ -4,7 +4,7 @@ using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 using Umbraco.Web.Mvc;
 
-namespace Umbraco.Tests.Controllers
+namespace Umbraco.Tests.Web.Controllers
 {
 	[TestFixture]
 	public class PluginControllerAreaTests : BaseWebTest

src/Umbraco.Tests/Web/Controllers/WebApiEditors/ContentControllerUnitTests.cs

@@ -1,366 +1,366 @@
-using System.Collections.Generic;
-using System.Web.Http;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Services;
-using Umbraco.Web.Editors;
-
-namespace Umbraco.Tests.Controllers.WebApiEditors
-{
-    [TestFixture]
-    public class ContentControllerUnitTests
-    {
-        [Test]
-        public void Access_Allowed_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            var content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
-            var contentService = contentServiceMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, contentService, 1234);
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void Throws_Exception_When_No_Content_Found()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            var content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(0)).Returns(content);
-            var contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();    
-            var permissions = new List<EntityPermission>();
-            userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions);
-            var userService = userServiceMock.Object;
-            
-            //act/assert
-            Assert.Throws<HttpResponseException>(() => ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, contentService, 1234, new[] { 'F' }));
-        }
-
-        [Test]
-        public void No_Access_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartContentId).Returns(9876);
-            var user = userMock.Object;
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            var content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
-            var contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();    
-            var permissions = new List<EntityPermission>();
-            userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions);
-            var userService = userServiceMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, contentService, 1234, new[] { 'F'});
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public void No_Access_By_Permission()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            var content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
-            var contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();    
-            var permissions = new List<EntityPermission>
-                {
-                    new EntityPermission(9, 1234, new string[]{ "A", "B", "C" })
-                };
-            userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions);
-            var userService = userServiceMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, contentService, 1234, new[] { 'F'});
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public void Access_Allowed_By_Permission()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            var content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
-            var contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();    
-            var permissions = new List<EntityPermission>
-                {
-                    new EntityPermission(9, 1234, new string[]{ "A", "F", "C" })
-                };
-            userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions);
-            var userService = userServiceMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, contentService, 1234, new[] { 'F'});
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void Access_To_Root_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-            
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, null, -1);
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void Access_To_Recycle_Bin_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-            
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, null, -20);
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void No_Access_To_Recycle_Bin_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartContentId).Returns(1234);
-            var user = userMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, null, -20);
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public void No_Access_To_Root_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartContentId).Returns(1234);
-            var user = userMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, null, -1);
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public void Access_To_Root_By_Permission()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new List<EntityPermission>
-                {
-                    new EntityPermission(9, 1234, new string[]{ "A" })
-                };
-            userServiceMock.Setup(x => x.GetPermissions(user, -1)).Returns(permissions);
-            var userService = userServiceMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, null, -1, new[] { 'A'});
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void No_Access_To_Root_By_Permission()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new List<EntityPermission>
-                {
-                    new EntityPermission(9, 1234, new string[]{ "A" })
-                };
-            userServiceMock.Setup(x => x.GetPermissions(user, -1)).Returns(permissions);
-            var userService = userServiceMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, null, -1, new[] { 'B'});
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public void Access_To_Recycle_Bin_By_Permission()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new List<EntityPermission>
-                {
-                    new EntityPermission(9, 1234, new string[]{ "A" })
-                };
-            userServiceMock.Setup(x => x.GetPermissions(user, -20)).Returns(permissions);
-            var userService = userServiceMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, null, -20, new[] { 'A'});
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void No_Access_To_Recycle_Bin_By_Permission()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new List<EntityPermission>
-                {
-                    new EntityPermission(9, 1234, new string[]{ "A" })
-                };
-            userServiceMock.Setup(x => x.GetPermissions(user, -20)).Returns(permissions);
-            var userService = userServiceMock.Object;
-
-            //act
-            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, null, -20, new[] { 'B'});
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-    }
-
-    //NOTE: The below self hosted stuff does work so need to get some tests written. Some are not possible atm because
-    // of the legacy SQL calls like checking permissions.
-
-    //[TestFixture]
-    //public class ContentControllerHostedTests : BaseRoutingTest
-    //{
-
-    //    protected override DatabaseBehavior DatabaseTestBehavior
-    //    {
-    //        get { return DatabaseBehavior.NoDatabasePerFixture; }
-    //    }
-
-    //    public override void TearDown()
-    //    {
-    //        base.TearDown();
-    //        UmbracoAuthorizeAttribute.Enable = true;
-    //        UmbracoApplicationAuthorizeAttribute.Enable = true;
-    //    }
-
-    //    /// <summary>
-    //    /// Tests to ensure that the response filter works so that any items the user
-    //    /// doesn't have access to are removed
-    //    /// </summary>
-    //    [Test]
-    //    public async void Get_By_Ids_Response_Filtered()
-    //    {
-    //        UmbracoAuthorizeAttribute.Enable = false;
-    //        UmbracoApplicationAuthorizeAttribute.Enable = false;
-
-    //        var baseUrl = string.Format("http://{0}:9876", Environment.MachineName);
-    //        var url = baseUrl + "/api/Content/GetByIds?ids=1&ids=2";
-
-    //        var routingCtx = GetRoutingContext(url, 1234, null, true);
-
-    //        var config = new HttpSelfHostConfiguration(baseUrl);
-    //        using (var server = new HttpSelfHostServer(config))
-    //        {
-    //            var route = config.Routes.MapHttpRoute("test", "api/Content/GetByIds",
-    //            new
-    //            {
-    //                controller = "Content",
-    //                action = "GetByIds",
-    //                id = RouteParameter.Optional
-    //            });
-    //            route.DataTokens["Namespaces"] = new string[] { "Umbraco.Web.Editors" };
-
-    //            var client = new HttpClient(server);
-
-    //            var request = new HttpRequestMessage
-    //            {
-    //                RequestUri = new Uri(url),
-    //                Method = HttpMethod.Get
-    //            };
-
-    //            var result = await client.SendAsync(request);
-    //        }
-             
-    //    }
-
-    //}
-}
+using System.Collections.Generic;
+using System.Web.Http;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Services;
+using Umbraco.Web.Editors;
+
+namespace Umbraco.Tests.Web.Controllers.WebApiEditors
+{
+    [TestFixture]
+    public class ContentControllerUnitTests
+    {
+        [Test]
+        public void Access_Allowed_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+            var contentMock = new Mock<IContent>();
+            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+            var content = contentMock.Object;
+            var contentServiceMock = new Mock<IContentService>();
+            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
+            var contentService = contentServiceMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, contentService, 1234);
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void Throws_Exception_When_No_Content_Found()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+            var contentMock = new Mock<IContent>();
+            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+            var content = contentMock.Object;
+            var contentServiceMock = new Mock<IContentService>();
+            contentServiceMock.Setup(x => x.GetById(0)).Returns(content);
+            var contentService = contentServiceMock.Object;
+            var userServiceMock = new Mock<IUserService>();    
+            var permissions = new List<EntityPermission>();
+            userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions);
+            var userService = userServiceMock.Object;
+            
+            //act/assert
+            Assert.Throws<HttpResponseException>(() => ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, contentService, 1234, new[] { 'F' }));
+        }
+
+        [Test]
+        public void No_Access_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartContentId).Returns(9876);
+            var user = userMock.Object;
+            var contentMock = new Mock<IContent>();
+            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+            var content = contentMock.Object;
+            var contentServiceMock = new Mock<IContentService>();
+            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
+            var contentService = contentServiceMock.Object;
+            var userServiceMock = new Mock<IUserService>();    
+            var permissions = new List<EntityPermission>();
+            userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions);
+            var userService = userServiceMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, contentService, 1234, new[] { 'F'});
+
+            //assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void No_Access_By_Permission()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+            var contentMock = new Mock<IContent>();
+            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+            var content = contentMock.Object;
+            var contentServiceMock = new Mock<IContentService>();
+            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
+            var contentService = contentServiceMock.Object;
+            var userServiceMock = new Mock<IUserService>();    
+            var permissions = new List<EntityPermission>
+                {
+                    new EntityPermission(9, 1234, new string[]{ "A", "B", "C" })
+                };
+            userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions);
+            var userService = userServiceMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, contentService, 1234, new[] { 'F'});
+
+            //assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void Access_Allowed_By_Permission()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+            var contentMock = new Mock<IContent>();
+            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+            var content = contentMock.Object;
+            var contentServiceMock = new Mock<IContentService>();
+            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
+            var contentService = contentServiceMock.Object;
+            var userServiceMock = new Mock<IUserService>();    
+            var permissions = new List<EntityPermission>
+                {
+                    new EntityPermission(9, 1234, new string[]{ "A", "F", "C" })
+                };
+            userServiceMock.Setup(x => x.GetPermissions(user, 1234)).Returns(permissions);
+            var userService = userServiceMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, contentService, 1234, new[] { 'F'});
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void Access_To_Root_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+            
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, null, -1);
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void Access_To_Recycle_Bin_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+            
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, null, -20);
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void No_Access_To_Recycle_Bin_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartContentId).Returns(1234);
+            var user = userMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, null, -20);
+
+            //assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void No_Access_To_Root_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartContentId).Returns(1234);
+            var user = userMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, null, null, -1);
+
+            //assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void Access_To_Root_By_Permission()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+
+            var userServiceMock = new Mock<IUserService>();
+            var permissions = new List<EntityPermission>
+                {
+                    new EntityPermission(9, 1234, new string[]{ "A" })
+                };
+            userServiceMock.Setup(x => x.GetPermissions(user, -1)).Returns(permissions);
+            var userService = userServiceMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, null, -1, new[] { 'A'});
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void No_Access_To_Root_By_Permission()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+
+            var userServiceMock = new Mock<IUserService>();
+            var permissions = new List<EntityPermission>
+                {
+                    new EntityPermission(9, 1234, new string[]{ "A" })
+                };
+            userServiceMock.Setup(x => x.GetPermissions(user, -1)).Returns(permissions);
+            var userService = userServiceMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, null, -1, new[] { 'B'});
+
+            //assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void Access_To_Recycle_Bin_By_Permission()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+
+            var userServiceMock = new Mock<IUserService>();
+            var permissions = new List<EntityPermission>
+                {
+                    new EntityPermission(9, 1234, new string[]{ "A" })
+                };
+            userServiceMock.Setup(x => x.GetPermissions(user, -20)).Returns(permissions);
+            var userService = userServiceMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, null, -20, new[] { 'A'});
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void No_Access_To_Recycle_Bin_By_Permission()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+
+            var userServiceMock = new Mock<IUserService>();
+            var permissions = new List<EntityPermission>
+                {
+                    new EntityPermission(9, 1234, new string[]{ "A" })
+                };
+            userServiceMock.Setup(x => x.GetPermissions(user, -20)).Returns(permissions);
+            var userService = userServiceMock.Object;
+
+            //act
+            var result = ContentController.CheckPermissions(new Dictionary<string, object>(), user, userService, null, -20, new[] { 'B'});
+
+            //assert
+            Assert.IsFalse(result);
+        }
+
+    }
+
+    //NOTE: The below self hosted stuff does work so need to get some tests written. Some are not possible atm because
+    // of the legacy SQL calls like checking permissions.
+
+    //[TestFixture]
+    //public class ContentControllerHostedTests : BaseRoutingTest
+    //{
+
+    //    protected override DatabaseBehavior DatabaseTestBehavior
+    //    {
+    //        get { return DatabaseBehavior.NoDatabasePerFixture; }
+    //    }
+
+    //    public override void TearDown()
+    //    {
+    //        base.TearDown();
+    //        UmbracoAuthorizeAttribute.Enable = true;
+    //        UmbracoApplicationAuthorizeAttribute.Enable = true;
+    //    }
+
+    //    /// <summary>
+    //    /// Tests to ensure that the response filter works so that any items the user
+    //    /// doesn't have access to are removed
+    //    /// </summary>
+    //    [Test]
+    //    public async void Get_By_Ids_Response_Filtered()
+    //    {
+    //        UmbracoAuthorizeAttribute.Enable = false;
+    //        UmbracoApplicationAuthorizeAttribute.Enable = false;
+
+    //        var baseUrl = string.Format("http://{0}:9876", Environment.MachineName);
+    //        var url = baseUrl + "/api/Content/GetByIds?ids=1&ids=2";
+
+    //        var routingCtx = GetRoutingContext(url, 1234, null, true);
+
+    //        var config = new HttpSelfHostConfiguration(baseUrl);
+    //        using (var server = new HttpSelfHostServer(config))
+    //        {
+    //            var route = config.Routes.MapHttpRoute("test", "api/Content/GetByIds",
+    //            new
+    //            {
+    //                controller = "Content",
+    //                action = "GetByIds",
+    //                id = RouteParameter.Optional
+    //            });
+    //            route.DataTokens["Namespaces"] = new string[] { "Umbraco.Web.Editors" };
+
+    //            var client = new HttpClient(server);
+
+    //            var request = new HttpRequestMessage
+    //            {
+    //                RequestUri = new Uri(url),
+    //                Method = HttpMethod.Get
+    //            };
+
+    //            var result = await client.SendAsync(request);
+    //        }
+             
+    //    }
+
+    //}
+}

src/Umbraco.Tests/Web/Controllers/WebApiEditors/FilterAllowedOutgoingContentAttributeTests.cs

@@ -1,136 +1,136 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Formatting;
-using System.Net.Http.Headers;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.WebApi.Filters;
-
-namespace Umbraco.Tests.Controllers.WebApiEditors
-{
-    [TestFixture]
-    public class FilterAllowedOutgoingContentAttributeTests
-    {
-        [Test]
-        public void GetValueFromResponse_Already_EnumerableContent()
-        {
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>));
-            var val = new List<ContentItemBasic>() {new ContentItemBasic()};
-            var result = att.GetValueFromResponse(
-                new ObjectContent(typeof (IEnumerable<ContentItemBasic>),
-                                  val, 
-                                  new JsonMediaTypeFormatter(), 
-                                  new MediaTypeHeaderValue("html/text")));
-
-            Assert.AreEqual(val, result);
-            Assert.AreEqual(1, ((IEnumerable<ContentItemBasic>)result).Count());
-        }
-
-        [Test]
-        public void GetValueFromResponse_From_Property()
-        {
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), "MyList");
-            var val = new List<ContentItemBasic>() { new ContentItemBasic() };
-            var container = new MyTestClass() {MyList = val};
-
-            var result = att.GetValueFromResponse(
-                new ObjectContent(typeof(MyTestClass),
-                                  container,
-                                  new JsonMediaTypeFormatter(),
-                                  new MediaTypeHeaderValue("html/text")));
-
-            Assert.AreEqual(val, result);
-            Assert.AreEqual(1, ((IEnumerable<ContentItemBasic>)result).Count());
-        }
-
-        [Test]
-        public void GetValueFromResponse_Returns_Null_Not_Found_Property()
-        {
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), "DontFind");
-            var val = new List<ContentItemBasic>() { new ContentItemBasic() };
-            var container = new MyTestClass() { MyList = val };
-
-            var result = att.GetValueFromResponse(
-                new ObjectContent(typeof(MyTestClass),
-                                  container,
-                                  new JsonMediaTypeFormatter(),
-                                  new MediaTypeHeaderValue("html/text")));
-
-            Assert.AreEqual(null, result);
-
-        }
-
-        [Test]
-        public void Filter_On_Start_Node()
-        {
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>));
-            var list = new List<dynamic>();
-            var path = "";
-            for (var i = 0; i < 10; i++)
-            {
-                if (i > 0 && path.EndsWith(",") == false)
-                {
-                    path += ",";
-                }
-                path += i.ToInvariantString();
-                list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = i, Path = path });
-            }
-
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartContentId).Returns(5);
-            var user = userMock.Object;
-            
-            att.FilterBasedOnStartNode(list, user);
-
-            Assert.AreEqual(5, list.Count);
-            
-        }
-
-        [Test]
-        public void Filter_On_Permissions()
-        {
-            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>));
-            var list = new List<dynamic>();
-            for (var i = 0; i < 10; i++)
-            {
-                list.Add(new ContentItemBasic{Id = i, Name = "Test" + i, ParentId = -1});
-            }
-            var ids = list.Select(x => (int)x.Id).ToArray();
-            
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartContentId).Returns(-1);
-            var user = userMock.Object;
-
-            var userServiceMock = new Mock<IUserService>();
-            //we're only assigning 3 nodes browse permissions so that is what we expect as a result
-            var permissions = new List<EntityPermission>
-                {
-                    new EntityPermission(9, 1, new string[]{ "F" }),
-                    new EntityPermission(9, 2, new string[]{ "F" }),
-                    new EntityPermission(9, 3, new string[]{ "F" }),
-                    new EntityPermission(9, 4, new string[]{ "A" })
-                };
-            userServiceMock.Setup(x => x.GetPermissions(user, ids)).Returns(permissions);
-            var userService = userServiceMock.Object;
-
-            att.FilterBasedOnPermissions(list, user, userService);
-
-            Assert.AreEqual(3, list.Count);
-            Assert.AreEqual(1, list.ElementAt(0).Id);
-            Assert.AreEqual(2, list.ElementAt(1).Id);
-            Assert.AreEqual(3, list.ElementAt(2).Id);
-        }
-        
-        private class MyTestClass
-        {
-            public IEnumerable<ContentItemBasic> MyList { get; set; } 
-        }
-    }
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Formatting;
+using System.Net.Http.Headers;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.WebApi.Filters;
+
+namespace Umbraco.Tests.Web.Controllers.WebApiEditors
+{
+    [TestFixture]
+    public class FilterAllowedOutgoingContentAttributeTests
+    {
+        [Test]
+        public void GetValueFromResponse_Already_EnumerableContent()
+        {
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>));
+            var val = new List<ContentItemBasic>() {new ContentItemBasic()};
+            var result = att.GetValueFromResponse(
+                new ObjectContent(typeof (IEnumerable<ContentItemBasic>),
+                                  val, 
+                                  new JsonMediaTypeFormatter(), 
+                                  new MediaTypeHeaderValue("html/text")));
+
+            Assert.AreEqual(val, result);
+            Assert.AreEqual(1, ((IEnumerable<ContentItemBasic>)result).Count());
+        }
+
+        [Test]
+        public void GetValueFromResponse_From_Property()
+        {
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), "MyList");
+            var val = new List<ContentItemBasic>() { new ContentItemBasic() };
+            var container = new MyTestClass() {MyList = val};
+
+            var result = att.GetValueFromResponse(
+                new ObjectContent(typeof(MyTestClass),
+                                  container,
+                                  new JsonMediaTypeFormatter(),
+                                  new MediaTypeHeaderValue("html/text")));
+
+            Assert.AreEqual(val, result);
+            Assert.AreEqual(1, ((IEnumerable<ContentItemBasic>)result).Count());
+        }
+
+        [Test]
+        public void GetValueFromResponse_Returns_Null_Not_Found_Property()
+        {
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>), "DontFind");
+            var val = new List<ContentItemBasic>() { new ContentItemBasic() };
+            var container = new MyTestClass() { MyList = val };
+
+            var result = att.GetValueFromResponse(
+                new ObjectContent(typeof(MyTestClass),
+                                  container,
+                                  new JsonMediaTypeFormatter(),
+                                  new MediaTypeHeaderValue("html/text")));
+
+            Assert.AreEqual(null, result);
+
+        }
+
+        [Test]
+        public void Filter_On_Start_Node()
+        {
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>));
+            var list = new List<dynamic>();
+            var path = "";
+            for (var i = 0; i < 10; i++)
+            {
+                if (i > 0 && path.EndsWith(",") == false)
+                {
+                    path += ",";
+                }
+                path += i.ToInvariantString();
+                list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = i, Path = path });
+            }
+
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartContentId).Returns(5);
+            var user = userMock.Object;
+            
+            att.FilterBasedOnStartNode(list, user);
+
+            Assert.AreEqual(5, list.Count);
+            
+        }
+
+        [Test]
+        public void Filter_On_Permissions()
+        {
+            var att = new FilterAllowedOutgoingContentAttribute(typeof(IEnumerable<ContentItemBasic>));
+            var list = new List<dynamic>();
+            for (var i = 0; i < 10; i++)
+            {
+                list.Add(new ContentItemBasic{Id = i, Name = "Test" + i, ParentId = -1});
+            }
+            var ids = list.Select(x => (int)x.Id).ToArray();
+            
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartContentId).Returns(-1);
+            var user = userMock.Object;
+
+            var userServiceMock = new Mock<IUserService>();
+            //we're only assigning 3 nodes browse permissions so that is what we expect as a result
+            var permissions = new List<EntityPermission>
+                {
+                    new EntityPermission(9, 1, new string[]{ "F" }),
+                    new EntityPermission(9, 2, new string[]{ "F" }),
+                    new EntityPermission(9, 3, new string[]{ "F" }),
+                    new EntityPermission(9, 4, new string[]{ "A" })
+                };
+            userServiceMock.Setup(x => x.GetPermissions(user, ids)).Returns(permissions);
+            var userService = userServiceMock.Object;
+
+            att.FilterBasedOnPermissions(list, user, userService);
+
+            Assert.AreEqual(3, list.Count);
+            Assert.AreEqual(1, list.ElementAt(0).Id);
+            Assert.AreEqual(2, list.ElementAt(1).Id);
+            Assert.AreEqual(3, list.ElementAt(2).Id);
+        }
+        
+        private class MyTestClass
+        {
+            public IEnumerable<ContentItemBasic> MyList { get; set; } 
+        }
+    }
 }

src/Umbraco.Tests/Web/Controllers/WebApiEditors/MediaControllerUnitTests.cs

@@ -1,142 +1,142 @@
-using System.Collections.Generic;
-using System.Web.Http;
-using Moq;
-using NUnit.Framework;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Services;
-using Umbraco.Web.Editors;
-
-namespace Umbraco.Tests.Controllers.WebApiEditors
-{
-    [TestFixture]
-    public class MediaControllerUnitTests
-    {
-        [Test]
-        public void Access_Allowed_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartMediaId).Returns(-1);
-            var user = userMock.Object;
-            var mediaMock = new Mock<IMedia>();
-            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
-            var media = mediaMock.Object;
-            var mediaServiceMock = new Mock<IMediaService>();            
-            mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
-            var mediaService = mediaServiceMock.Object;
-
-            //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, 1234);
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void Throws_Exception_When_No_Media_Found()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartMediaId).Returns(-1);
-            var user = userMock.Object;
-            var mediaMock = new Mock<IMedia>();
-            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
-            var media = mediaMock.Object;
-            var mediaServiceMock = new Mock<IMediaService>();
-            mediaServiceMock.Setup(x => x.GetById(0)).Returns(media);
-            var mediaService = mediaServiceMock.Object;
-            
-            //act/assert
-            Assert.Throws<HttpResponseException>(() => MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, 1234));
-        }
-
-        [Test]
-        public void No_Access_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(9);
-            userMock.Setup(u => u.StartMediaId).Returns(9876);
-            var user = userMock.Object;
-            var mediaMock = new Mock<IMedia>();
-            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
-            var media = mediaMock.Object;
-            var mediaServiceMock = new Mock<IMediaService>();
-            mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
-            var mediaService = mediaServiceMock.Object;
-            
-            //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, 1234);
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public void Access_To_Root_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartMediaId).Returns(-1);
-            var user = userMock.Object;
-            
-            //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, null, -1);
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void No_Access_To_Root_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartMediaId).Returns(1234);
-            var user = userMock.Object;
-
-            //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, null, -1);
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public void Access_To_Recycle_Bin_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartMediaId).Returns(-1);
-            var user = userMock.Object;
-
-            //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, null, -21);
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void No_Access_To_Recycle_Bin_By_Path()
-        {
-            //arrange
-            var userMock = new Mock<IUser>();
-            userMock.Setup(u => u.Id).Returns(0);
-            userMock.Setup(u => u.StartMediaId).Returns(1234);
-            var user = userMock.Object;
-
-            //act
-            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, null, -21);
-
-            //assert
-            Assert.IsFalse(result);
-        }
-    }
+using System.Collections.Generic;
+using System.Web.Http;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Services;
+using Umbraco.Web.Editors;
+
+namespace Umbraco.Tests.Web.Controllers.WebApiEditors
+{
+    [TestFixture]
+    public class MediaControllerUnitTests
+    {
+        [Test]
+        public void Access_Allowed_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartMediaId).Returns(-1);
+            var user = userMock.Object;
+            var mediaMock = new Mock<IMedia>();
+            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
+            var media = mediaMock.Object;
+            var mediaServiceMock = new Mock<IMediaService>();            
+            mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
+            var mediaService = mediaServiceMock.Object;
+
+            //act
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, 1234);
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void Throws_Exception_When_No_Media_Found()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartMediaId).Returns(-1);
+            var user = userMock.Object;
+            var mediaMock = new Mock<IMedia>();
+            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
+            var media = mediaMock.Object;
+            var mediaServiceMock = new Mock<IMediaService>();
+            mediaServiceMock.Setup(x => x.GetById(0)).Returns(media);
+            var mediaService = mediaServiceMock.Object;
+            
+            //act/assert
+            Assert.Throws<HttpResponseException>(() => MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, 1234));
+        }
+
+        [Test]
+        public void No_Access_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(9);
+            userMock.Setup(u => u.StartMediaId).Returns(9876);
+            var user = userMock.Object;
+            var mediaMock = new Mock<IMedia>();
+            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
+            var media = mediaMock.Object;
+            var mediaServiceMock = new Mock<IMediaService>();
+            mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
+            var mediaService = mediaServiceMock.Object;
+            
+            //act
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, mediaService, 1234);
+
+            //assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void Access_To_Root_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartMediaId).Returns(-1);
+            var user = userMock.Object;
+            
+            //act
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, null, -1);
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void No_Access_To_Root_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartMediaId).Returns(1234);
+            var user = userMock.Object;
+
+            //act
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, null, -1);
+
+            //assert
+            Assert.IsFalse(result);
+        }
+
+        [Test]
+        public void Access_To_Recycle_Bin_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartMediaId).Returns(-1);
+            var user = userMock.Object;
+
+            //act
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, null, -21);
+
+            //assert
+            Assert.IsTrue(result);
+        }
+
+        [Test]
+        public void No_Access_To_Recycle_Bin_By_Path()
+        {
+            //arrange
+            var userMock = new Mock<IUser>();
+            userMock.Setup(u => u.Id).Returns(0);
+            userMock.Setup(u => u.StartMediaId).Returns(1234);
+            var user = userMock.Object;
+
+            //act
+            var result = MediaController.CheckPermissions(new Dictionary<string, object>(), user, null, -21);
+
+            //assert
+            Assert.IsFalse(result);
+        }
+    }
 }

src/Umbraco.Tests/Web/Mvc/HtmlHelperExtensionMethodsTests.cs

@@ -2,7 +2,7 @@ using System.Web.Mvc;
 using NUnit.Framework;
 using Umbraco.Web;
 
-namespace Umbraco.Tests.Mvc
+namespace Umbraco.Tests.Web.Mvc
 {
 	[TestFixture]
 	public class HtmlHelperExtensionMethodsTests

src/Umbraco.Tests/Web/Mvc/MergeParentContextViewDataAttributeTests.cs

@@ -1,86 +1,86 @@
-using System.Web.Mvc;
-using System.Web.Routing;
-using NUnit.Framework;
-using Umbraco.Tests.TestHelpers;
-using Umbraco.Web.Mvc;
-
-namespace Umbraco.Tests.Mvc
-{
-    [TestFixture]
-    public class MergeParentContextViewDataAttributeTests
-    {
-        [Test]
-        public void Ensure_All_Ancestor_ViewData_Is_Merged()
-        {
-            var http = new FakeHttpContextFactory("http://localhost");
-
-            //setup an heirarchy
-            var rootViewCtx = new ViewContext {Controller = new MyController(), RequestContext = http.RequestContext, ViewData = new ViewDataDictionary()};
-            var parentViewCtx = new ViewContext { Controller = new MyController(), RequestContext = http.RequestContext, RouteData = new RouteData(), ViewData = new ViewDataDictionary() };
-            parentViewCtx.RouteData.DataTokens.Add("ParentActionViewContext", rootViewCtx);
-            var controllerCtx = new ControllerContext(http.RequestContext, new MyController()) {RouteData = new RouteData()};
-            controllerCtx.RouteData.DataTokens.Add("ParentActionViewContext", parentViewCtx);
-
-            //set up the view data
-            controllerCtx.Controller.ViewData["Test1"] = "Test1";
-            controllerCtx.Controller.ViewData["Test2"] = "Test2";
-            controllerCtx.Controller.ViewData["Test3"] = "Test3";
-            parentViewCtx.ViewData["Test4"] = "Test4";
-            parentViewCtx.ViewData["Test5"] = "Test5";
-            parentViewCtx.ViewData["Test6"] = "Test6";
-            rootViewCtx.ViewData["Test7"] = "Test7";
-            rootViewCtx.ViewData["Test8"] = "Test8";
-            rootViewCtx.ViewData["Test9"] = "Test9";
-
-            var filter = new ResultExecutingContext(controllerCtx, new ContentResult()) {RouteData = controllerCtx.RouteData};
-            var att = new MergeParentContextViewDataAttribute();
-            
-            Assert.IsTrue(filter.IsChildAction);
-            att.OnResultExecuting(filter);
-
-            Assert.AreEqual(9, controllerCtx.Controller.ViewData.Count);
-        }
-
-        [Test]
-        public void Ensure_All_Ancestor_ViewData_Is_Merged_Without_Data_Loss()
-        {
-            var http = new FakeHttpContextFactory("http://localhost");
-
-            //setup an heirarchy
-            var rootViewCtx = new ViewContext { Controller = new MyController(), RequestContext = http.RequestContext, ViewData = new ViewDataDictionary() };
-            var parentViewCtx = new ViewContext { Controller = new MyController(), RequestContext = http.RequestContext, RouteData = new RouteData(), ViewData = new ViewDataDictionary() };
-            parentViewCtx.RouteData.DataTokens.Add("ParentActionViewContext", rootViewCtx);
-            var controllerCtx = new ControllerContext(http.RequestContext, new MyController()) { RouteData = new RouteData() };
-            controllerCtx.RouteData.DataTokens.Add("ParentActionViewContext", parentViewCtx);
-
-            //set up the view data with overlapping keys
-            controllerCtx.Controller.ViewData["Test1"] = "Test1";
-            controllerCtx.Controller.ViewData["Test2"] = "Test2";
-            controllerCtx.Controller.ViewData["Test3"] = "Test3";
-            parentViewCtx.ViewData["Test2"] = "Test4";
-            parentViewCtx.ViewData["Test3"] = "Test5";
-            parentViewCtx.ViewData["Test4"] = "Test6";
-            rootViewCtx.ViewData["Test3"] = "Test7";
-            rootViewCtx.ViewData["Test4"] = "Test8";
-            rootViewCtx.ViewData["Test5"] = "Test9";
-
-            var filter = new ResultExecutingContext(controllerCtx, new ContentResult()) { RouteData = controllerCtx.RouteData };
-            var att = new MergeParentContextViewDataAttribute();
-
-            Assert.IsTrue(filter.IsChildAction);
-            att.OnResultExecuting(filter);
-
-            Assert.AreEqual(5, controllerCtx.Controller.ViewData.Count);
-            Assert.AreEqual("Test1", controllerCtx.Controller.ViewData["Test1"]);
-            Assert.AreEqual("Test2", controllerCtx.Controller.ViewData["Test2"]);
-            Assert.AreEqual("Test3", controllerCtx.Controller.ViewData["Test3"]);
-            Assert.AreEqual("Test6", controllerCtx.Controller.ViewData["Test4"]);
-            Assert.AreEqual("Test9", controllerCtx.Controller.ViewData["Test5"]);
-        }
-
-        internal class MyController : Controller
-        {
-            
-        }
-    }
+using System.Web.Mvc;
+using System.Web.Routing;
+using NUnit.Framework;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Tests.Web.Mvc
+{
+    [TestFixture]
+    public class MergeParentContextViewDataAttributeTests
+    {
+        [Test]
+        public void Ensure_All_Ancestor_ViewData_Is_Merged()
+        {
+            var http = new FakeHttpContextFactory("http://localhost");
+
+            //setup an heirarchy
+            var rootViewCtx = new ViewContext {Controller = new MyController(), RequestContext = http.RequestContext, ViewData = new ViewDataDictionary()};
+            var parentViewCtx = new ViewContext { Controller = new MyController(), RequestContext = http.RequestContext, RouteData = new RouteData(), ViewData = new ViewDataDictionary() };
+            parentViewCtx.RouteData.DataTokens.Add("ParentActionViewContext", rootViewCtx);
+            var controllerCtx = new ControllerContext(http.RequestContext, new MyController()) {RouteData = new RouteData()};
+            controllerCtx.RouteData.DataTokens.Add("ParentActionViewContext", parentViewCtx);
+
+            //set up the view data
+            controllerCtx.Controller.ViewData["Test1"] = "Test1";
+            controllerCtx.Controller.ViewData["Test2"] = "Test2";
+            controllerCtx.Controller.ViewData["Test3"] = "Test3";
+            parentViewCtx.ViewData["Test4"] = "Test4";
+            parentViewCtx.ViewData["Test5"] = "Test5";
+            parentViewCtx.ViewData["Test6"] = "Test6";
+            rootViewCtx.ViewData["Test7"] = "Test7";
+            rootViewCtx.ViewData["Test8"] = "Test8";
+            rootViewCtx.ViewData["Test9"] = "Test9";
+
+            var filter = new ResultExecutingContext(controllerCtx, new ContentResult()) {RouteData = controllerCtx.RouteData};
+            var att = new MergeParentContextViewDataAttribute();
+            
+            Assert.IsTrue(filter.IsChildAction);
+            att.OnResultExecuting(filter);
+
+            Assert.AreEqual(9, controllerCtx.Controller.ViewData.Count);
+        }
+
+        [Test]
+        public void Ensure_All_Ancestor_ViewData_Is_Merged_Without_Data_Loss()
+        {
+            var http = new FakeHttpContextFactory("http://localhost");
+
+            //setup an heirarchy
+            var rootViewCtx = new ViewContext { Controller = new MyController(), RequestContext = http.RequestContext, ViewData = new ViewDataDictionary() };
+            var parentViewCtx = new ViewContext { Controller = new MyController(), RequestContext = http.RequestContext, RouteData = new RouteData(), ViewData = new ViewDataDictionary() };
+            parentViewCtx.RouteData.DataTokens.Add("ParentActionViewContext", rootViewCtx);
+            var controllerCtx = new ControllerContext(http.RequestContext, new MyController()) { RouteData = new RouteData() };
+            controllerCtx.RouteData.DataTokens.Add("ParentActionViewContext", parentViewCtx);
+
+            //set up the view data with overlapping keys
+            controllerCtx.Controller.ViewData["Test1"] = "Test1";
+            controllerCtx.Controller.ViewData["Test2"] = "Test2";
+            controllerCtx.Controller.ViewData["Test3"] = "Test3";
+            parentViewCtx.ViewData["Test2"] = "Test4";
+            parentViewCtx.ViewData["Test3"] = "Test5";
+            parentViewCtx.ViewData["Test4"] = "Test6";
+            rootViewCtx.ViewData["Test3"] = "Test7";
+            rootViewCtx.ViewData["Test4"] = "Test8";
+            rootViewCtx.ViewData["Test5"] = "Test9";
+
+            var filter = new ResultExecutingContext(controllerCtx, new ContentResult()) { RouteData = controllerCtx.RouteData };
+            var att = new MergeParentContextViewDataAttribute();
+
+            Assert.IsTrue(filter.IsChildAction);
+            att.OnResultExecuting(filter);
+
+            Assert.AreEqual(5, controllerCtx.Controller.ViewData.Count);
+            Assert.AreEqual("Test1", controllerCtx.Controller.ViewData["Test1"]);
+            Assert.AreEqual("Test2", controllerCtx.Controller.ViewData["Test2"]);
+            Assert.AreEqual("Test3", controllerCtx.Controller.ViewData["Test3"]);
+            Assert.AreEqual("Test6", controllerCtx.Controller.ViewData["Test4"]);
+            Assert.AreEqual("Test9", controllerCtx.Controller.ViewData["Test5"]);
+        }
+
+        internal class MyController : Controller
+        {
+            
+        }
+    }
 }

src/Umbraco.Tests/Web/Mvc/RenderIndexActionSelectorAttributeTests.cs

@@ -17,7 +17,7 @@ using Umbraco.Web.Mvc;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
-namespace Umbraco.Tests.Mvc
+namespace Umbraco.Tests.Web.Mvc
 {
     [TestFixture]
     public class RenderIndexActionSelectorAttributeTests

src/Umbraco.Tests/Web/Mvc/SurfaceControllerTests.cs

@@ -1,5 +1,4 @@
 using System;
-using System.CodeDom;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
@@ -12,7 +11,6 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Dictionary;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Profiling;
@@ -20,11 +18,10 @@ using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Web;
 using Umbraco.Web.Mvc;
-using Umbraco.Web.PublishedCache;
 using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
-namespace Umbraco.Tests.Mvc
+namespace Umbraco.Tests.Web.Mvc
 {
     [TestFixture]
     public class SurfaceControllerTests
@@ -165,7 +162,7 @@ namespace Umbraco.Tests.Mvc
             };
 
             var routeData = new RouteData();
-            routeData.DataTokens.Add("umbraco-route-def", routeDefinition);
+            routeData.DataTokens.Add(Umbraco.Core.Constants.Web.UmbracoRouteDefinitionDataToken, routeDefinition);
 
             var ctrl = new TestSurfaceController(umbCtx, new UmbracoHelper());
             ctrl.ControllerContext = new ControllerContext(contextBase, routeData, ctrl);

src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs

@@ -1,27 +1,22 @@
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
 using System.Web.Mvc;
 using System.Web.Routing;
-using System.Xml;
 using Moq;
 using NUnit.Framework;
+using umbraco.BusinessLogic;
+using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.Services;
-using Umbraco.Web.Security;
-using umbraco.BusinessLogic;
-using Umbraco.Core;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Tests.PublishedContent;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Stubs;
 using Umbraco.Web;
@@ -30,8 +25,9 @@ using Umbraco.Web.Mvc;
 using Umbraco.Web.PublishedCache;
 using Umbraco.Web.PublishedCache.XmlPublishedCache;
 using Umbraco.Web.Routing;
+using Umbraco.Web.Security;
 
-namespace Umbraco.Tests.Mvc
+namespace Umbraco.Tests.Web.Mvc
 {
     [TestFixture]
     public class UmbracoViewPageTests
@@ -445,7 +441,7 @@ namespace Umbraco.Tests.Mvc
 
             var context = new ViewContext();
             context.RouteData = new RouteData();
-            context.RouteData.DataTokens.Add("umbraco-context", umbracoContext);
+            context.RouteData.DataTokens.Add(Umbraco.Core.Constants.Web.UmbracoContextDataToken, umbracoContext);
 
             return context;
         }

src/Umbraco.Tests/Web/Mvc/ViewDataDictionaryExtensionTests.cs

@@ -1,42 +1,40 @@
-using System.Collections.Generic;
-using System.Text;
-using System.Web.Mvc;
-using NUnit.Framework;
-using Umbraco.Web.Mvc;
-
-namespace Umbraco.Tests.Mvc
-{
-    [TestFixture]
-    public class ViewDataDictionaryExtensionTests
-    {
-        [Test]
-        public void Merge_View_Data()
-        {
-            var source = new ViewDataDictionary();
-            var dest = new ViewDataDictionary();
-            source.Add("Test1", "Test1");
-            dest.Add("Test2", "Test2");
-
-            dest.MergeViewDataFrom(source);
-
-            Assert.AreEqual(2, dest.Count);
-        }
-
-        [Test]
-        public void Merge_View_Data_Retains_Destination_Values()
-        {
-            var source = new ViewDataDictionary();
-            var dest = new ViewDataDictionary();
-            source.Add("Test1", "Test1");
-            dest.Add("Test1", "MyValue");
-            dest.Add("Test2", "Test2");
-
-            dest.MergeViewDataFrom(source);
-
-            Assert.AreEqual(2, dest.Count);
-            Assert.AreEqual("MyValue", dest["Test1"]);
-            Assert.AreEqual("Test2", dest["Test2"]);
-        }
-
-    }
-}
+using System.Web.Mvc;
+using NUnit.Framework;
+using Umbraco.Web.Mvc;
+
+namespace Umbraco.Tests.Web.Mvc
+{
+    [TestFixture]
+    public class ViewDataDictionaryExtensionTests
+    {
+        [Test]
+        public void Merge_View_Data()
+        {
+            var source = new ViewDataDictionary();
+            var dest = new ViewDataDictionary();
+            source.Add("Test1", "Test1");
+            dest.Add("Test2", "Test2");
+
+            dest.MergeViewDataFrom(source);
+
+            Assert.AreEqual(2, dest.Count);
+        }
+
+        [Test]
+        public void Merge_View_Data_Retains_Destination_Values()
+        {
+            var source = new ViewDataDictionary();
+            var dest = new ViewDataDictionary();
+            source.Add("Test1", "Test1");
+            dest.Add("Test1", "MyValue");
+            dest.Add("Test2", "Test2");
+
+            dest.MergeViewDataFrom(source);
+
+            Assert.AreEqual(2, dest.Count);
+            Assert.AreEqual("MyValue", dest["Test1"]);
+            Assert.AreEqual("Test2", dest["Test2"]);
+        }
+
+    }
+}

src/Umbraco.Tests/Web/WebExtensionMethodTests.cs

@@ -0,0 +1,170 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+using Moq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Profiling;
+using Umbraco.Web;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.Routing;
+using Umbraco.Web.Security;
+
+namespace Umbraco.Tests.Web
+{
+    [TestFixture]
+    public class WebExtensionMethodTests
+    {
+
+        [Test]
+        public void UmbracoContextExtensions_GetUmbracoContext()
+        {
+            var appCtx = new ApplicationContext(
+               CacheHelper.CreateDisabledCacheHelper(),
+               new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var umbCtx = UmbracoContext.CreateContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new WebSecurity(Mock.Of<HttpContextBase>(), appCtx),
+                Mock.Of<IUmbracoSettingsSection>(),
+                new List<IUrlProvider>(),
+                false);
+            var items = new Dictionary<object, object>()
+            {
+                {UmbracoContext.HttpContextItemName, umbCtx}
+            };
+            var http = new Mock<HttpContextBase>();
+            http.Setup(x => x.Items).Returns(items);
+
+            var result = http.Object.GetUmbracoContext();
+
+            Assert.IsNotNull(result);
+            Assert.AreSame(umbCtx, result);
+        }
+
+        [Test]
+        public void RouteDataExtensions_GetUmbracoContext()
+        {
+            var appCtx = new ApplicationContext(
+               CacheHelper.CreateDisabledCacheHelper(),
+               new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var umbCtx = UmbracoContext.CreateContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new WebSecurity(Mock.Of<HttpContextBase>(), appCtx),
+                Mock.Of<IUmbracoSettingsSection>(),
+                new List<IUrlProvider>(),
+                false);
+            var r1 = new RouteData();
+            r1.DataTokens.Add(Core.Constants.Web.UmbracoContextDataToken, umbCtx);
+
+            var result = r1.GetUmbracoContext();
+
+            Assert.IsNotNull(result);
+            Assert.AreSame(umbCtx, result);
+        }
+
+        [Test]
+        public void ControllerContextExtensions_GetUmbracoContext_From_RouteValues()
+        {
+            var appCtx = new ApplicationContext(
+               CacheHelper.CreateDisabledCacheHelper(),
+               new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var umbCtx = UmbracoContext.CreateContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new WebSecurity(Mock.Of<HttpContextBase>(), appCtx),
+                Mock.Of<IUmbracoSettingsSection>(),
+                new List<IUrlProvider>(),
+                false);
+
+            var r1 = new RouteData();
+            r1.DataTokens.Add(Core.Constants.Web.UmbracoContextDataToken, umbCtx);
+            var ctx1 = CreateViewContext(new ControllerContext(Mock.Of<HttpContextBase>(), r1, new MyController()));
+            var r2 = new RouteData();
+            r2.DataTokens.Add("ParentActionViewContext", ctx1);
+            var ctx2 = CreateViewContext(new ControllerContext(Mock.Of<HttpContextBase>(), r2, new MyController()));
+            var r3 = new RouteData();
+            r3.DataTokens.Add("ParentActionViewContext", ctx2);
+            var ctx3 = CreateViewContext(new ControllerContext(Mock.Of<HttpContextBase>(), r3, new MyController()));
+
+            var result = ctx3.GetUmbracoContext();
+
+            Assert.IsNotNull(result);
+            Assert.AreSame(umbCtx, result);
+        }
+
+        [Test]
+        public void ControllerContextExtensions_GetUmbracoContext_From_HttpContext()
+        {
+            var appCtx = new ApplicationContext(
+               CacheHelper.CreateDisabledCacheHelper(),
+               new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
+            var umbCtx = UmbracoContext.CreateContext(
+                Mock.Of<HttpContextBase>(),
+                appCtx,
+                new WebSecurity(Mock.Of<HttpContextBase>(), appCtx),
+                Mock.Of<IUmbracoSettingsSection>(),
+                new List<IUrlProvider>(),
+                false);
+            var items = new Dictionary<object, object>()
+            {
+                {UmbracoContext.HttpContextItemName, umbCtx}
+            };
+            var http = new Mock<HttpContextBase>();
+            http.Setup(x => x.Items).Returns(items);
+
+            var r1 = new RouteData();
+            var ctx1 = CreateViewContext(new ControllerContext(http.Object, r1, new MyController()));
+            var r2 = new RouteData();
+            r2.DataTokens.Add("ParentActionViewContext", ctx1);
+            var ctx2 = CreateViewContext(new ControllerContext(http.Object, r2, new MyController()));
+            var r3 = new RouteData();
+            r3.DataTokens.Add("ParentActionViewContext", ctx2);
+            var ctx3 = CreateViewContext(new ControllerContext(http.Object, r3, new MyController()));
+
+            var result = ctx3.GetUmbracoContext();
+
+            Assert.IsNotNull(result);
+            Assert.AreSame(umbCtx, result);
+        }
+
+        [Test]
+        public void ControllerContextExtensions_GetDataTokenInViewContextHierarchy()
+        {
+            var r1 = new RouteData();
+            r1.DataTokens.Add("hello", "world");
+            var ctx1 = CreateViewContext(new ControllerContext(Mock.Of<HttpContextBase>(), r1, new MyController()));
+            var r2 = new RouteData();
+            r2.DataTokens.Add("ParentActionViewContext", ctx1);
+            var ctx2 = CreateViewContext(new ControllerContext(Mock.Of<HttpContextBase>(), r2, new MyController()));
+            var r3 = new RouteData();
+            r3.DataTokens.Add("ParentActionViewContext", ctx2);
+            var ctx3 = CreateViewContext(new ControllerContext(Mock.Of<HttpContextBase>(), r3, new MyController()));
+
+            var result = ctx3.GetDataTokenInViewContextHierarchy("hello");
+
+            Assert.IsNotNull(result as string);
+            Assert.AreEqual((string)result, "world");
+        }
+
+        private ViewContext CreateViewContext(ControllerContext ctx)
+        {
+            return new ViewContext(ctx, Mock.Of<IView>(),
+                new ViewDataDictionary(), new TempDataDictionary(), new StringWriter());
+        }
+
+        private class MyController : Controller
+        {
+            
+        }
+    }
+}

src/Umbraco.Tests/packages.config

@@ -13,13 +13,15 @@
   <package id="Microsoft.AspNet.WebApi.SelfHost" version="4.0.30506.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
   <package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="NUnit" version="2.6.2" targetFramework="net45" />
+  <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="Selenium.WebDriver" version="2.32.0" targetFramework="net45" />
   <package id="semver" version="1.1.2" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
-  <package id="SqlServerCE" version="4.0.0.0" targetFramework="net45" />
+  <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
 </packages>

src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js

@@ -361,6 +361,12 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
             rootScope : function(){
                 return getRootScope();
             },
+
+            reloadLocation: function() {
+                var injector = getRootInjector();
+                var $route = injector.get("$route");
+                $route.reload();
+            },
             
             closeModalWindow: function(rVal) {
                 

src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js

@@ -15,45 +15,55 @@ angular.module("umbraco.directives")
                 keyCombo = scope.$eval(attrs["hotkey"]);
             }
 
-            // disable shortcuts in input fields if keycombo is 1 character
-            if (keyCombo) {
+            function activate() {
 
-                if (keyCombo.length === 1) {
-                    options = {
-                        inputDisabled: true
-                    };
-                }
+                if (keyCombo) {
 
-                keyboardService.bind(keyCombo, function() {
-
-                    var element = $(el);
-                    var activeElementType = document.activeElement.tagName;
-                    var clickableElements = ["A", "BUTTON"];
-
-                    if (element.is("a,div,button,input[type='button'],input[type='submit'],input[type='checkbox']") && !element.is(':disabled')) {
-
-                        if (element.is(':visible') || attrs.hotkeyWhenHidden) {
-
-                            // when keycombo is enter and a link or button has focus - click the link or button instead of using the hotkey
-                            if (keyCombo === "enter" && clickableElements.indexOf(activeElementType) === 0) {
-                                document.activeElement.click();
-                            } else {
-                                element.click();
-                            }
-
-                        }
-
-                    } else {
-                        element.focus();
+                    // disable shortcuts in input fields if keycombo is 1 character
+                    if (keyCombo.length === 1) {
+                        options = {
+                            inputDisabled: true
+                        };
                     }
 
-                }, options);
+                    keyboardService.bind(keyCombo, function() {
 
-                el.on('$destroy', function() {
-                    keyboardService.unbind(keyCombo);
-                });
+                        var element = $(el);
+                        var activeElementType = document.activeElement.tagName;
+                        var clickableElements = ["A", "BUTTON"];
+
+                        if (element.is("a,div,button,input[type='button'],input[type='submit'],input[type='checkbox']") && !element.is(':disabled')) {
+
+                            if (element.is(':visible') || attrs.hotkeyWhenHidden) {
+
+                                if (attrs.hotkeyWhen && attrs.hotkeyWhen === "false") {
+                                    return;
+                                }
+
+                                // when keycombo is enter and a link or button has focus - click the link or button instead of using the hotkey
+                                if (keyCombo === "enter" && clickableElements.indexOf(activeElementType) === 0) {
+                                    document.activeElement.click();
+                                } else {
+                                    element.click();
+                                }
+
+                            }
+
+                        } else {
+                            element.focus();
+                        }
+
+                    }, options);
+
+                    el.on('$destroy', function() {
+                        keyboardService.unbind(keyCombo);
+                    });
+
+                }
 
             }
 
+            activate();
+
         };
     });

src/Umbraco.Web.UI.Client/src/common/directives/components/umbGenerateAlias.directive.js

@@ -28,7 +28,8 @@ angular.module("umbraco.directives")
 
                   if( value !== undefined && value !== "" && value !== null) {
 
-                    scope.alias = "Generating Alias...";
+                      scope.alias = "";
+                    scope.placeholderText = "Generating Alias...";
 
                     generateAliasTimeout = $timeout(function () {
                        updateAlias = true;

src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js

@@ -28,6 +28,8 @@
           // add init tab
           addInitGroup(scope.model.groups);
 
+          activateFirstGroup(scope.model.groups);
+
           // localize texts
           localizationService.localize("validation_validation").then(function(value) {
               validationTranslated = value;
@@ -153,14 +155,14 @@
 
             return resourceLookup(scope.model.id, selectedContentTypeAliases, propAliasesExisting).then(function (filteredAvailableCompositeTypes) {
                 _.each(scope.compositionsDialogModel.availableCompositeContentTypes, function (current) {
-                    //reset first 
+                    //reset first
                     current.allowed = true;
                     //see if this list item is found in the response (allowed) list
                     var found = _.find(filteredAvailableCompositeTypes, function (f) {
                         return current.contentType.alias === f.contentType.alias;
                     });
 
-                    //allow if the item was  found in the response (allowed) list - 
+                    //allow if the item was  found in the response (allowed) list -
                     // and ensure its set to allowed if it is currently checked,
                     // DO not allow if it's a locked content type.
                     current.allowed = scope.model.lockedCompositeContentTypes.indexOf(current.contentType.alias) === -1 &&
@@ -181,7 +183,7 @@
       }
 
         function setupAvailableContentTypesModel(result) {
-            scope.compositionsDialogModel.availableCompositeContentTypes = result;            
+            scope.compositionsDialogModel.availableCompositeContentTypes = result;
             //iterate each one and set it up
             _.each(scope.compositionsDialogModel.availableCompositeContentTypes, function (c) {
                 //enable it if it's part of the selected model
@@ -276,7 +278,7 @@
                 // submit overlay if no compositions has been removed
                 // or the action has been confirmed
                 } else {
-                    
+
                     // make sure that all tabs has an init property
                     if (scope.model.groups.length !== 0) {
                       angular.forEach(scope.model.groups, function(group) {
@@ -454,6 +456,15 @@
         return groups;
       }
 
+      function activateFirstGroup(groups) {
+          if (groups && groups.length > 0) {
+              var firstGroup = groups[0];
+              if(!firstGroup.tabState || firstGroup.tabState === "inActive") {
+                  firstGroup.tabState = "active";
+              }
+          }
+      }
+
       /* ---------- PROPERTIES ---------- */
 
       scope.addProperty = function(property, group) {

src/Umbraco.Web.UI.Client/src/common/directives/components/validation/umbsetdirtyonchange.directive.js

@@ -0,0 +1,29 @@
+(function() {
+    'use strict';
+
+    function SetDirtyOnChange() {
+
+        function link(scope, el, attr, ctrl) {
+
+            var initValue = attr.umbSetDirtyOnChange;
+
+            attr.$observe("umbSetDirtyOnChange", function (newValue) {
+                if(newValue !== initValue) {
+                    ctrl.$setDirty();
+                }
+            });
+
+        }
+
+        var directive = {
+            require: "^form",
+            restrict: 'A',
+            link: link
+        };
+
+        return directive;
+    }
+
+    angular.module('umbraco.directives').directive('umbSetDirtyOnChange', SetDirtyOnChange);
+
+})();

src/Umbraco.Web.UI.Client/src/common/directives/components/validation/valHighlight.directive.js

@@ -8,9 +8,9 @@ function valHighlight($timeout) {
     return {
         restrict: "A",
         link: function (scope, element, attrs, ctrl) {
-            
+
             attrs.$observe("valHighlight", function (newVal) {
-                if (newVal === true) {
+                if (newVal === "true") {
                     element.addClass("highlight-error");
                     $timeout(function () {
                         //set the bound scope property to false
@@ -25,4 +25,4 @@ function valHighlight($timeout) {
         }
     };
 }
-angular.module('umbraco.directives.validation').directive("valHighlight", valHighlight);
+angular.module('umbraco.directives.validation').directive("valHighlight", valHighlight);

src/Umbraco.Web.UI.Client/src/common/mocks/services/externalLoginInfo.mocks.js

@@ -0,0 +1,8 @@
+angular.module("umbraco.mocks").factory('externalLoginInfo',
+    function () {
+        return {
+            errors: [],
+            providers: []
+        };
+    }
+);

src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js

@@ -716,7 +716,7 @@ angular.module('umbraco.mocks').
                   "user_administrators": "Administrator",
                   "user_categoryField": "Category field",
                   "user_changePassword": "Change Your Password",
-                  "user_newPassword": "Change Your Password",
+                  "user_newPassword": "New password",
                   "user_confirmNewPassword": "Confirm new password",
                   "user_changePasswordDescription": "You can change your password for accessing the Umbraco Back Office by filling out the form below and click the 'Change Password' button",
                   "user_contentChannel": "Content Channel",
@@ -730,6 +730,7 @@ angular.module('umbraco.mocks').
                   "user_mediastartnode": "Start Node in Media Library",
                   "user_modules": "Sections",
                   "user_noConsole": "Disable Umbraco Access",
+                  "user_oldPassword": "Old password",
                   "user_password": "Password",
                   "user_resetPassword": "Reset password",
                   "user_passwordChanged": "Your password has been changed!",

src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js

@@ -42,6 +42,15 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
     return {
         
+        getRecycleBin: function() {
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "contentApiBaseUrl",
+                       "GetRecycleBin")),
+               'Failed to retrieve data for content recycle bin');
+        },
+
         /**
          * @ngdoc method
          * @name umbraco.resources.contentResource#sort

src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js

@@ -24,29 +24,18 @@ function contentTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
                 filterPropertyTypes = [];
             }
 
-            var query = "";
-            _.each(filterContentTypes, function (item) {
-                query += "filterContentTypes=" + item + "&";
-            });
-            // if filterContentTypes array is empty we need a empty variable in the querystring otherwise the service returns a error
-            if (filterContentTypes.length === 0) {
-                query += "filterContentTypes=&";
-            }
-            _.each(filterPropertyTypes, function (item) {
-                query += "filterPropertyTypes=" + item + "&";
-            });
-            // if filterPropertyTypes array is empty we need a empty variable in the querystring otherwise the service returns a error
-            if (filterPropertyTypes.length === 0) {
-                query += "filterPropertyTypes=&";
-            }
-            query += "contentTypeId=" + contentTypeId;
+            var query = {
+                contentTypeId: contentTypeId,
+                filterContentTypes: filterContentTypes,
+                filterPropertyTypes: filterPropertyTypes
+            };
             
             return umbRequestHelper.resourcePromise(
-               $http.get(
+               $http.post(
                    umbRequestHelper.getApiUrl(
                        "contentTypeApiBaseUrl",
-                       "GetAvailableCompositeContentTypes",
-                       query)),
+                       "GetAvailableCompositeContentTypes"),
+                       query),
                'Failed to retrieve data for content type id ' + contentTypeId);
         },
 

src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js

@@ -22,6 +22,15 @@ function mediaResource($q, $http, umbDataFormatter, umbRequestHelper) {
 
     return {
         
+        getRecycleBin: function () {
+            return umbRequestHelper.resourcePromise(
+               $http.get(
+                   umbRequestHelper.getApiUrl(
+                       "mediaApiBaseUrl",
+                       "GetRecycleBin")),
+               'Failed to retrieve data for media recycle bin');
+        },
+
         /**
          * @ngdoc method
          * @name umbraco.resources.mediaResource#sort

src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js

@@ -24,29 +24,18 @@ function mediaTypeResource($q, $http, umbRequestHelper, umbDataFormatter) {
                 filterPropertyTypes = [];
             }
 
-            var query = "";
-            _.each(filterContentTypes, function (item) {
-                query += "filterContentTypes=" + item + "&";
-            });
-            // if filterContentTypes array is empty we need a empty variable in the querystring otherwise the service returns a error
-            if (filterContentTypes.length === 0) {
-                query += "filterContentTypes=&";
-            }
-            _.each(filterPropertyTypes, function (item) {
-                query += "filterPropertyTypes=" + item + "&";
-            });
-            // if filterPropertyTypes array is empty we need a empty variable in the querystring otherwise the service returns a error
-            if (filterPropertyTypes.length === 0) {
-                query += "filterPropertyTypes=&";
-            }
-            query += "contentTypeId=" + contentTypeId;
+            var query = {
+                contentTypeId: contentTypeId,
+                filterContentTypes: filterContentTypes,
+                filterPropertyTypes: filterPropertyTypes
+            };
 
             return umbRequestHelper.resourcePromise(
-               $http.get(
+               $http.post(
                    umbRequestHelper.getApiUrl(
                        "mediaTypeApiBaseUrl",
-                       "GetAvailableCompositeMediaTypes",
-                       query)),
+                       "GetAvailableCompositeMediaTypes"),
+                       query),
                'Failed to retrieve data for content type id ' + contentTypeId);
         },
 

src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js

@@ -53,8 +53,8 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
             
             if (modelsBuilderEnabled && modelsResource) {
                 modelsResource.getModelsOutOfDateStatus().then(function(result) {
-                    //Generate models buttons should be enabled if its not 100
-                    deferred.resolve(result.status !== 100);
+                    //Generate models buttons should be enabled if it is 0
+                    deferred.resolve(result.status === 0);
                 });
             }
             else {

src/Umbraco.Web.UI.Client/src/less/buttons.less

@@ -49,9 +49,10 @@
 
     // Disabled state
     &.disabled,
-    &[disabled] {
+    &[disabled],
+    &:disabled:hover {
         cursor: default;
-        background-image: none;
+        border-color: @btnBorder;
         .opacity(65);
         .box-shadow(none);
     }

src/Umbraco.Web.UI.Client/src/less/components/card.less

@@ -88,8 +88,7 @@
 	display: flex;
 	flex-flow: row wrap;
 	justify-content: flex-start;
- }
-
+}
 
 .umb-card-grid li {
 	padding: 5px;
@@ -98,31 +97,42 @@
 	text-align: center;
 
 	width: 100px;
-	height: 100px;
+	height: 105px;
 
 	box-sizing: border-box;
- }
+}
 
- .umb-card-grid li.-four-in-row {
-	 flex: 0 0 25%;
- }
+.umb-card-grid li.-four-in-row {
+	flex: 0 0 25%;
+}
 
- .umb-card-grid li.-three-in-row {
-	 flex: 0 0 33.33%;
- }
+.umb-card-grid li.-three-in-row {
+	flex: 0 0 33.33%;
+}
 
-.umb-card-grid li:hover, .umb-card-grid li:hover * {
-     background: @blue;
-     color: white;
-	 cursor: pointer;
- }
+.umb-card-grid .umb-card-grid-item {
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+
+
+ .umb-card-grid .umb-card-grid-item:hover,
+ .umb-card-grid .umb-card-grid-item:focus,
+ .umb-card-grid .umb-card-grid-item:hover > *,
+ .umb-card-grid .umb-card-grid-item:focus > *  {
+	background: @blue;
+	color: white;
+	cursor: pointer;
+	outline: none;
+}
 
 .umb-card-grid a {
      color: #222;
      text-decoration: none;
  }
 
-.umb-card-grid i{
+.umb-card-grid i {
      font-size: 30px;
      line-height: 50px;
      display: block;

src/Umbraco.Web.UI.Client/src/less/components/editor/subheader/umb-editor-sub-header.less

@@ -6,13 +6,15 @@
    justify-content: space-between;
    margin-top: -30px;
    position: relative;
+   top: 0;
 }
 
 .umb-editor-sub-header.-umb-sticky-bar {
-   box-shadow:
-      0 5px 0 rgba(0, 0, 0, 0.08),
-      0 1px 0 rgba(0, 0, 0, 0.16);
+   box-shadow: 0 5px 0 rgba(0, 0, 0, 0.08), 0 1px 0 rgba(0, 0, 0, 0.16);
    transition: box-shadow 1s;
+   top: 100px;
+   transform: translate(0, 50%);
+
 }
 
 .umb-group-builder__property-preview .umb-editor-sub-header {

src/Umbraco.Web.UI.Client/src/less/property-editors.less

@@ -200,6 +200,13 @@ ul.color-picker li a  {
     border: 1px solid #f8f8f8;
 }
 
+
+.umb-sortable-thumbnails li:hover a {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
 .umb-sortable-thumbnails li img {
   max-width:100%;
   max-height:100%;

src/Umbraco.Web.UI.Client/src/loader.dev.js

@@ -12,6 +12,10 @@ LazyLoad.js(
 
         'lib/angular/angular-ui-sortable.js',
 
+        'lib/angular/1.1.5/angular-mocks.js',
+        'lib/angular/1.1.5/angular-mobile.min.js',
+        'lib/underscore/underscore-min.js',
+
         'lib/angular-dynamic-locale/tmhDynamicLocale.min.js',
         
         'lib/bootstrap/js/bootstrap.2.3.2.min.js',

src/Umbraco.Web.UI.Client/src/views/common/notifications/confirmroutechange.html

@@ -3,5 +3,5 @@
 	<p>Are you sure you want to navigate away from this page? - you have unsaved changes</p>
 
 	<button class="btn btn-warning" ng-click="discard(notification)">Discard changes</button>
-	<button class="btn" ng-click="stay(notification)">Stay</button>
-</div>
+	<button class="btn" ng-click="stay(notification)" umb-auto-focus>Stay</button>
+</div>

src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorpicker/editorpicker.html

@@ -34,7 +34,7 @@
 								ng-mouseover="vm.showDetailsOverlay(systemDataType)"
 								ng-click="vm.pickEditor(systemDataType)"
 								class="-four-in-row">
-								<a href="" title="{{ systemDataType.name }}">
+								<a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
 									<i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
 									{{ systemDataType.name }}
 								</a>
@@ -51,7 +51,7 @@
 								ng-mouseover="vm.showDetailsOverlay(dataType)"
 								ng-click="vm.pickDataType(dataType)"
 								class="-four-in-row">
-								<a href="" title="{{ dataType.name }}">
+								<a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
 									<i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
 									{{ dataType.name }}
 								</a>
@@ -78,7 +78,7 @@
 						ng-mouseover="vm.showDetailsOverlay(dataType)"
 						ng-click="vm.pickDataType(dataType)"
 						class="-four-in-row">
-						<a href="" title="{{ dataType.name }}">
+						<a class="umb-card-grid-item" href="" title="{{ dataType.name }}">
 							<i class="{{ dataType.icon }}" ng-class="{'icon-autofill': dataType.icon == null}"></i>
 							{{ dataType.name }}
 						</a>
@@ -96,7 +96,7 @@
 						ng-mouseover="vm.showDetailsOverlay(systemDataType)"
 						ng-click="vm.pickEditor(systemDataType)"
 						class="-four-in-row">
-						<a href="" title="{{ systemDataType.name }}">
+						<a class="umb-card-grid-item" href="" title="{{ systemDataType.name }}">
 							<i class="{{ systemDataType.icon }}" ng-class="{'icon-autofill': systemDataType.icon == null}"></i>
 							{{ systemDataType.name }}
 						</a>

src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html

@@ -16,7 +16,7 @@
         ng-repeat="availableItem in model.availableItems | compareArrays:model.selectedItems:'alias' | orderBy:'name' | filter:searchTerm"
         ng-click="selectItem(availableItem)"
         class="-three-in-row">
-        <a href="" title="{{ availableItem.name }}">
+        <a class="umb-card-grid-item" href="" title="{{ availableItem.name }}">
             <i class="{{ availableItem.icon }}"></i>
             {{ availableItem.name }}
         </a>

src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.controller.js

@@ -30,18 +30,18 @@ angular.module("umbraco")
             var pendingChangeEvent = eventsService.on("valFormManager.pendingChanges", function (e, args) {
                 //one time listener, remove the event
                 pendingChangeEvent();
-                $scope.closeOverLay();
+                $scope.model.close();
             });
 
 
             //perform the path change, if it is successful then the promise will resolve otherwise it will fail
-            $scope.closeOverLay();
+            $scope.model.close();
             $location.path("/logout");
         };
 
         $scope.gotoHistory = function (link) {
             $location.path(link);
-            $scope.closeOverLay();
+            $scope.model.close();
         };
 
         //Manually update the remaining timeout seconds
@@ -147,6 +147,9 @@ angular.module("umbraco")
                     formHelper.resetForm({ scope: $scope, notifications: data.notifications });
 
                     $scope.changePasswordButtonState = "success";
+                    $timeout(function() {
+                        $scope.togglePasswordFields();
+                    }, 2000);
 
                 }, function (err) {
 

src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html

@@ -10,23 +10,32 @@
            </small>
        </p>
 
-       <a href="#/users/framed/%252Fumbraco%252Fusers%252Fedituser.aspx%253Fid%253D{{user.id}}"
-          class="btn btn-primary"
-          ng-click="closeOverLay()"
-          ng-if="canEditProfile">
-          <localize key="general_edit">Edit</localize>
-       </a>
-
-       <umb-button
-          type="button"
-          action="togglePasswordFields()"
-          label="Change password"
-          button-style="success">
+        <umb-button
+            type="link"
+            href="#/users/framed/%252Fumbraco%252Fusers%252Fedituser.aspx%253Fid%253D{{user.id}}"
+            action="model.close()"
+            button-style="primary"
+            label="Edit"
+            label-key="general_edit"
+            ng-if="canEditProfile">
        </umb-button>
 
-       <button ng-click="logout()" hotkey="ctrl+shift+l" class="btn btn-warning">
-           <localize key="general_logout">Log out</localize>
-       </button>
+        <umb-button
+            type="button"
+            action="togglePasswordFields()"
+            label="Change password"
+            label-key="general_changePassword"
+            button-style="success">
+       </umb-button>
+
+        <umb-button
+            type="button"
+            action="logout()"
+            shortcut="ctrl+shift+l"
+            button-style="warning"
+            label="Log out"
+            label-key="general_logout">
+        </umb-button>
 
     </div>
 
@@ -91,19 +100,21 @@
 
           <umb-editor model="changePasswordModel"></umb-editor>
 
-          <umb-button
-             type="button"
-             action="togglePasswordFields()"
-             label="Back"
-             button-style="Cancel">
+           <umb-button
+               type="button"
+               action="togglePasswordFields()"
+               label="Back"
+               label-key="general_back"
+               button-style="cancel">
           </umb-button>
 
-          <umb-button
-             type="submit"
-             label="Change password"
-             state="changePasswordButtonState"
-             button-style="success">
-          </umb-button>
+           <umb-button
+               type="submit"
+               label="Change password"
+               label-key="general_changePassword"
+               state="changePasswordButtonState"
+               button-style="success">
+           </umb-button>
 
        </form>
 

src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html

@@ -8,7 +8,7 @@
 
    <div ng-if="state !== 'init'" class="umb-button__overlay"></div>
 
-   <a ng-if="type === 'link'" href="{{href}}" class="btn umb-button__button {{style}}" hotkey="{{shortcut}}" hotkey-when-hidden="{{shortcutWhenHidden}}">
+   <a ng-if="type === 'link'" href="{{href}}" class="btn umb-button__button {{style}}" ng-click="action(model)" hotkey="{{shortcut}}" hotkey-when-hidden="{{shortcutWhenHidden}}">
       <span class="umb-button__content" ng-class="{'-hidden': state !== 'init'}">
          <i ng-if="icon && buttonStyle==='link'" class="{{icon}} umb-button__icon"></i>
          <localize ng-if="labelKey" key="{{labelKey}}">{{label}}</localize>

src/Umbraco.Web.UI.Client/src/views/components/overlays/umb-overlay.html

@@ -6,7 +6,7 @@
             <p class="umb-overlay__subtitle">{{model.subtitle}}</p>
         </div>
 
-        <div class="umb-overlay-container" ng-transclude>
+        <div class="umb-overlay-container form-horizontal" ng-transclude>
             <div ng-if="view" ng-include="view"></div>
         </div>
 

src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html

@@ -75,6 +75,7 @@
                                    ng-disabled="tab.inherited"
                                    umb-auto-focus
                                    umb-auto-resize
+                                   on-focus="activateGroup(tab)"
                                    required
                                    val-server-field="{{'Groups[' + $index + '].Name'}}" />
 
@@ -109,7 +110,15 @@
                     <li ng-class="{'umb-group-builder__property-sortable': sortingMode && !property.inherited && !property.locked}" ng-repeat="property in tab.properties">
 
                         <!-- Init property / Property placeholder / add new property -->
-                        <a href="" class="umb-group-builder__property -placeholder" ng-if="property.propertyState=='init' && !sortingMode" ng-class="{'-placeholder': property.propertyState=='init'}" hotkey="alt+shift+p" ng-click="addProperty(property, tab)" focus-when="{{property.focus}}">
+                        <a href=""
+                            class="umb-group-builder__property -placeholder"
+                            ng-if="property.propertyState=='init' && !sortingMode"
+                            ng-class="{'-placeholder': property.propertyState=='init'}"
+                            hotkey="alt+shift+p"
+                            hotkey-when="{{tab.tabState === 'active' && property.propertyState=='init'}}"
+                            ng-click="addProperty(property, tab)"
+                            on-focus="activateGroup(tab)"
+                            focus-when="{{property.focus}}">
 
                             <div class="umb-group-builder__property-meta">
                                 <div class="umb-group-builder__placeholder-box -input-small"></div>

src/Umbraco.Web.UI.Client/src/views/content/content.recyclebin.controller.js

@@ -8,7 +8,7 @@
  * 
  */
 
-function ContentRecycleBinController($scope, $routeParams, dataTypeResource, navigationService, localizationService) {
+function ContentRecycleBinController($scope, $routeParams, contentResource, navigationService, localizationService) {
 
     //ensures the list view doesn't actually load until we query for the list view config
     // for the section
@@ -16,17 +16,23 @@ function ContentRecycleBinController($scope, $routeParams, dataTypeResource, nav
     $scope.page.name = "Recycle Bin";
     $scope.page.nameLocked = true;
 
+    //ensures the list view doesn't actually load until we query for the list view config
+    // for the section
     $scope.listViewPath = null;
 
     $routeParams.id = "-20";
-    dataTypeResource.getById(-95).then(function (result) {
-        _.each(result.preValues, function (i) {
-            $scope.model.config[i.key] = i.value;
+    contentResource.getRecycleBin().then(function (result) {
+        //we'll get the 'content item' for the recycle bin, we know that it will contain a single tab and a 
+        // single property, so we'll extract that property (list view) and use it's data.
+        var listproperty = result.tabs[0].properties[0];
+
+        _.each(listproperty.config, function (val, key) {
+            $scope.model.config[key] = val;
         });
         $scope.listViewPath = 'views/propertyeditors/listview/listview.html';
     });
 
-    $scope.model = { config: { entityType: $routeParams.section } };
+    $scope.model = { config: { entityType: $routeParams.section, layouts: [] } };
 
     // sync tree node
     navigationService.syncTree({ tree: "content", path: ["-1", $routeParams.id], forceReload: false });
@@ -35,11 +41,11 @@ function ContentRecycleBinController($scope, $routeParams, dataTypeResource, nav
 
     function localizePageName() {
 
-       var pageName = "general_recycleBin";
+        var pageName = "general_recycleBin";
 
-       localizationService.localize(pageName).then(function(value) {
-          $scope.page.name = value;
-       });
+        localizationService.localize(pageName).then(function (value) {
+            $scope.page.name = value;
+        });
 
     }
 }

src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html

@@ -1,17 +1,16 @@
 <umb-editor-view ng-controller="Umbraco.Editors.Content.RecycleBinController">
+    <form>
+        <umb-editor-header name="page.name"
+                           name-locked="page.nameLocked"
+                           hide-icon="true"
+                           hide-description="true"
+                           hide-alias="true">
+        </umb-editor-header>
 
-   <umb-editor-header
-      name="page.name"
-      name-locked="page.nameLocked"
-      hide-icon="true"
-      hide-description="true"
-      hide-alias="true" >
-   </umb-editor-header>
+        <umb-editor-container>
 
-   <umb-editor-container>
+            <div ng-include="listViewPath"></div>
 
-      <div ng-include="listViewPath"></div>
-
-   </umb-editor-container>
-
-</umb-editor-view>
+        </umb-editor-container>
+    </form>
+</umb-editor-view>

src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js

@@ -118,6 +118,7 @@
                 //Models builder mode:
                 vm.page.defaultButton = {
                     hotKey: "ctrl+s",
+                    hotKeyWhenHidden: true,
                     labelKey: "buttons_save",
                     letter: "S",
                     type: "submit",
@@ -125,21 +126,54 @@
                 };
                 vm.page.subButtons = [{
                     hotKey: "ctrl+g",
-                    labelKey: "buttons_generateModels",
+                    hotKeyWhenHidden: true,
+                    labelKey: "buttons_saveAndGenerateModels",
                     letter: "G",
                     handler: function () {
 
                         vm.page.saveButtonState = "busy";
-                        notificationsService.info("Building models", "this can take abit of time, don't worry");
 
-                        contentTypeHelper.generateModels().then(function (result) {
-                            vm.page.saveButtonState = "init";
-                            //clear and add success
-                            notificationsService.success("Models Generated");
-                        }, function () {
-                            notificationsService.error("Models could not be generated");
-                            vm.page.saveButtonState = "error";
+                        vm.save().then(function (result) {
+
+                            vm.page.saveButtonState = "busy";
+
+                            localizationService.localize("modelsBuilder_buildingModels").then(function (headerValue) {
+                                localizationService.localize("modelsBuilder_waitingMessage").then(function(msgValue) {
+                                    notificationsService.info(headerValue, msgValue);
+                                });
+                            });
+
+                            contentTypeHelper.generateModels().then(function (result) {
+
+                                if (result.success) {
+
+                                    //re-check model status
+                                    contentTypeHelper.checkModelsBuilderStatus().then(function(statusResult) {
+                                        vm.page.modelsBuilder = statusResult;
+                                    });
+
+                                    //clear and add success
+                                    vm.page.saveButtonState = "init";
+                                    localizationService.localize("modelsBuilder_modelsGenerated").then(function(value) {
+                                        notificationsService.success(value);
+                                    });
+
+                                } else {
+                                    vm.page.saveButtonState = "error";
+                                    localizationService.localize("modelsBuilder_modelsExceptionInUlog").then(function(value) {
+                                        notificationsService.error(value);
+                                    });
+                                }
+
+                            }, function () {
+                                vm.page.saveButtonState = "error";
+                                localizationService.localize("modelsBuilder_modelsGeneratedError").then(function(value) {
+                                    notificationsService.error(value);
+                                });
+                            });
+
                         });
+
                     }
                 }];
             }
@@ -264,7 +298,7 @@
         }
 
         function init(contentType) {
-            
+
             // set all tab to inactive
             if (contentType.groups.length !== 0) {
                 angular.forEach(contentType.groups, function (group) {

src/Umbraco.Web.UI.Client/src/views/media/media.recyclebin.controller.js

@@ -8,8 +8,10 @@
  * 
  */
 
-function MediaRecycleBinController($scope, $routeParams, dataTypeResource, navigationService, localizationService) {
+function MediaRecycleBinController($scope, $routeParams, mediaResource, navigationService, localizationService) {
 
+    //ensures the list view doesn't actually load until we query for the list view config
+    // for the section
     $scope.page = {};
     $scope.page.name = "Recycle Bin";
     $scope.page.nameLocked = true;
@@ -19,14 +21,18 @@ function MediaRecycleBinController($scope, $routeParams, dataTypeResource, navig
     $scope.listViewPath = null;
 
     $routeParams.id = "-21";
-    dataTypeResource.getById(-96).then(function (result) {
-        _.each(result.preValues, function (i) {
-            $scope.model.config[i.key] = i.value;
+    mediaResource.getRecycleBin().then(function (result) {
+        //we'll get the 'content item' for the recycle bin, we know that it will contain a single tab and a 
+        // single property, so we'll extract that property (list view) and use it's data.
+        var listproperty = result.tabs[0].properties[0];
+
+        _.each(listproperty.config, function (val, key) {
+            $scope.model.config[key] = val;
         });
         $scope.listViewPath = 'views/propertyeditors/listview/listview.html';
     });
 
-    $scope.model = { config: { entityType: $routeParams.section } };
+    $scope.model = { config: { entityType: $routeParams.section, layouts: [] } };
 
     // sync tree node
     navigationService.syncTree({ tree: "media", path: ["-1", $routeParams.id], forceReload: false });
@@ -35,14 +41,13 @@ function MediaRecycleBinController($scope, $routeParams, dataTypeResource, navig
 
     function localizePageName() {
 
-      var pageName = "general_recycleBin";
+        var pageName = "general_recycleBin";
 
-      localizationService.localize(pageName).then(function(value) {
-          $scope.page.name = value;
-      });
+        localizationService.localize(pageName).then(function (value) {
+            $scope.page.name = value;
+        });
 
     }
-
 }
 
 angular.module('umbraco').controller("Umbraco.Editors.Media.RecycleBinController", MediaRecycleBinController);

src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html

@@ -1,17 +1,16 @@
 <umb-editor-view ng-controller="Umbraco.Editors.Media.RecycleBinController">
+    <form>
+        <umb-editor-header name="page.name"
+                           name-locked="page.nameLocked"
+                           hide-icon="true"
+                           hide-description="true"
+                           hide-alias="true">
+        </umb-editor-header>
 
-   <umb-editor-header
-      name="page.name"
-      name-locked="page.nameLocked"
-      hide-icon="true"
-      hide-description="true"
-      hide-alias="true">
-   </umb-editor-header>
+        <umb-editor-container>
 
-   <umb-editor-container>
-
-      <div ng-include="listViewPath"></div>
-
-   </umb-editor-container>
+            <div ng-include="listViewPath"></div>
 
+        </umb-editor-container>
+    </form>
 </umb-editor-view>

src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js

@@ -103,6 +103,7 @@
                 //Models builder mode:
                 vm.page.defaultButton = {
                     hotKey: "ctrl+s",
+                    hotKeyWhenHidden: true,
                     labelKey: "buttons_save",
                     letter: "S",
                     type: "submit",
@@ -110,21 +111,54 @@
                 };
                 vm.page.subButtons = [{
                     hotKey: "ctrl+g",
-                    labelKey: "buttons_generateModels",
+                    hotKeyWhenHidden: true,
+                    labelKey: "buttons_saveAndGenerateModels",
                     letter: "G",
                     handler: function () {
 
                         vm.page.saveButtonState = "busy";
-                        notificationsService.info("Building models", "this can take abit of time, don't worry");
 
-                        contentTypeHelper.generateModels().then(function(result) {
-                            vm.page.saveButtonState = "init";
-                            //clear and add success
-                            notificationsService.success("Models Generated");                            
-                        }, function() {
-                            notificationsService.error("Models could not be generated");
-                            vm.page.saveButtonState = "error";
+                        vm.save().then(function (result) {
+
+                            vm.page.saveButtonState = "busy";
+
+                            localizationService.localize("modelsBuilder_buildingModels").then(function (headerValue) {
+                                localizationService.localize("modelsBuilder_waitingMessage").then(function(msgValue) {
+                                    notificationsService.info(headerValue, msgValue);
+                                });
+                            });
+
+                            contentTypeHelper.generateModels().then(function (result) {
+
+                                if (result.success) {
+
+                                    //re-check model status
+                                    contentTypeHelper.checkModelsBuilderStatus().then(function (statusResult) {
+                                        vm.page.modelsBuilder = statusResult;
+                                    });
+
+                                    //clear and add success
+                                    vm.page.saveButtonState = "init";
+                                    localizationService.localize("modelsBuilder_modelsGenerated").then(function(value) {
+                                        notificationsService.success(value);
+                                    });
+
+                                } else {
+                                    vm.page.saveButtonState = "error";
+                                    localizationService.localize("modelsBuilder_modelsExceptionInUlog").then(function(value) {
+                                        notificationsService.error(value);
+                                    });
+                                }
+
+                            }, function () {
+                                vm.page.saveButtonState = "error";
+                                localizationService.localize("modelsBuilder_modelsGeneratedError").then(function(value) {
+                                    notificationsService.error(value);
+                                });
+                            });
+
                         });
+
                     }
                 }];
             }
@@ -243,7 +277,7 @@
         }
 
         function init(contentType) {
-           
+
             // set all tab to inactive
             if (contentType.groups.length !== 0) {
                 angular.forEach(contentType.groups, function (group) {

src/Umbraco.Web.UI.Client/src/views/membertypes/edit.controller.js

@@ -60,6 +60,7 @@
                 //Models builder mode:
                 vm.page.defaultButton = {
                     hotKey: "ctrl+s",
+                    hotKeyWhenHidden: true,
                     labelKey: "buttons_save",
                     letter: "S",
                     type: "submit",
@@ -67,21 +68,55 @@
                 };
                 vm.page.subButtons = [{
                     hotKey: "ctrl+g",
-                    labelKey: "buttons_generateModels",
+                    hotKeyWhenHidden: true,
+                    labelKey: "buttons_saveAndGenerateModels",
                     letter: "G",
                     handler: function () {
 
                         vm.page.saveButtonState = "busy";
-                        notificationsService.info("Building models", "this can take abit of time, don't worry");
 
-                        contentTypeHelper.generateModels().then(function (result) {
-                            vm.page.saveButtonState = "init";
-                            //clear and add success
-                            notificationsService.success("Models Generated");
-                        }, function () {
-                            notificationsService.error("Models could not be generated");
-                            vm.page.saveButtonState = "error";
+                        vm.save().then(function (result) {
+
+                            vm.page.saveButtonState = "busy";
+
+                            localizationService.localize("modelsBuilder_buildingModels").then(function (headerValue) {
+                                localizationService.localize("modelsBuilder_waitingMessage").then(function(msgValue) {
+                                    notificationsService.info(headerValue, msgValue);
+                                });
+                            });
+
+                            contentTypeHelper.generateModels().then(function (result) {
+
+                                if (result.success) { 
+
+                                    //re-check model status
+                                    contentTypeHelper.checkModelsBuilderStatus().then(function (statusResult) {
+                                        vm.page.modelsBuilder = statusResult;
+                                    });
+
+                                    //clear and add success
+                                    vm.page.saveButtonState = "init";
+                                    localizationService.localize("modelsBuilder_modelsGenerated").then(function(value) {
+                                        notificationsService.success(value);
+                                    });
+
+                                } else {
+                                    vm.page.saveButtonState = "error";
+                                    localizationService.localize("modelsBuilder_modelsExceptionInUlog").then(function(value) {
+                                        notificationsService.error(value);
+                                    });
+                                }
+
+                            }, function () {
+                                vm.page.saveButtonState = "error";
+                                localizationService.localize("modelsBuilder_modelsGeneratedError").then(function(value) {
+                                    notificationsService.error(value);
+                                });
+                            });
+
+
                         });
+
                     }
                 }];
             }

src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html

@@ -1,13 +1,13 @@
 <div class="umb-editor" ng-controller="Umbraco.PrevalueEditors.MultiValuesController">
     <div class="control-group">
-        <input name="newItem" type="text" ng-model="newItem" val-highlight="hasError" />
-        <button class="btn btn-small" ng-click="add($event)">Add</button>
+        <input name="newItem" type="text" ng-model="newItem" val-highlight="{{hasError}}" />
+        <button class="btn" ng-click="add($event)">Add</button>
     </div>
     <div ui-sortable="sortableOptions">
         <div class="control-group" ng-repeat="item in model.value">
             <i class="icon icon-navigation handle"></i>
             <input type="text" ng-model="item.value" val-server="item_{{$index}}" required />
-            <button class="btn btn-small btn-danger" ng-click="remove(item, $event)">Remove</button>
+            <button class="btn btn-danger" ng-click="remove(item, $event)">Remove</button>
         </div>
     </div>
 </div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/changepassword/changepassword.html

@@ -5,12 +5,14 @@
         <strong>{{model.value.generatedPassword}}</strong>
     </div>
     <div ng-switch="changing">
-        <div ng-switch-when="false">        
-            <a href="" ng-click="doChange()" class="btn btn-small">Change password</a>         
+        <div ng-switch-when="false">
+            <a href="" ng-click="doChange()" class="btn btn-small">
+                <localize key="general_changePassword">Change password</localize>
+            </a>         
         </div>
         <div ng-switch-when="true">
         
-            <umb-control-group alias="resetPassword" label="Reset password?" ng-show="$parent.showReset()">
+            <umb-control-group alias="resetPassword" label="@user_resetPassword" ng-show="$parent.showReset()">
                 <input type="checkbox" ng-model="$parent.model.value.reset" 
                        id="Checkbox1" 
                        name="resetPassword"
@@ -19,7 +21,7 @@
             </umb-control-group>
 
             <!-- we need to show the old pass field when the provider cannot retrieve the password -->
-            <umb-control-group alias="oldPassword" label="Old password" ng-show="$parent.showOldPass()">            
+            <umb-control-group alias="oldPassword" label="@user_oldPassword" ng-show="$parent.showOldPass()">            
                 <input type="password" name="oldPassword" ng-model="$parent.model.value.oldPassword"
                        class="input-large umb-textstring textstring" 
                        ng-required="$parent.showOldPass()"
@@ -29,7 +31,7 @@
                 <span class="help-inline" val-msg-for="oldPassword" val-toggle-msg="valServer"></span>
             </umb-control-group>
 
-            <umb-control-group alias="password" label="New password" ng-show="$parent.showNewPass()">            
+            <umb-control-group alias="password" label="@user_newPassword" ng-show="$parent.showNewPass()">            
                 <input type="password" name="password" ng-model="$parent.model.value.newPassword"
                        class="input-large umb-textstring textstring"
                        ng-required="!$parent.model.value.reset"
@@ -41,16 +43,20 @@
                 <span class="help-inline" val-msg-for="password" val-toggle-msg="valServer"></span>     
             </umb-control-group>
 
-            <umb-control-group alias="confirmpassword" label="Confirm password" ng-show="$parent.showConfirmPass()">
+            <umb-control-group alias="confirmpassword" label="@user_confirmNewPassword" ng-show="$parent.showConfirmPass()">
                 <input type="password" name="confirmpassword" ng-model="$parent.model.confirm"
                        class="input-large umb-textstring textstring"
                        val-compare="password" no-dirty-check
-                       autocomplete="off" />
+                       autocomplete="off"/>
 
-                <span class="help-inline" val-msg-for="confirmpassword" val-toggle-msg="valCompare">Passwords must match</span>     
-            </umb-control-group> 
+                <span class="help-inline" val-msg-for="confirmpassword" val-toggle-msg="valCompare">
+                    <localize key="user_passwordMismatch">The confirmed password doesn't match the new password!</localize>
+                </span>
+            </umb-control-group>
 
-            <a href="" ng-click="cancelChange()" ng-show="showCancelBtn()" class="btn btn-small">Cancel</a> 
+            <a href="" ng-click="cancelChange()" ng-show="showCancelBtn()" class="btn btn-small">
+                <localize key="general_cancel">Cancel</localize>
+            </a> 
         </div>      
     </div>  
 </div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html

@@ -1,12 +1,12 @@
 <div ng-controller="Umbraco.PrevalueEditors.MultiColorPickerController">
     <div class="control-group color-picker-preval">
         <input name="newColor" type="hidden" />
+        <button class="btn add" ng-click="add($event)">Add</button>
         <label for="newColor" val-highlight="hasError">{{newColor}}</label>
-        <button class="btn btn-small add" ng-click="add($event)">Add</button>
     </div>
     <div class="control-group color-picker-preval" ng-repeat="item in model.value">
         <div class="thumbnail span1" hex-bg-color="{{item.value}}" bg-orig="transparent"></div>
         <pre>{{item.value}}</pre>
-        <button class="btn btn-small btn-danger" ng-click="remove(item, $event)">Remove</button>
+        <button class="btn btn-danger" ng-click="remove(item, $event)">Remove</button>
     </div>
-</div>
+</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js

@@ -159,7 +159,7 @@ angular.module("umbraco")
                         if (thumbnail) {
                             if (mediaHelper.detectIfImageByExtension(property.value)) {
                                 //get default big thumbnail from image processor
-                                var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500";
+                                var thumbnailUrl = property.value + "?rnd=" + moment(entity.updateDate).format("YYYYMMDDHHmmss") + "&width=500&animationprocessmode=first";
                                 return thumbnailUrl;
                             }
                             else {

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js

@@ -41,6 +41,7 @@ angular.module("umbraco")
                 if($scope.control.editor.config && $scope.control.editor.config.size){
                     url += "?width=" + $scope.control.editor.config.size.width;
                     url += "&height=" + $scope.control.editor.config.size.height;
+                    url += "&animationprocessmode=first";
 
                     if($scope.control.value.focalPoint){
                         url += "&center=" + $scope.control.value.focalPoint.top +"," + $scope.control.value.focalPoint.left;
@@ -48,6 +49,11 @@ angular.module("umbraco")
                     }
                 }
 
+                // set default size if no crop present (moved from the view)
+                if (url.indexOf('?') == -1)
+                {
+                    url += "?width=800&upscale=false&animationprocessmode=false"
+                }
                 $scope.url = url;
             }
         };

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.html

@@ -9,7 +9,7 @@
 		<img
 			ng-if="url"
 			ng-click="setImage()"
-			ng-src="{{url}}?width=800&upscale=false"
+			ng-src="{{url}}"
 			class="fullSizeImage" />
         <input type="text" class="caption" ng-model="control.value.caption" localize="placeholder" placeholder="@grid_placeholderImageCaption" />
  	</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js

@@ -1,9 +1,11 @@
 angular.module("umbraco")
     .controller("Umbraco.PropertyEditors.GridController",
-    function ($scope, $http, assetsService, localizationService, $rootScope, dialogService, gridService, mediaResource, imageHelper, $timeout, umbRequestHelper) {
+    function ($scope, $http, assetsService, localizationService, $rootScope, dialogService, gridService, mediaResource, imageHelper, $timeout, umbRequestHelper, angularHelper) {
 
         // Grid status variables
         var placeHolder = "";
+        var currentForm = angularHelper.getCurrentForm($scope);
+
         $scope.currentRow = null;
         $scope.currentCell = null;
         $scope.currentToolsControl = null;
@@ -73,6 +75,7 @@ angular.module("umbraco")
                     tinyMCE.execCommand("mceRemoveEditor", false, id);
                     tinyMCE.init(draggedRteSettings[id]);
                 });
+                currentForm.$setDirty();
             }
         };
 
@@ -160,6 +163,7 @@ angular.module("umbraco")
                         }
                     });
                 }
+                currentForm.$setDirty();
             },
 
             start: function (e, ui) {
@@ -320,6 +324,8 @@ angular.module("umbraco")
                 section.rows.push(row);
             }
 
+            currentForm.$setDirty();
+
             $scope.showRowConfigurations = false;
 
         };
@@ -329,8 +335,7 @@ angular.module("umbraco")
                 section.rows.splice($index, 1);
                 $scope.currentRow = null;
                 $scope.openRTEToolbarId = null;
-
-                //$scope.initContent();
+                currentForm.$setDirty();
             }
 
             if(section.rows.length === 0) {
@@ -397,6 +402,8 @@ angular.module("umbraco")
                 gridItem.config = configObject;
                 gridItem.hasConfig = gridItemHasConfig(styleObject, configObject);
 
+                currentForm.$setDirty();
+
                 $scope.gridItemSettingsDialog.show = false;
                 $scope.gridItemSettingsDialog = null;
             };
@@ -407,7 +414,7 @@ angular.module("umbraco")
             };
 
         };
-        
+
         function stripModifier(val, modifier) {
             if (!val || !modifier || modifier.indexOf(placeHolder) < 0) {
                 return val;

src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html

@@ -174,7 +174,8 @@
                                                               ng-click="clickControl($index, area.controls, area)"
                                                               ng-class="{'-active': control.active}"
                                                               on-outside-click="clickOutsideControl($index, area.controls, area)"
-                                                              bind-click-on="{{control.active}}">
+                                                              bind-click-on="{{control.active}}"
+                                                              umb-set-dirty-on-change="{{control.value}}">
 
                                                               <div class="umb-control-click-overlay" ng-show="!control.active && !sortMode"></div>
 

src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js

@@ -116,7 +116,7 @@ angular.module('umbraco')
                 if (property.value.src) {
 
                     if (thumbnail === true) {
-                        return property.value.src + "?width=500&mode=max";
+                        return property.value.src + "?width=500&mode=max&animationprocessmode=first";
                     }
                     else {
                         return property.value.src;

src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html

@@ -24,26 +24,26 @@
         <div class="control-group">
             <label>Alias</label>
             <input name="newItem.alias" type="text"
-                   ng-model="newItem.alias" val-highlight="hasError" />
+                   ng-model="newItem.alias" val-highlight="{{hasError}}" />
         </div>
 
         <div class="control-group">
             <label>Size</label>
             <input name="newItem.width" type="number" placeholder="Width"
-                   ng-model="newItem.width" class="umb-editor-tiny" val-highlight="hasError" />
+                   ng-model="newItem.width" class="umb-editor-tiny" val-highlight="{{hasError}}" />
             &times;
             <input name="newItem.height" type="number" placeholder="Height"
-                   ng-model="newItem.height" class="umb-editor-tiny" val-highlight="hasError" />
+                   ng-model="newItem.height" class="umb-editor-tiny" val-highlight="{{hasError}}" />
         </div>
 
         <div class="control-group">
-            <button class="btn btn-small" ng-click="add($event)">Save crop</button>
-            <a href class="btn btn-small btn-link" ng-click="cancel($event)">Cancel</a>
+            <button class="btn" ng-click="add($event)">Save crop</button>
+            <a href class="btn btn-link" ng-click="cancel($event)">Cancel</a>
         </div>
     </div>
 
     <div class="control-group" ng-hide="newItem">
-        <button class="btn btn-small" ng-click="newItem = {}" prevent-default>Add new crop</button>
+        <button class="btn" ng-click="newItem = {}" prevent-default>Add new crop</button>
     </div>
 
-</div>
+</div>

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.listviewlayout.controller.js

@@ -14,7 +14,10 @@
       var vm = this;
 
       vm.nodeId = $scope.contentId;
-      vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+       //vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+        //instead of passing in a whitelist, we pass in a blacklist by adding ! to the ext
+      vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles).replace(/./g, "!.");
+
       vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
       vm.activeDrag = false;
       vm.mediaDetailsTooltip = {};

src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js

@@ -6,7 +6,9 @@
         var vm = this;
 
         vm.nodeId = $scope.contentId;
-        vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+        //vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes);
+        //instead of passing in a whitelist, we pass in a blacklist by adding ! to the ext
+        vm.acceptedFileTypes = mediaHelper.formatFileTypes(Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles).replace(/./g, "!.");
         vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB";
         vm.activeDrag = false;
         vm.isRecycleBin = $scope.contentId === '-21' || $scope.contentId === '-20';