fixes datepicker css ref issue

Returning root element instead of document node from JsonToXml()

.gitignore

@@ -103,3 +103,6 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
 src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
 src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
 
+src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
+src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
+src/Umbraco.Web.UI/umbraco/plugins/*

build/Build.bat

@@ -1,32 +1,34 @@
-@ECHO OFF
-SET release=7.0.0
-SET comment=alpha
-SET version=%release%
-
-IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
-
-ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
-
-%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
-
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\macroScripts\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
-echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
-
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
-..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
-
-IF ERRORLEVEL 1 GOTO :showerror
-
-GOTO :EOF
-
-:showerror
-PAUSE
+@ECHO OFF
+SET release=7.0.0
+SET comment=
+SET version=%release%
+
+IF [%comment%] EQU [] (SET version=%release%) ELSE (SET version=%release%-%comment%)
+
+ReplaceIISExpressPortNumber.exe ..\src\Umbraco.Web.UI\Umbraco.Web.UI.csproj %release%
+
+%windir%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe "Build.proj" /p:BUILD_RELEASE=%release% /p:BUILD_COMMENT=%comment%
+
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Code\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Data\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\App_Plugins\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\css\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\masterpages\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\media\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\scripts\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\usercontrols\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\Partials\dummy.txt
+echo This file is only here so that the containing folder will be included in the NuGet package, it is safe to delete. > .\_BuildOutput\WebApp\Views\MacroPartials\dummy.txt
+
+ren .\_BuildOutput\WebApp\MacroScripts\Web.config Web.config.transform
+ren .\_BuildOutput\WebApp\Views\Web.config Web.config.transform
+
+..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.Core.nuspec -Version %version%
+..\src\.nuget\NuGet.exe pack NuSpecs\UmbracoCms.nuspec -Version %version%
+
+IF ERRORLEVEL 1 GOTO :showerror
+
+GOTO :EOF
+
+:showerror
+PAUSE

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms.Core</id>
@@ -15,18 +15,21 @@
         <language>en-US</language>
         <tags>umbraco</tags>
         <dependencies>
-            <dependency id="Microsoft.AspNet.Mvc" version="4.0" />
-            <dependency id="Microsoft.AspNet.WebApi" version="4.0" />
+            <dependency id="Microsoft.AspNet.Mvc" version="[4.0.0,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi" version="[4.0.0,5.0.0)" />
+            <dependency id="Microsoft.AspNet.WebApi.Client" version="[4.0.0, 5.0.0)" />
             <dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
+            <dependency id="Microsoft.Net.Http" version="[2.0.0, 3.0.0)" />
             <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
             <dependency id="HtmlAgilityPack" version="[1.4.6, 2.0.0)" />
-            <dependency id="Lucene.Net" version="[2.9.4.1]" />
+            <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
             <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
             <dependency id="MySql.Data" version="[6.6.5]" />
             <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-            <dependency id="ClientDependency" version="[1.7.0, 1.7.1)" />
-            <dependency id="ClientDependency-Mvc" version="[1.7.0, 1.7.1)" />
-            <dependency id="AutoMapper" version="[2.2.1, 3.0.0)" />
+            <dependency id="ClientDependency" version="[1.7.0, 2.0.0)" />
+            <dependency id="ClientDependency-Mvc" version="[1.7.0, 2.0.0)" />
+            <dependency id="AutoMapper" version="[3.0.0, 4.0.0)" />
+            <dependency id="Newtonsoft.Json" version="[4.5.11, 5.0.0)" />
         </dependencies>
     </metadata>
     <files>
@@ -59,8 +62,6 @@
         <file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
         <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
         <file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
-        <file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.dll" target="lib\umbraco.macroRenderings.dll" />
-        <file src="..\_BuildOutput\WebApp\bin\umbraco.macroRenderings.xml" target="lib\umbraco.macroRenderings.xml" />
         <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
         <file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
         <file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />

build/NuSpecs/UmbracoCms.nuspec

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>UmbracoCms</id>
@@ -23,7 +23,7 @@
 	<file src="..\_BuildOutput\WebApp\bin\x86\**" target="Content\bin\x86" />
 	<file src="..\_BuildOutput\Configs\**" target="Content\config" exclude="..\_BuildOutput\Configs\Web.config.transform" />
 	<file src="..\_BuildOutput\WebApp\css\**" target="Content\css" />
-	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" />
+	<file src="..\_BuildOutput\WebApp\macroScripts\**" target="Content\macroScripts" exclude="..\_BuildOutput\WebApp\macroScripts\Web.config" />
 	<file src="..\_BuildOutput\WebApp\masterpages\**" target="Content\masterpages" />
 	<file src="..\_BuildOutput\WebApp\media\**" target="Content\media" />
 	<file src="..\_BuildOutput\WebApp\scripts\**" target="Content\scripts" />

build/NuSpecs/tools/install.ps1

@@ -21,7 +21,7 @@ if ($project) {
 	$projectDestinationPath = Split-Path $project.FullName -Parent
 	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
 	Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
-	
+		
 	# Open readme.txt file
 	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
 }

src/Umbraco.Core/ApplicationContext.cs

@@ -28,12 +28,11 @@ namespace Umbraco.Core
         /// <param name="dbContext"></param>
         /// <param name="serviceContext"></param>
         /// <param name="cache"></param>
-        internal ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
+        public ApplicationContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache)
         {
             if (dbContext == null) throw new ArgumentNullException("dbContext");
             if (serviceContext == null) throw new ArgumentNullException("serviceContext");
             if (cache == null) throw new ArgumentNullException("cache");
-
             _databaseContext = dbContext;
             _services = serviceContext;
             ApplicationCache = cache;
@@ -43,12 +42,60 @@ namespace Umbraco.Core
         /// Creates a basic app context
         /// </summary>
         /// <param name="cache"></param>
-        internal ApplicationContext(CacheHelper cache)
+        public ApplicationContext(CacheHelper cache)
         {
             ApplicationCache = cache;
         }
 
-		/// <summary>
+	    /// <summary>
+	    /// A method used to set and/or ensure that a global ApplicationContext singleton is created.
+	    /// </summary>
+	    /// <param name="appContext">
+	    /// The instance to set on the global application singleton
+	    /// </param>
+	    /// <param name="replaceContext">If set to true and the singleton is already set, it will be replaced</param>
+	    /// <returns></returns>
+	    /// <remarks>
+	    /// This is NOT thread safe 
+	    /// </remarks>
+	    public static ApplicationContext EnsureContext(ApplicationContext appContext, bool replaceContext)
+	    {
+            if (ApplicationContext.Current != null)
+            {
+                if (!replaceContext)
+                    return ApplicationContext.Current;
+            }
+            ApplicationContext.Current = appContext;
+            return ApplicationContext.Current;
+	    }
+
+	    /// <summary>
+	    /// A method used to create and ensure that a global ApplicationContext singleton is created.
+	    /// </summary>
+	    /// <param name="cache"></param>
+	    /// <param name="replaceContext">
+	    /// If set to true will replace the current singleton instance - This should only be used for unit tests or on app 
+	    /// startup if for some reason the boot manager is not the umbraco boot manager.
+	    /// </param>
+	    /// <param name="dbContext"></param>
+	    /// <param name="serviceContext"></param>
+	    /// <returns></returns>
+	    /// <remarks>
+	    /// This is NOT thread safe 
+	    /// </remarks>
+	    public static ApplicationContext EnsureContext(DatabaseContext dbContext, ServiceContext serviceContext, CacheHelper cache, bool replaceContext)
+        {
+            if (ApplicationContext.Current != null)
+            {
+                if (!replaceContext)
+                    return ApplicationContext.Current;
+            }
+            var ctx = new ApplicationContext(dbContext, serviceContext, cache);
+            ApplicationContext.Current = ctx;
+            return ApplicationContext.Current;
+        }
+
+	    /// <summary>
     	/// Singleton accessor
     	/// </summary>
     	public static ApplicationContext Current { get; internal set; }
@@ -99,7 +146,7 @@ namespace Umbraco.Core
         //
         public bool IsConfigured
         {
-            // fixme - we should not do this - ok for now
+            // todo - we should not do this - ok for now
             get
             {
             	return Configured;

src/Umbraco.Core/Attempt{T}.cs

@@ -1,164 +1,164 @@
-using System;
-using Umbraco.Core.Dynamics;
-
-namespace Umbraco.Core
-{
-    /// <summary>
-    /// Represents the result of an operation attempt.
-    /// </summary>
-    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
-    [Serializable]
-	public struct Attempt<T>
-	{
-		private readonly bool _success;
-		private readonly T _result;
-		private readonly Exception _exception;
-
-        /// <summary>
-        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
-        /// </summary>
-        public bool Success
-		{
-			get { return _success; }
-		}
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        public Exception Exception { get { return _exception; } }
-
-        /// <summary>
-        /// Gets the exception associated with an unsuccessful attempt.
-        /// </summary>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
-        public Exception Error { get { return _exception; } }
-
-        /// <summary>
-        /// Gets the attempt result.
-        /// </summary>
-        public T Result
-		{
-			get { return _result; }
-		}
-
-        // optimize, use a singleton failed attempt
-		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
-
-        /// <summary>
-        /// Represents an unsuccessful attempt.
-        /// </summary>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
-        public static readonly Attempt<T> False = Failed; 
-
-        // private - use Succeed() or Fail() methods to create attempts
-        private Attempt(bool success, T result, Exception exception)
-        {
-            _success = success;
-            _result = result;
-            _exception = exception;
-        }
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
-        /// </summary>
-        /// <param name="success">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
-        public Attempt(bool success, T result)
-            : this(success, result, null)
-        { }
-
-        /// <summary>
-        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <remarks>Keep it for backward compatibility sake.</remarks>
-        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
-        public Attempt(Exception exception)
-            : this(false, default(T), exception)
-        { }
-
-        /// <summary>
-        /// Creates a successful attempt.
-        /// </summary>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed()
-        {
-            return new Attempt<T>(true, default(T), null);
-        }
-
-        /// <summary>
-        /// Creates a successful attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The successful attempt.</returns>
-        public static Attempt<T> Succeed(T result)
-        {
-            return new Attempt<T>(true, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt.
-        /// </summary>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail()
-        {
-            return Failed;
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with an exception.
-        /// </summary>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(Exception exception)
-        {
-            return new Attempt<T>(false, default(T), exception);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(T result)
-        {
-            return new Attempt<T>(false, result, null);
-        }
-
-        /// <summary>
-        /// Creates a failed attempt with a result and an exception.
-        /// </summary>
-        /// <param name="result">The result of the attempt.</param>
-        /// <param name="exception">The exception causing the failure of the attempt.</param>
-        /// <returns>The failed attempt.</returns>
-        public static Attempt<T> Fail(T result, Exception exception)
-        {
-            return new Attempt<T>(false, result, exception);
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> SucceedIf(bool condition)
-        {
-            return condition ? new Attempt<T>(true, default(T), null) : Failed;
-        }
-
-        /// <summary>
-        /// Creates a successful or a failed attempt, with a result.
-        /// </summary>
-        /// <param name="condition">A value indicating whether the attempt is successful.</param>
-        /// <param name="result">The result of the attempt.</param>
-        /// <returns>The attempt.</returns>
-        public static Attempt<T> SucceedIf(bool condition, T result)
-        {
-            return new Attempt<T>(condition, result, null);
-        }
-    }
+using System;
+using Umbraco.Core.Dynamics;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Represents the result of an operation attempt.
+    /// </summary>
+    /// <typeparam name="T">The type of the attempted operation result.</typeparam>
+    [Serializable]
+	public struct Attempt<T>
+	{
+		private readonly bool _success;
+		private readonly T _result;
+		private readonly Exception _exception;
+
+        /// <summary>
+        /// Gets a value indicating whether this <see cref="Attempt{T}"/> was successful.
+        /// </summary>
+        public bool Success
+		{
+			get { return _success; }
+		}
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        public Exception Exception { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the exception associated with an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Error is obsolete, you should use .Exception instead.", false)]
+        public Exception Error { get { return _exception; } }
+
+        /// <summary>
+        /// Gets the attempt result.
+        /// </summary>
+        public T Result
+		{
+			get { return _result; }
+		}
+
+        // optimize, use a singleton failed attempt
+		private static readonly Attempt<T> Failed = new Attempt<T>(false, default(T), null);
+
+        /// <summary>
+        /// Represents an unsuccessful attempt.
+        /// </summary>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete(".Failed is obsolete, you should use Attempt<T>.Fail() instead.", false)]
+        public static readonly Attempt<T> False = Failed; 
+
+        // private - use Succeed() or Fail() methods to create attempts
+        private Attempt(bool success, T result, Exception exception)
+        {
+            _success = success;
+            _result = result;
+            _exception = exception;
+        }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct with a result.
+        /// </summary>
+        /// <param name="success">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(bool success, T result)
+            : this(success, result, null)
+        { }
+
+        /// <summary>
+        /// Initialize a new instance of the <see cref="Attempt{T}"/> struct representing a failed attempt, with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <remarks>Keep it for backward compatibility sake.</remarks>
+        [Obsolete("Attempt ctors are obsolete, you should use Attempt<T>.Succeed(), Attempt<T>.Fail() or Attempt<T>.If() instead.", false)]
+        public Attempt(Exception exception)
+            : this(false, default(T), exception)
+        { }
+
+        /// <summary>
+        /// Creates a successful attempt.
+        /// </summary>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed()
+        {
+            return new Attempt<T>(true, default(T), null);
+        }
+
+        /// <summary>
+        /// Creates a successful attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The successful attempt.</returns>
+        public static Attempt<T> Succeed(T result)
+        {
+            return new Attempt<T>(true, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt.
+        /// </summary>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail()
+        {
+            return Failed;
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with an exception.
+        /// </summary>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(Exception exception)
+        {
+            return new Attempt<T>(false, default(T), exception);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result)
+        {
+            return new Attempt<T>(false, result, null);
+        }
+
+        /// <summary>
+        /// Creates a failed attempt with a result and an exception.
+        /// </summary>
+        /// <param name="result">The result of the attempt.</param>
+        /// <param name="exception">The exception causing the failure of the attempt.</param>
+        /// <returns>The failed attempt.</returns>
+        public static Attempt<T> Fail(T result, Exception exception)
+        {
+            return new Attempt<T>(false, result, exception);
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition)
+        {
+            return condition ? new Attempt<T>(true, default(T), null) : Failed;
+        }
+
+        /// <summary>
+        /// Creates a successful or a failed attempt, with a result.
+        /// </summary>
+        /// <param name="condition">A value indicating whether the attempt is successful.</param>
+        /// <param name="result">The result of the attempt.</param>
+        /// <returns>The attempt.</returns>
+        public static Attempt<T> SucceedIf(bool condition, T result)
+        {
+            return new Attempt<T>(condition, result, null);
+        }
+    }
 }

src/Umbraco.Core/Cache/CacheKeys.cs

@@ -47,6 +47,5 @@ namespace Umbraco.Core.Cache
         public const string StylesheetPropertyCacheKey = "UmbracoStylesheetProperty";
 
         public const string DataTypeCacheKey = "UmbracoDataTypeDefinition";
-
     }
 }

src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs

@@ -55,7 +55,7 @@ namespace Umbraco.Core.Cache
             }
         }
 
-        /// <summary>
+        /// <summary>
         /// Gets (and adds if necessary) an item from the cache with all of the default parameters
         /// </summary>
         /// <param name="cacheKey"></param>

src/Umbraco.Core/CacheHelper.cs

@@ -32,7 +32,7 @@ namespace Umbraco.Core
         /// <remarks>
         /// Good for unit testing
         /// </remarks>
-        internal static CacheHelper CreateDisabledCacheHelper()
+        public static CacheHelper CreateDisabledCacheHelper()
         {
             return new CacheHelper(null, null, null, false);
         }
@@ -74,14 +74,6 @@ namespace Umbraco.Core
         {            
         }
 
-	    internal void ClearStaticCacheObjectTypes<T>(Func<string, T, bool> predicate)
-	    {
-	        if (_enableCache)
-                _staticCache.ClearCacheObjectTypes(predicate);
-            else
-                _nullStaticCache.ClearCacheObjectTypes(predicate);
-	    }
-
         /// <summary>
         /// Private ctor used for creating a disabled cache helper
         /// </summary>

src/Umbraco.Core/Configuration/BaseRest/BaseRestSection.cs

@@ -1,38 +1,38 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    [ConfigurationKey("BaseRestExtensions")]
-    internal class BaseRestSection : UmbracoConfigurationSection, IBaseRestSection
-    {
-        private const string KeyEnabled = "enabled";
-
-        private bool? _enabled;
-        
-        [ConfigurationProperty("", IsKey = false, IsRequired = false, IsDefaultCollection = true)]
-		public ExtensionElementCollection Items
-		{
-			get { return (ExtensionElementCollection)base[""]; }
-		}
-
-        /// <summary>
-        /// Gets or sets a value indicating whether base rest extensions are enabled.
-        /// </summary>
-        [ConfigurationProperty(KeyEnabled, DefaultValue = true, IsRequired = false)]
-        public bool Enabled
-        {
-            get
-            {
-                return _enabled ?? (IsPresent == false || (bool)this[KeyEnabled]);
-            }
-            internal set { _enabled = value; }
-        }
-
-        IExtensionsCollection IBaseRestSection.Items
-        {
-            get { return Items; }
-        }
-
-    }
-}
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+
+    internal class BaseRestSection : UmbracoConfigurationSection, IBaseRestSection
+    {
+        private const string KeyEnabled = "enabled";
+
+        private bool? _enabled;
+        
+        [ConfigurationProperty("", IsKey = false, IsRequired = false, IsDefaultCollection = true)]
+		public ExtensionElementCollection Items
+		{
+			get { return (ExtensionElementCollection)base[""]; }
+		}
+
+        /// <summary>
+        /// Gets or sets a value indicating whether base rest extensions are enabled.
+        /// </summary>
+        [ConfigurationProperty(KeyEnabled, DefaultValue = true, IsRequired = false)]
+        public bool Enabled
+        {
+            get
+            {
+                return _enabled ?? (IsPresent == false || (bool)this[KeyEnabled]);
+            }
+            internal set { _enabled = value; }
+        }
+
+        IExtensionsCollection IBaseRestSection.Items
+        {
+            get { return Items; }
+        }
+
+    }
+}

src/Umbraco.Core/Configuration/BaseRest/ExtensionElement.cs

@@ -1,81 +1,81 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-
-    [ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
-    internal class ExtensionElement : ConfigurationElementCollection, IEnumerable<IMethodSection>, IExtension
-    {
-		const string KeyAlias = "alias";
-		const string KeyType = "type";
-		const string KeyMethod = "method";
-
-		[ConfigurationProperty(KeyAlias, IsKey = true, IsRequired = true)]
-		public string Alias
-		{
-			get { return (string)base[KeyAlias]; }
-		}
-
-		[ConfigurationProperty(KeyType, IsKey = false, IsRequired = true)]
-		public string Type
-		{
-			get { return (string)base[KeyType]; }
-		}
-
-		public override ConfigurationElementCollectionType CollectionType
-		{
-			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
-		}
-
-		protected override string ElementName
-		{
-			get { return KeyMethod; }
-		}
-
-		protected override bool IsElementName(string elementName)
-		{
-			return elementName.Equals(KeyMethod, StringComparison.InvariantCultureIgnoreCase);
-		}
-
-		protected override ConfigurationElement CreateNewElement()
-		{
-			return new MethodElement();
-		}
-
-		protected override object GetElementKey(ConfigurationElement element)
-		{
-			return ((MethodElement)element).Name;
-		}
-
-		public override bool IsReadOnly()
-		{
-			return false;
-		}
-
-		new public MethodElement this[string index]
-		{
-			get { return (MethodElement)BaseGet(index); }
-		}
-
-        IEnumerator<IMethodSection> IEnumerable<IMethodSection>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IMethodSection;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        IMethodSection IExtension.this[string index]
-        {
-            get { return this[index]; }
-        }
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+
+    [ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
+    internal class ExtensionElement : ConfigurationElementCollection, IEnumerable<IMethodSection>, IExtension
+    {
+		const string KeyAlias = "alias";
+		const string KeyType = "type";
+		const string KeyMethod = "method";
+
+		[ConfigurationProperty(KeyAlias, IsKey = true, IsRequired = true)]
+		public string Alias
+		{
+			get { return (string)base[KeyAlias]; }
+		}
+
+		[ConfigurationProperty(KeyType, IsKey = false, IsRequired = true)]
+		public string Type
+		{
+			get { return (string)base[KeyType]; }
+		}
+
+		public override ConfigurationElementCollectionType CollectionType
+		{
+			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
+		}
+
+		protected override string ElementName
+		{
+			get { return KeyMethod; }
+		}
+
+		protected override bool IsElementName(string elementName)
+		{
+			return elementName.Equals(KeyMethod, StringComparison.InvariantCultureIgnoreCase);
+		}
+
+		protected override ConfigurationElement CreateNewElement()
+		{
+			return new MethodElement();
+		}
+
+		protected override object GetElementKey(ConfigurationElement element)
+		{
+			return ((MethodElement)element).Name;
+		}
+
+		public override bool IsReadOnly()
+		{
+			return false;
+		}
+
+		new public MethodElement this[string index]
+		{
+			get { return (MethodElement)BaseGet(index); }
+		}
+
+        IEnumerator<IMethodSection> IEnumerable<IMethodSection>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IMethodSection;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IMethodSection IExtension.this[string index]
+        {
+            get { return this[index]; }
+        }
+
+    }
+}

src/Umbraco.Core/Configuration/BaseRest/ExtensionElementCollection.cs

@@ -1,70 +1,70 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IExtensionsCollection : IEnumerable<IExtension>
-    {
-        IExtension this[string index] { get; }
-    }
-
-	[ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
-    internal class ExtensionElementCollection : ConfigurationElementCollection, IExtensionsCollection
-	{
-		const string KeyExtension = "extension";
-
-		public override ConfigurationElementCollectionType CollectionType
-		{
-			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
-		}
-
-		protected override string ElementName
-		{
-			get { return KeyExtension; }
-		}
-
-		protected override bool IsElementName(string elementName)
-		{
-			return elementName.Equals(KeyExtension, StringComparison.InvariantCultureIgnoreCase);
-		}
-
-		protected override ConfigurationElement CreateNewElement()
-		{
-			return new ExtensionElement();
-		}
-
-		protected override object GetElementKey(ConfigurationElement element)
-		{
-			return ((ExtensionElement)element).Alias;
-		}
-
-		public override bool IsReadOnly()
-		{
-			return false;
-		}
-
-		new public ExtensionElement this[string index]
-		{
-			get { return (ExtensionElement)BaseGet(index); }
-		}
-
-        IEnumerator<IExtension> IEnumerable<IExtension>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IExtension;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        IExtension IExtensionsCollection.this[string index]
-        {
-            get { return this[index]; }
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IExtensionsCollection : IEnumerable<IExtension>
+    {
+        IExtension this[string index] { get; }
+    }
+
+	[ConfigurationCollection(typeof(ExtensionElement), CollectionType = ConfigurationElementCollectionType.BasicMapAlternate)]
+    internal class ExtensionElementCollection : ConfigurationElementCollection, IExtensionsCollection
+	{
+		const string KeyExtension = "extension";
+
+		public override ConfigurationElementCollectionType CollectionType
+		{
+			get { return ConfigurationElementCollectionType.BasicMapAlternate; }
+		}
+
+		protected override string ElementName
+		{
+			get { return KeyExtension; }
+		}
+
+		protected override bool IsElementName(string elementName)
+		{
+			return elementName.Equals(KeyExtension, StringComparison.InvariantCultureIgnoreCase);
+		}
+
+		protected override ConfigurationElement CreateNewElement()
+		{
+			return new ExtensionElement();
+		}
+
+		protected override object GetElementKey(ConfigurationElement element)
+		{
+			return ((ExtensionElement)element).Alias;
+		}
+
+		public override bool IsReadOnly()
+		{
+			return false;
+		}
+
+		new public ExtensionElement this[string index]
+		{
+			get { return (ExtensionElement)BaseGet(index); }
+		}
+
+        IEnumerator<IExtension> IEnumerable<IExtension>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IExtension;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+
+        IExtension IExtensionsCollection.this[string index]
+        {
+            get { return this[index]; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/BaseRest/IBaseRestSection.cs

@@ -1,14 +1,14 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IBaseRestSection
-    {
-        IExtensionsCollection Items { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether base rest extensions are enabled.
-        /// </summary>
-        bool Enabled { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IBaseRestSection
+    {
+        IExtensionsCollection Items { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether base rest extensions are enabled.
+        /// </summary>
+        bool Enabled { get; }
+    }
 }

src/Umbraco.Core/Configuration/BaseRest/IExtension.cs

@@ -1,11 +1,11 @@
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IExtension
-    {
-        string Alias { get; }
-
-        string Type { get; }
-
-        IMethodSection this[string index] { get; }
-    }
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IExtension
+    {
+        string Alias { get; }
+
+        string Type { get; }
+
+        IMethodSection this[string index] { get; }
+    }
 }

src/Umbraco.Core/Configuration/BaseRest/IMethodSection.cs

@@ -1,17 +1,17 @@
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    public interface IMethodSection
-    {
-        string Name { get; }
-
-        bool AllowAll { get; }
-
-        string AllowGroup { get; }
-
-        string AllowType { get; }
-
-        string AllowMember { get; }
-
-        bool ReturnXml { get; }
-    }
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    public interface IMethodSection
+    {
+        string Name { get; }
+
+        bool AllowAll { get; }
+
+        string AllowGroup { get; }
+
+        string AllowType { get; }
+
+        string AllowMember { get; }
+
+        bool ReturnXml { get; }
+    }
 }

src/Umbraco.Core/Configuration/BaseRest/MethodElement.cs

@@ -1,50 +1,50 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.BaseRest
-{
-    internal class MethodElement : ConfigurationElement, IMethodSection
-    {
-		const string KeyName = "name";
-		const string KeyAllowAll = "allowAll";
-		const string KeyAllowGroup = "allowGroup";
-		const string KeyAllowType = "allowType";
-		const string KeyAllowMember = "allowMember";
-		const string KeyReturnXml = "returnXml";
-
-		[ConfigurationProperty(KeyName, IsKey = true, IsRequired = true)]
-		public string Name
-		{
-			get { return (string)base[KeyName]; }
-		}
-
-		[ConfigurationProperty(KeyAllowAll, IsKey = false, IsRequired = false, DefaultValue = false)]
-		public bool AllowAll
-		{
-			get { return (bool)base[KeyAllowAll]; }
-		}
-
-		[ConfigurationProperty(KeyAllowGroup, IsKey = false, IsRequired = false, DefaultValue = null)]
-		public string AllowGroup
-		{
-			get { return (string)base[KeyAllowGroup]; }
-		}
-
-		[ConfigurationProperty(KeyAllowType, IsKey = false, IsRequired = false, DefaultValue = null)]
-		public string AllowType
-		{
-			get { return (string)base[KeyAllowType]; }
-		}
-
-		[ConfigurationProperty(KeyAllowMember, IsKey = false, IsRequired = false, DefaultValue = null)]
-		public string AllowMember
-		{
-			get { return (string)base[KeyAllowMember]; }
-		}
-
-		[ConfigurationProperty(KeyReturnXml, IsKey = false, IsRequired = false, DefaultValue = true)]
-		public bool ReturnXml
-		{
-			get { return (bool)base[KeyReturnXml]; }
-		}
-	}
-}
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.BaseRest
+{
+    internal class MethodElement : ConfigurationElement, IMethodSection
+    {
+		const string KeyName = "name";
+		const string KeyAllowAll = "allowAll";
+		const string KeyAllowGroup = "allowGroup";
+		const string KeyAllowType = "allowType";
+		const string KeyAllowMember = "allowMember";
+		const string KeyReturnXml = "returnXml";
+
+		[ConfigurationProperty(KeyName, IsKey = true, IsRequired = true)]
+		public string Name
+		{
+			get { return (string)base[KeyName]; }
+		}
+
+		[ConfigurationProperty(KeyAllowAll, IsKey = false, IsRequired = false, DefaultValue = false)]
+		public bool AllowAll
+		{
+			get { return (bool)base[KeyAllowAll]; }
+		}
+
+		[ConfigurationProperty(KeyAllowGroup, IsKey = false, IsRequired = false, DefaultValue = null)]
+		public string AllowGroup
+		{
+			get { return (string)base[KeyAllowGroup]; }
+		}
+
+		[ConfigurationProperty(KeyAllowType, IsKey = false, IsRequired = false, DefaultValue = null)]
+		public string AllowType
+		{
+			get { return (string)base[KeyAllowType]; }
+		}
+
+		[ConfigurationProperty(KeyAllowMember, IsKey = false, IsRequired = false, DefaultValue = null)]
+		public string AllowMember
+		{
+			get { return (string)base[KeyAllowMember]; }
+		}
+
+		[ConfigurationProperty(KeyReturnXml, IsKey = false, IsRequired = false, DefaultValue = true)]
+		public bool ReturnXml
+		{
+			get { return (bool)base[KeyReturnXml]; }
+		}
+	}
+}

src/Umbraco.Core/Configuration/CommaDelimitedConfigurationElement.cs

@@ -1,70 +1,70 @@
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// Defines a configuration section that contains inner text that is comma delimited
-    /// </summary>
-    internal class CommaDelimitedConfigurationElement : InnerTextConfigurationElement<CommaDelimitedStringCollection>, IEnumerable<string>
-    {
-        public override CommaDelimitedStringCollection Value
-        {
-            get 
-            { 
-                var converter = new CommaDelimitedStringCollectionConverter();
-                return (CommaDelimitedStringCollection) converter.ConvertFrom(RawValue);
-            }
-        }
-
-        IEnumerator<string> IEnumerable<string>.GetEnumerator()
-        {
-            return new InnerEnumerator(Value.GetEnumerator());
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return new InnerEnumerator(Value.GetEnumerator());
-        }
-
-        /// <summary>
-        /// A wrapper for StringEnumerator since it doesn't explicitly implement IEnumerable
-        /// </summary>
-        private class InnerEnumerator : IEnumerator<string>
-        {
-            private readonly StringEnumerator _stringEnumerator;
-
-            public InnerEnumerator(StringEnumerator stringEnumerator)
-            {
-                _stringEnumerator = stringEnumerator;
-            }
-
-            public bool MoveNext()
-            {
-                return _stringEnumerator.MoveNext();
-            }
-
-            public void Reset()
-            {
-                _stringEnumerator.Reset();
-            }
-
-            string IEnumerator<string>.Current
-            {
-                get { return _stringEnumerator.Current; }
-            }
-
-            public object Current
-            {
-                get { return _stringEnumerator.Current; }
-            }
-
-            public void Dispose()
-            {
-                UmbracoSettings.ObjectExtensions.DisposeIfDisposable(_stringEnumerator);
-            }
-        }
-    }
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// Defines a configuration section that contains inner text that is comma delimited
+    /// </summary>
+    internal class CommaDelimitedConfigurationElement : InnerTextConfigurationElement<CommaDelimitedStringCollection>, IEnumerable<string>
+    {
+        public override CommaDelimitedStringCollection Value
+        {
+            get 
+            { 
+                var converter = new CommaDelimitedStringCollectionConverter();
+                return (CommaDelimitedStringCollection) converter.ConvertFrom(RawValue);
+            }
+        }
+
+        IEnumerator<string> IEnumerable<string>.GetEnumerator()
+        {
+            return new InnerEnumerator(Value.GetEnumerator());
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return new InnerEnumerator(Value.GetEnumerator());
+        }
+
+        /// <summary>
+        /// A wrapper for StringEnumerator since it doesn't explicitly implement IEnumerable
+        /// </summary>
+        private class InnerEnumerator : IEnumerator<string>
+        {
+            private readonly StringEnumerator _stringEnumerator;
+
+            public InnerEnumerator(StringEnumerator stringEnumerator)
+            {
+                _stringEnumerator = stringEnumerator;
+            }
+
+            public bool MoveNext()
+            {
+                return _stringEnumerator.MoveNext();
+            }
+
+            public void Reset()
+            {
+                _stringEnumerator.Reset();
+            }
+
+            string IEnumerator<string>.Current
+            {
+                get { return _stringEnumerator.Current; }
+            }
+
+            public object Current
+            {
+                get { return _stringEnumerator.Current; }
+            }
+
+            public void Dispose()
+            {
+                ObjectExtensions.DisposeIfDisposable(_stringEnumerator);
+            }
+        }
+    }
 }

src/Umbraco.Core/Configuration/ConfigurationKeyAttribute.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Umbraco.Core.Configuration
-{
-	/// <summary>
-	/// Indicates the configuration key for a section or a group.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
-	public sealed class ConfigurationKeyAttribute : Attribute
-	{
-	    /// <summary>
-	    /// Initializes a new instance of the <see cref="ConfigurationKeyAttribute"/> class with a configuration key.
-	    /// </summary>
-	    /// <param name="configurationKey">The configurationkey.</param>
-	    public ConfigurationKeyAttribute(string configurationKey)
-	    {
-	        ConfigurationKey = configurationKey;
-	    }
-
-        /// <summary>
-        /// Gets or sets the configuration key.
-        /// </summary>
-        public string ConfigurationKey { get; private set; }
-	}
-}

src/Umbraco.Core/Configuration/Dashboard/AccessElement.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AccessElement : RawXmlConfigurationElement, IAccess
+    {
+        public AccessElement()
+        {
+            
+        }
+
+        public AccessElement(XElement rawXml)
+            :base(rawXml)
+        {
+        }
+
+        public IEnumerable<IAccessItem> Rules
+        {
+            get
+            {
+                var result = new List<AccessItem>();
+                if (RawXml != null)
+                {
+                    result.AddRange(RawXml.Elements("deny").Select(x => new AccessItem {Action = AccessType.Deny, Value = x.Value }));
+                    result.AddRange(RawXml.Elements("grant").Select(x => new AccessItem { Action = AccessType.Grant, Value = x.Value }));
+                    result.AddRange(RawXml.Elements("grantBySection").Select(x => new AccessItem { Action = AccessType.GrantBySection, Value = x.Value }));
+                }
+                return result;
+            }
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/AccessItem.cs

@@ -0,0 +1,15 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AccessItem : IAccessItem
+    {
+        /// <summary>
+        /// This can be grant, deny or grantBySection
+        /// </summary>
+        public AccessType Action { get; set; }
+        
+        /// <summary>
+        /// The value of the action
+        /// </summary>
+        public string Value { get; set; }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/AccessType.cs

@@ -0,0 +1,9 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public enum AccessType
+    {
+        Grant,
+        Deny,
+        GrantBySection
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/AreaCollection.cs

@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreaCollection : ConfigurationElementCollection, IEnumerable<IArea>
+    {
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new AreaElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((AreaElement) element).Value;
+        }
+
+        IEnumerator<IArea> IEnumerable<IArea>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IArea;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/AreaElement.cs

@@ -0,0 +1,12 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreaElement : InnerTextConfigurationElement<string>, IArea
+    {
+        string IArea.AreaName
+        {
+            get { return Value; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/AreasElement.cs

@@ -0,0 +1,15 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class AreasElement : ConfigurationElement
+    {
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "area")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public AreaCollection AreaCollection
+        {
+            get { return (AreaCollection)base[""]; }
+            set { base[""] = value; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/ControlCollection.cs

@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class ControlCollection : ConfigurationElementCollection, IEnumerable<IDashboardControl>
+    {
+        internal void Add(ControlElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new ControlElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((ControlElement)element).ControlPath;
+        }
+
+        IEnumerator<IDashboardControl> IEnumerable<IDashboardControl>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IDashboardControl;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/ControlElement.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Configuration;
+using System.Linq;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    
+    internal class ControlElement : RawXmlConfigurationElement, IDashboardControl
+    {
+        public bool ShowOnce
+        {
+            get
+            {
+                return RawXml.Attribute("showOnce") == null
+                           ? false
+                           : bool.Parse(RawXml.Attribute("showOnce").Value);
+            }
+        }
+
+        public bool AddPanel
+        {
+            get
+            {
+                return RawXml.Attribute("addPanel") == null
+                           ? true
+                           : bool.Parse(RawXml.Attribute("addPanel").Value);
+            }
+        }
+
+        public string PanelCaption
+        {
+            get
+            {
+                return RawXml.Attribute("panelCaption") == null
+                           ? ""
+                           : RawXml.Attribute("panelCaption").Value;
+            }
+        }
+
+        public AccessElement Access
+        {
+            get
+            {
+                var access = RawXml.Element("access");
+                if (access == null)
+                {
+                    return new AccessElement();
+                }
+                return new AccessElement(access);
+            }
+        }
+
+        public string ControlPath 
+        { 
+            get
+            {
+                //we need to return the first (and only) text element of the children (wtf... who designed this configuration ! :P )
+                var txt = RawXml.Nodes().OfType<XText>().FirstOrDefault();
+                if (txt == null)
+                {
+                    throw new ConfigurationErrorsException("The control element must contain a text node indicating the control path");
+                }
+                return txt.Value.Trim();
+            }
+        }
+
+
+        IAccess IDashboardControl.AccessRights
+        {
+            get { return Access; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/DashboardSection.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class DashboardSection : ConfigurationSection, IDashboardSection
+    {
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "section")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public SectionCollection SectionCollection
+        {
+            get { return (SectionCollection)base[""]; }
+            set { base[""] = value; }
+        }
+
+        IEnumerable<ISection> IDashboardSection.Sections
+        {
+            get { return SectionCollection; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/IAccess.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IAccess
+    {
+        IEnumerable<IAccessItem> Rules { get; }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/IAccessItem.cs

@@ -0,0 +1,15 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IAccessItem
+    {
+        /// <summary>
+        /// This can be grant, deny or grantBySection
+        /// </summary>
+        AccessType Action { get; set; }
+
+        /// <summary>
+        /// The value of the action
+        /// </summary>
+        string Value { get; set; }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/IArea.cs

@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IArea
+    {
+        string AreaName { get; }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/IDashboardControl.cs

@@ -0,0 +1,15 @@
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardControl
+    {
+        bool ShowOnce { get; }
+
+        bool AddPanel { get; }
+
+        string PanelCaption { get; }
+
+        string ControlPath { get; }
+
+        IAccess AccessRights { get; }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/IDashboardSection.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardSection
+    {
+        IEnumerable<ISection> Sections { get; }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/IDashboardTab.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface IDashboardTab
+    {
+        string Caption { get; }
+
+        IEnumerable<IDashboardControl> Controls { get; }
+
+        IAccess AccessRights { get; }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/ISection.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    public interface ISection
+    {
+        string Alias { get; }
+
+        IEnumerable<string> Areas { get; }
+
+        IEnumerable<IDashboardTab> Tabs { get; }
+
+        IAccess AccessRights { get; }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/SectionCollection.cs

@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class SectionCollection : ConfigurationElementCollection, IEnumerable<ISection>
+    {
+        internal void Add(SectionElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new SectionElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((SectionElement)element).Alias;
+        }
+
+        IEnumerator<ISection> IEnumerable<ISection>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as ISection;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/SectionElement.cs

@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class SectionElement : ConfigurationElement, ISection
+    {
+        [ConfigurationProperty("alias", IsRequired = true)]
+        public string Alias
+        {
+            get { return (string) this["alias"]; }
+        }
+
+        [ConfigurationProperty("areas", IsRequired = true)]
+        public AreasElement Areas
+        {
+            get { return (AreasElement)this["areas"]; }
+        }
+        
+        [ConfigurationProperty("access")]
+        public AccessElement Access
+        {
+            get { return (AccessElement)this["access"]; }
+        }
+
+        [ConfigurationCollection(typeof(SectionCollection), AddItemName = "tab")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public TabCollection TabCollection
+        {
+            get { return (TabCollection)base[""]; }
+            set { base[""] = value; }
+        }
+
+        IEnumerable<IDashboardTab> ISection.Tabs
+        {
+            get { return TabCollection; }            
+        }
+
+        IEnumerable<string> ISection.Areas
+        {
+            get { return Areas.AreaCollection.Cast<AreaElement>().Select(x => x.Value); }
+        }
+
+        IAccess ISection.AccessRights
+        {
+            get { return Access; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/TabCollection.cs

@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class TabCollection : ConfigurationElementCollection, IEnumerable<IDashboardTab>
+    {
+        internal void Add(TabElement c)
+        {
+            BaseAdd(c);
+        }
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new TabElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((TabElement)element).Caption;
+        }
+
+        IEnumerator<IDashboardTab> IEnumerable<IDashboardTab>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IDashboardTab;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

src/Umbraco.Core/Configuration/Dashboard/TabElement.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.Dashboard
+{
+    internal class TabElement : ConfigurationElement, IDashboardTab
+    {
+        [ConfigurationProperty("caption", IsRequired = true)]
+        public string Caption
+        {
+            get { return (string)this["caption"]; }
+        }
+        
+        [ConfigurationProperty("access")]
+        public AccessElement Access
+        {
+            get { return (AccessElement)this["access"]; }
+        }
+
+        [ConfigurationCollection(typeof(ControlCollection), AddItemName = "control")]
+        [ConfigurationProperty("", IsDefaultCollection = true)]
+        public ControlCollection ControlCollection
+        {
+            get { return (ControlCollection)base[""]; }
+            set { base[""] = value; }
+        }
+        
+        IEnumerable<IDashboardControl> IDashboardTab.Controls
+        {
+            get { return ControlCollection; }            
+        }
+
+        IAccess IDashboardTab.AccessRights
+        {
+            get { return Access; }
+        }
+    }
+}

src/Umbraco.Core/Configuration/GlobalSettings.cs

@@ -179,7 +179,10 @@ namespace Umbraco.Core.Configuration
                 {
                     throw new InvalidOperationException("Cannot create an MVC Area path without the umbracoPath specified");
                 }
-			    return Path.TrimStart(SystemDirectories.Root).TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
+                var path = Path;
+                if (path.StartsWith(SystemDirectories.Root)) // beware of TrimStart, see U4-2518
+                    path = path.Substring(SystemDirectories.Root.Length);
+			    return path.TrimStart('~').TrimStart('/').Replace('/', '-').Trim().ToLower();
             }
         }
 
@@ -265,10 +268,10 @@ namespace Umbraco.Core.Configuration
         /// <param name="value">Value of the setting to be saved.</param>
         internal static void SaveSetting(string key, string value)
         {
-            var fileName = GetFullWebConfigFileName();
+            var fileName = IOHelper.MapPath(string.Format("{0}/appSettings.config", SystemDirectories.Config));
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
 
-            var appSettings = xml.Root.Descendants("appSettings").Single();
+            var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
 
             // Update appSetting if it exists, or else create a new appSetting for the given key and value
             var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);
@@ -287,10 +290,10 @@ namespace Umbraco.Core.Configuration
         /// <param name="key">Key of the setting to be removed.</param>
         internal static void RemoveSetting(string key)
         {
-            var fileName = GetFullWebConfigFileName();
+            var fileName = IOHelper.MapPath(string.Format("{0}/appSettings.config", SystemDirectories.Config));
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
 
-            var appSettings = xml.Root.Descendants("appSettings").Single();
+            var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
             var setting = appSettings.Descendants("add").FirstOrDefault(s => s.Attribute("key").Value == key);
 
             if (setting != null)
@@ -301,21 +304,6 @@ namespace Umbraco.Core.Configuration
             }
         }
 
-        private static string GetFullWebConfigFileName()
-        {
-            var webConfig = new WebConfigurationFileMap();
-            var vDir = FullpathToRoot;
-
-            foreach (VirtualDirectoryMapping v in webConfig.VirtualDirectories)
-            {
-                if (v.IsAppRoot)
-                    vDir = v.PhysicalDirectory;
-            }
-
-            var fileName = System.IO.Path.Combine(vDir, "web.config");
-            return fileName;
-        }
-
         /// <summary>
         /// Gets the full path to root.
         /// </summary>

src/Umbraco.Core/Configuration/InnerTextConfigurationElement.cs

@@ -1,69 +1,69 @@
-using System;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// A full config section is required for any full element and we have some elements that are defined like this:
-    /// {element}MyValue{/element} instead of as attribute values.
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class InnerTextConfigurationElement<T> : RawXmlConfigurationElement
-    {
-        public InnerTextConfigurationElement()
-        {
-        }
-
-        public InnerTextConfigurationElement(XElement rawXml) : base(rawXml)
-        {
-        }
-
-        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
-        {
-            base.DeserializeElement(reader, serializeCollectionKey);
-            //now validate and set the raw value
-            if (RawXml.HasElements)
-                throw new InvalidOperationException("An InnerTextConfigurationElement cannot contain any child elements, only attributes and a value");
-            RawValue = RawXml.Value;
-            
-            //RawValue = reader.ReadElementContentAsString();
-        }
-
-        public virtual T Value
-        {
-            get
-            {
-                var converted = UmbracoSettings.ObjectExtensions.TryConvertTo<T>(RawValue);
-                if (converted.Success == false)
-                    throw new InvalidCastException("Could not convert value " + RawValue + " to type " + typeof(T));
-                return converted.Result;
-            }
-        }
-
-        /// <summary>
-        /// Exposes the raw string value
-        /// </summary>
-        internal string RawValue { get; set; }
-
-        /// <summary>
-        /// Implicit operator so we don't need to use the 'Value' property explicitly
-        /// </summary>
-        /// <param name="m"></param>
-        /// <returns></returns>
-        public static implicit operator T(InnerTextConfigurationElement<T> m)
-        {
-            return m.Value;
-        }
-
-        /// <summary>
-        /// Return the string value of Value
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return string.Format("{0}", Value);
-        }
-
-    }
+using System;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// A full config section is required for any full element and we have some elements that are defined like this:
+    /// {element}MyValue{/element} instead of as attribute values.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class InnerTextConfigurationElement<T> : RawXmlConfigurationElement
+    {
+        public InnerTextConfigurationElement()
+        {
+        }
+
+        public InnerTextConfigurationElement(XElement rawXml) : base(rawXml)
+        {
+        }
+
+        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
+        {
+            base.DeserializeElement(reader, serializeCollectionKey);
+            //now validate and set the raw value
+            if (RawXml.HasElements)
+                throw new InvalidOperationException("An InnerTextConfigurationElement cannot contain any child elements, only attributes and a value");
+            RawValue = RawXml.Value.Trim();
+
+            //RawValue = reader.ReadElementContentAsString();
+        }
+
+        public virtual T Value
+        {
+            get
+            {
+                var converted = ObjectExtensions.TryConvertTo<T>(RawValue);
+                if (converted.Success == false)
+                    throw new InvalidCastException("Could not convert value " + RawValue + " to type " + typeof(T));
+                return converted.Result;
+            }
+        }
+
+        /// <summary>
+        /// Exposes the raw string value
+        /// </summary>
+        internal string RawValue { get; set; }
+
+        /// <summary>
+        /// Implicit operator so we don't need to use the 'Value' property explicitly
+        /// </summary>
+        /// <param name="m"></param>
+        /// <returns></returns>
+        public static implicit operator T(InnerTextConfigurationElement<T> m)
+        {
+            return m.Value;
+        }
+
+        /// <summary>
+        /// Return the string value of Value
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return string.Format("{0}", Value);
+        }
+
+    }
 }

src/Umbraco.Core/Configuration/OptionalCommaDelimitedConfigurationElement.cs

@@ -1,43 +1,43 @@
-using System.Configuration;
-using Umbraco.Core.Configuration.UmbracoSettings;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// Used for specifying default values for comma delimited config
-    /// </summary>
-    internal class OptionalCommaDelimitedConfigurationElement : CommaDelimitedConfigurationElement
-    {
-        private readonly CommaDelimitedConfigurationElement _wrapped;
-        private readonly string[] _defaultValue;
-
-        public OptionalCommaDelimitedConfigurationElement()
-        {            
-        }
-
-        public OptionalCommaDelimitedConfigurationElement(CommaDelimitedConfigurationElement wrapped, string[] defaultValue)
-        {
-            _wrapped = wrapped;
-            _defaultValue = defaultValue;
-        }
-
-        public override CommaDelimitedStringCollection Value
-        {
-            get
-            {
-                if (_wrapped == null)
-                {
-                    return base.Value;
-                }
-
-                if (string.IsNullOrEmpty(_wrapped.RawValue))
-                {
-                    var val = new CommaDelimitedStringCollection();
-                    val.AddRange(_defaultValue);
-                    return val;
-                }
-                return _wrapped.Value;
-            }
-        }
-    }
+using System.Configuration;
+using Umbraco.Core.Configuration.UmbracoSettings;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// Used for specifying default values for comma delimited config
+    /// </summary>
+    internal class OptionalCommaDelimitedConfigurationElement : CommaDelimitedConfigurationElement
+    {
+        private readonly CommaDelimitedConfigurationElement _wrapped;
+        private readonly string[] _defaultValue;
+
+        public OptionalCommaDelimitedConfigurationElement()
+        {            
+        }
+
+        public OptionalCommaDelimitedConfigurationElement(CommaDelimitedConfigurationElement wrapped, string[] defaultValue)
+        {
+            _wrapped = wrapped;
+            _defaultValue = defaultValue;
+        }
+
+        public override CommaDelimitedStringCollection Value
+        {
+            get
+            {
+                if (_wrapped == null)
+                {
+                    return base.Value;
+                }
+
+                if (string.IsNullOrEmpty(_wrapped.RawValue))
+                {
+                    var val = new CommaDelimitedStringCollection();
+                    val.AddRange(_defaultValue);
+                    return val;
+                }
+                return _wrapped.Value;
+            }
+        }
+    }
 }

src/Umbraco.Core/Configuration/OptionalInnerTextConfigurationElement.cs

@@ -1,23 +1,23 @@
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// This is used to supply optional/default values when using InnerTextConfigurationElement
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    internal class OptionalInnerTextConfigurationElement<T> : InnerTextConfigurationElement<T>
-    {
-        private readonly InnerTextConfigurationElement<T> _wrapped;
-        private readonly T _defaultValue;
-
-        public OptionalInnerTextConfigurationElement(InnerTextConfigurationElement<T> wrapped, T defaultValue)
-        {
-            _wrapped = wrapped;
-            _defaultValue = defaultValue;
-        }
-
-        public override T Value
-        {
-            get { return string.IsNullOrEmpty(_wrapped.RawValue) ? _defaultValue : _wrapped.Value; }
-        }
-    }
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// This is used to supply optional/default values when using InnerTextConfigurationElement
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    internal class OptionalInnerTextConfigurationElement<T> : InnerTextConfigurationElement<T>
+    {
+        private readonly InnerTextConfigurationElement<T> _wrapped;
+        private readonly T _defaultValue;
+
+        public OptionalInnerTextConfigurationElement(InnerTextConfigurationElement<T> wrapped, T defaultValue)
+        {
+            _wrapped = wrapped;
+            _defaultValue = defaultValue;
+        }
+
+        public override T Value
+        {
+            get { return string.IsNullOrEmpty(_wrapped.RawValue) ? _defaultValue : _wrapped.Value; }
+        }
+    }
 }

src/Umbraco.Core/Configuration/RawXmlConfigurationElement.cs

@@ -1,30 +1,30 @@
-using System.Configuration;
-using System.Xml;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// A configuration section that simply exposes the entire raw xml of the section itself which inheritors can use
-    /// to do with as they please.
-    /// </summary>
-    internal abstract class RawXmlConfigurationElement : ConfigurationElement
-    {
-        protected RawXmlConfigurationElement()
-        {
-            
-        }
-
-        protected RawXmlConfigurationElement(XElement rawXml)
-        {
-            RawXml = rawXml;
-        }
-
-        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
-        {
-            RawXml = (XElement)XNode.ReadFrom(reader);
-        }
-
-        protected XElement RawXml { get; private set; }
-    }
+using System.Configuration;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// A configuration section that simply exposes the entire raw xml of the section itself which inheritors can use
+    /// to do with as they please.
+    /// </summary>
+    internal abstract class RawXmlConfigurationElement : ConfigurationElement
+    {
+        protected RawXmlConfigurationElement()
+        {
+            
+        }
+
+        protected RawXmlConfigurationElement(XElement rawXml)
+        {
+            RawXml = rawXml;
+        }
+
+        protected override void DeserializeElement(XmlReader reader, bool serializeCollectionKey)
+        {
+            RawXml = (XElement)XNode.ReadFrom(reader);
+        }
+
+        protected XElement RawXml { get; private set; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoConfig.cs

@@ -1,100 +1,127 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Threading;
-using Umbraco.Core.Configuration.BaseRest;
-using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.Logging;
-
-namespace Umbraco.Core.Configuration
-{
-    /// <summary>
-    /// The gateway to all umbraco configuration
-    /// </summary>
-    public class UmbracoConfig
-    {
-        #region Singleton
-
-        private static readonly Lazy<UmbracoConfig> Lazy = new Lazy<UmbracoConfig>(() => new UmbracoConfig());
-
-        public static UmbracoConfig For
-        {
-            get { return Lazy.Value; }            
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Default constructor 
-        /// </summary>
-        private UmbracoConfig()
-        {
-            if (UmbracoSettings() == null)
-            {
-                var umbracoSettings = ConfigurationManager.GetSection("umbracoConfiguration/settings") as IUmbracoSettingsSection;
-                if (umbracoSettings == null)
-                {
-                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IUmbracoSettingsSection) + " from config file!");
-                }
-                SetUmbracoSettings(umbracoSettings);
-            }
-
-            if (BaseRestExtensions() == null)
-            {
-                var baseRestExtensions = ConfigurationManager.GetSection("umbracoConfiguration/BaseRestExtensions") as IBaseRestSection;
-                if (baseRestExtensions == null)
-                {
-                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IBaseRestSection) + " from config file!");
-                }
-                SetBaseRestExtensions(baseRestExtensions);
-            }
-        }
-
-        /// <summary>
-        /// Constructor - can be used for testing
-        /// </summary>
-        /// <param name="umbracoSettings"></param>
-        /// <param name="baseRestSettings"></param>
-        public UmbracoConfig(IUmbracoSettingsSection umbracoSettings, IBaseRestSection baseRestSettings)
-        {
-            SetUmbracoSettings(umbracoSettings);
-            SetBaseRestExtensions(baseRestSettings);
-        }
-
-        private IUmbracoSettingsSection _umbracoSettings;
-
-        //ONLY for unit testing
-        internal void SetUmbracoSettings(IUmbracoSettingsSection value)
-        {
-            _umbracoSettings = value;
-        }
-
-        /// <summary>
-        /// Gets the IUmbracoSettings
-        /// </summary>
-        public IUmbracoSettingsSection UmbracoSettings()
-        {
-            return _umbracoSettings;
-        }
-
-        private IBaseRestSection _baseRestExtensions;
-
-        //ONLY for unit testing
-        public void SetBaseRestExtensions(IBaseRestSection value)
-        {
-            _baseRestExtensions = value;
-        }
-
-        /// <summary>
-        /// Gets the IBaseRestSection
-        /// </summary>
-        public IBaseRestSection BaseRestExtensions()
-        {
-            return _baseRestExtensions;
-        }
-
-        //TODO: Add other configurations here !
-    }
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Linq;
+using System.Threading;
+using Umbraco.Core.Configuration.BaseRest;
+using Umbraco.Core.Configuration.Dashboard;
+using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Configuration
+{
+    /// <summary>
+    /// The gateway to all umbraco configuration
+    /// </summary>
+    public class UmbracoConfig
+    {
+        #region Singleton
+
+        private static readonly Lazy<UmbracoConfig> Lazy = new Lazy<UmbracoConfig>(() => new UmbracoConfig());
+
+        public static UmbracoConfig For
+        {
+            get { return Lazy.Value; }            
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Default constructor 
+        /// </summary>
+        private UmbracoConfig()
+        {
+            if (_umbracoSettings == null)
+            {
+                var umbracoSettings = ConfigurationManager.GetSection("umbracoConfiguration/settings") as IUmbracoSettingsSection;
+                if (umbracoSettings == null)
+                {
+                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IUmbracoSettingsSection) + " from config file!");
+                }
+                SetUmbracoSettings(umbracoSettings);
+            }
+
+            if (_baseRestExtensions == null)
+            {
+                var baseRestExtensions = ConfigurationManager.GetSection("umbracoConfiguration/BaseRestExtensions") as IBaseRestSection;
+                if (baseRestExtensions == null)
+                {
+                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IBaseRestSection) + " from config file!");
+                }
+                SetBaseRestExtensions(baseRestExtensions);
+            }
+
+            if (_dashboardSection == null)
+            {
+                var dashboardConfig = ConfigurationManager.GetSection("umbracoConfiguration/dashBoard") as IDashboardSection;
+                if (dashboardConfig == null)
+                {
+                    LogHelper.Warn<UmbracoConfig>("Could not load the " + typeof(IDashboardSection) + " from config file!");
+                }
+                SetDashboardSettings(dashboardConfig);
+            }
+        }
+
+        /// <summary>
+        /// Constructor - can be used for testing
+        /// </summary>
+        /// <param name="umbracoSettings"></param>
+        /// <param name="baseRestSettings"></param>
+        /// <param name="dashboardSettings"></param>
+        public UmbracoConfig(IUmbracoSettingsSection umbracoSettings, IBaseRestSection baseRestSettings, IDashboardSection dashboardSettings)
+        {
+            SetUmbracoSettings(umbracoSettings);
+            SetBaseRestExtensions(baseRestSettings);
+            SetDashboardSettings(dashboardSettings);
+        }
+
+        private IDashboardSection _dashboardSection;
+        private IUmbracoSettingsSection _umbracoSettings;
+        private IBaseRestSection _baseRestExtensions;
+
+        /// <summary>
+        /// Gets the IDashboardSection
+        /// </summary>
+        public IDashboardSection DashboardSettings()
+        {
+            return _dashboardSection;
+        }        
+
+        //ONLY for unit testing
+        internal void SetDashboardSettings(IDashboardSection value)
+        {
+            _dashboardSection = value;
+        }
+
+        //ONLY for unit testing
+        internal void SetUmbracoSettings(IUmbracoSettingsSection value)
+        {
+            _umbracoSettings = value;
+        }
+
+        /// <summary>
+        /// Gets the IUmbracoSettings
+        /// </summary>
+        public IUmbracoSettingsSection UmbracoSettings()
+        {
+            return _umbracoSettings;
+        }
+        
+        //ONLY for unit testing
+        public void SetBaseRestExtensions(IBaseRestSection value)
+        {
+            _baseRestExtensions = value;
+        }
+
+        /// <summary>
+        /// Gets the IBaseRestSection
+        /// </summary>
+        public IBaseRestSection BaseRestExtensions()
+        {
+            return _baseRestExtensions;
+        }
+
+        //TODO: Add other configurations here !
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs

@@ -1,9 +1,10 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    [ConfigurationKey("umbracoConfiguration/settings/content")]
+
     internal class ContentElement : ConfigurationElement, IContentSection
     {
         [ConfigurationProperty("imaging")]
@@ -217,6 +218,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             }
         }
 
+        [Obsolete("This is here so that if this config element exists we won't get a YSOD, it is not used whatsoever and will be removed in future versions")]
         [ConfigurationProperty("DocumentTypeIconList")]
         internal InnerTextConfigurationElement<IconPickerBehaviour> DocumentTypeIconList
         {
@@ -393,11 +395,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return MacroErrors; }
         }
 
-        IconPickerBehaviour IContentSection.IconPickerBehaviour
-        {
-            get { return DocumentTypeIconList; }
-        }
-
         IEnumerable<string> IContentSection.DisallowedUploadFiles
         {
             get { return DisallowedUploadFiles; }

src/Umbraco.Core/Configuration/UmbracoSettings/IChar.cs

@@ -1,8 +1,8 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IChar
-    {
-        string Char { get; }
-        string Replacement { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IChar
+    {
+        string Char { get; }
+        string Replacement { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IContentErrorPage.cs

@@ -1,8 +1,8 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IContentErrorPage
-    {
-        int ContentId { get; }
-        string Culture { get; set; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IContentErrorPage
+    {
+        int ContentId { get; }
+        string Culture { get; set; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs

@@ -1,65 +1,63 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IContentSection : IUmbracoConfigurationSection
-    {
-        string NotificationEmailAddress { get; }
-
-        bool DisableHtmlEmail { get; }
-
-        IEnumerable<string> ImageFileTypes { get; }
-
-        IEnumerable<string> ImageTagAllowedAttributes { get; }
-
-        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
-
-        string ScriptFolderPath { get; }
-
-        IEnumerable<string> ScriptFileTypes { get; }
-
-        bool ScriptEditorDisable { get; }
-
-        bool ResolveUrlsFromTextString { get; }
-
-        bool UploadAllowDirectories { get; }
-
-        IEnumerable<IContentErrorPage> Error404Collection { get; }
-
-        bool EnsureUniqueNaming { get; }
-
-        bool TidyEditorContent { get; }
-
-        string TidyCharEncoding { get; }
-
-        bool XmlCacheEnabled { get; }
-
-        bool ContinouslyUpdateXmlDiskCache { get; }
-
-        bool XmlContentCheckForDiskChanges { get; }
-
-        bool EnableSplashWhileLoading { get; }
-
-        string PropertyContextHelpOption { get; }
-
-        bool UseLegacyXmlSchema { get; }
-
-        bool ForceSafeAliases { get; }
-
-        string PreviewBadge { get; }
-
-        int UmbracoLibraryCacheDuration { get; }
-
-        MacroErrorBehaviour MacroErrorBehaviour { get; }
-
-        IconPickerBehaviour IconPickerBehaviour { get; }
-
-        IEnumerable<string> DisallowedUploadFiles { get; }
-
-        bool CloneXmlContent { get; }
-
-        bool GlobalPreviewStorageEnabled { get; }
-
-        string DefaultDocumentTypeProperty { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IContentSection : IUmbracoConfigurationSection
+    {
+        string NotificationEmailAddress { get; }
+
+        bool DisableHtmlEmail { get; }
+
+        IEnumerable<string> ImageFileTypes { get; }
+
+        IEnumerable<string> ImageTagAllowedAttributes { get; }
+
+        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
+
+        string ScriptFolderPath { get; }
+
+        IEnumerable<string> ScriptFileTypes { get; }
+
+        bool ScriptEditorDisable { get; }
+
+        bool ResolveUrlsFromTextString { get; }
+
+        bool UploadAllowDirectories { get; }
+
+        IEnumerable<IContentErrorPage> Error404Collection { get; }
+
+        bool EnsureUniqueNaming { get; }
+
+        bool TidyEditorContent { get; }
+
+        string TidyCharEncoding { get; }
+
+        bool XmlCacheEnabled { get; }
+
+        bool ContinouslyUpdateXmlDiskCache { get; }
+
+        bool XmlContentCheckForDiskChanges { get; }
+
+        bool EnableSplashWhileLoading { get; }
+
+        string PropertyContextHelpOption { get; }
+
+        bool UseLegacyXmlSchema { get; }
+
+        bool ForceSafeAliases { get; }
+
+        string PreviewBadge { get; }
+
+        int UmbracoLibraryCacheDuration { get; }
+
+        MacroErrorBehaviour MacroErrorBehaviour { get; }
+        
+        IEnumerable<string> DisallowedUploadFiles { get; }
+
+        bool CloneXmlContent { get; }
+
+        bool GlobalPreviewStorageEnabled { get; }
+
+        string DefaultDocumentTypeProperty { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IDeveloperSection.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IDeveloperSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IFileExtension> AppCodeFileExtensions { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IDeveloperSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<IFileExtension> AppCodeFileExtensions { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IDistributedCallSection.cs

@@ -1,13 +1,13 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IDistributedCallSection : IUmbracoConfigurationSection
-    {
-        bool Enabled { get; }
-
-        int UserId { get; }
-
-        IEnumerable<IServer> Servers { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IDistributedCallSection : IUmbracoConfigurationSection
+    {
+        bool Enabled { get; }
+
+        int UserId { get; }
+
+        IEnumerable<IServer> Servers { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IFileExtension.cs

@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IFileExtension
-    {
-        string Extension { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IFileExtension
+    {
+        string Extension { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IHelpSection.cs

@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IHelpSection : IUmbracoConfigurationSection
-    {
-        string DefaultUrl { get; }
-
-        IEnumerable<ILink> Links { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IHelpSection : IUmbracoConfigurationSection
+    {
+        string DefaultUrl { get; }
+
+        IEnumerable<ILink> Links { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IImagingAutoFillUploadField.cs

@@ -1,18 +1,18 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IImagingAutoFillUploadField
-    {
-        /// <summary>
-        /// Allow setting internally so we can create a default
-        /// </summary>
-        string Alias { get; }
-
-        string WidthFieldAlias { get; }
-
-        string HeightFieldAlias { get; }
-
-        string LengthFieldAlias { get; }
-
-        string ExtensionFieldAlias { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IImagingAutoFillUploadField
+    {
+        /// <summary>
+        /// Allow setting internally so we can create a default
+        /// </summary>
+        string Alias { get; }
+
+        string WidthFieldAlias { get; }
+
+        string HeightFieldAlias { get; }
+
+        string LengthFieldAlias { get; }
+
+        string ExtensionFieldAlias { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ILink.cs

@@ -1,15 +1,15 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILink
-    {
-        string Application { get; }
-
-        string ApplicationUrl { get; }
-
-        string Language { get; }
-
-        string UserType { get; }
-
-        string HelpUrl { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ILink
+    {
+        string Application { get; }
+
+        string ApplicationUrl { get; }
+
+        string Language { get; }
+
+        string UserType { get; }
+
+        string HelpUrl { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ILogType.cs

@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILogType
-    {
-        string LogTypeAlias { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ILogType
+    {
+        string LogTypeAlias { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ILoggingSection.cs

@@ -1,27 +1,27 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ILoggingSection : IUmbracoConfigurationSection
-    {
-        bool AutoCleanLogs { get; }
-
-        bool EnableLogging { get; }
-
-        bool EnableAsyncLogging { get; }
-
-        int CleaningMiliseconds { get; }
-
-        int MaxLogAge { get; }
-
-        IEnumerable<ILogType> DisabledLogTypes { get; }
-
-        string ExternalLoggerAssembly { get; }
-
-        string ExternalLoggerType { get; }
-
-        bool ExternalLoggerEnableAuditTrail { get; }
-
-        bool ExternalLoggerIsConfigured { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ILoggingSection : IUmbracoConfigurationSection
+    {
+        bool AutoCleanLogs { get; }
+
+        bool EnableLogging { get; }
+
+        bool EnableAsyncLogging { get; }
+
+        int CleaningMiliseconds { get; }
+
+        int MaxLogAge { get; }
+
+        IEnumerable<ILogType> DisabledLogTypes { get; }
+
+        string ExternalLoggerAssembly { get; }
+
+        string ExternalLoggerType { get; }
+
+        bool ExternalLoggerEnableAuditTrail { get; }
+
+        bool ExternalLoggerIsConfigured { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/INotDynamicXmlDocument.cs

@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface INotDynamicXmlDocument
-    {
-        string Element { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface INotDynamicXmlDocument
+    {
+        string Element { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IProvidersSection.cs

@@ -1,9 +1,9 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IProvidersSection : IUmbracoConfigurationSection
-    {        
-        string DefaultBackOfficeUserProvider { get; }
-    }
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IProvidersSection : IUmbracoConfigurationSection
+    {        
+        string DefaultBackOfficeUserProvider { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IRazorStaticMapping.cs

@@ -1,12 +1,12 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRazorStaticMapping
-    {
-        Guid DataTypeGuid { get; }
-        string NodeTypeAlias { get; }
-        string PropertyTypeAlias { get; }
-        string MappingName { get; }
-    }
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IRazorStaticMapping
+    {
+        Guid DataTypeGuid { get; }
+        string NodeTypeAlias { get; }
+        string PropertyTypeAlias { get; }
+        string MappingName { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IRepositoriesSection.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-
-    public interface IRepositoriesSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IRepository> Repositories { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+
+    public interface IRepositoriesSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<IRepository> Repositories { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IRepository.cs

@@ -1,13 +1,13 @@
-using System;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRepository
-    {
-        string Name { get; }
-        Guid Id { get;  }
-        string RepositoryUrl { get; }
-        string WebServiceUrl { get; }
-        bool HasCustomWebServiceUrl { get; }
-    }
+using System;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IRepository
+    {
+        string Name { get; }
+        Guid Id { get;  }
+        string RepositoryUrl { get; }
+        string WebServiceUrl { get; }
+        bool HasCustomWebServiceUrl { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IRequestHandlerSection.cs

@@ -1,15 +1,15 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IRequestHandlerSection : IUmbracoConfigurationSection
-    {
-        bool UseDomainPrefixes { get; }
-
-        bool AddTrailingSlash { get; }
-
-        bool RemoveDoubleDashes { get; }
-
-        IEnumerable<IChar> CharCollection { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IRequestHandlerSection : IUmbracoConfigurationSection
+    {
+        bool UseDomainPrefixes { get; }
+
+        bool AddTrailingSlash { get; }
+
+        bool RemoveDoubleDashes { get; }
+
+        IEnumerable<IChar> CharCollection { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTask.cs

@@ -1,13 +1,13 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScheduledTask
-    {
-        string Alias { get; }
-
-        bool Log { get; }
-
-        int Interval { get; }
-
-        string Url { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IScheduledTask
+    {
+        string Alias { get; }
+
+        bool Log { get; }
+
+        int Interval { get; }
+
+        string Url { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IScheduledTasksSection.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScheduledTasksSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<IScheduledTask> Tasks { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IScheduledTasksSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<IScheduledTask> Tasks { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IScriptingSection.cs

@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IScriptingSection : IUmbracoConfigurationSection
-    {
-        IEnumerable<INotDynamicXmlDocument> NotDynamicXmlDocumentElements { get; }
-
-        IEnumerable<IRazorStaticMapping> DataTypeModelStaticMappings { get; }
-    }
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IScriptingSection : IUmbracoConfigurationSection
+    {
+        IEnumerable<INotDynamicXmlDocument> NotDynamicXmlDocumentElements { get; }
+
+        IEnumerable<IRazorStaticMapping> DataTypeModelStaticMappings { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ISecuritySection.cs

@@ -1,13 +1,13 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ISecuritySection : IUmbracoConfigurationSection
-    {
-        bool KeepUserLoggedIn { get; }
-
-        bool HideDisabledUsersInBackoffice { get; }
-
-        string AuthCookieName { get; }
-
-        string AuthCookieDomain { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ISecuritySection : IUmbracoConfigurationSection
+    {
+        bool KeepUserLoggedIn { get; }
+
+        bool HideDisabledUsersInBackoffice { get; }
+
+        string AuthCookieName { get; }
+
+        string AuthCookieDomain { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IServer.cs

@@ -1,9 +1,9 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IServer
-    {
-        string ForcePortnumber { get; }
-        string ForceProtocol { get; }
-        string ServerAddress { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IServer
+    {
+        string ForcePortnumber { get; }
+        string ForceProtocol { get; }
+        string ServerAddress { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ITemplatesSection.cs

@@ -1,13 +1,13 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface ITemplatesSection : IUmbracoConfigurationSection
-    {
-        bool UseAspNetMasterPages { get; }
-
-        bool EnableSkinSupport { get; }
-
-        RenderingEngine DefaultRenderingEngine { get; }
-
-        bool EnableTemplateFolders { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ITemplatesSection : IUmbracoConfigurationSection
+    {
+        bool UseAspNetMasterPages { get; }
+
+        bool EnableSkinSupport { get; }
+
+        RenderingEngine DefaultRenderingEngine { get; }
+
+        bool EnableTemplateFolders { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IUmbracoSettingsSection.cs

@@ -1,33 +1,33 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
-    {
-        IContentSection Content { get; }
-
-        ISecuritySection Security { get; }
-
-        IRequestHandlerSection RequestHandler { get; }
-
-        ITemplatesSection Templates { get; }
-
-        IDeveloperSection Developer { get; }
-
-        IViewStateMoverModuleSection ViewStateMoverModule { get; }
-
-        ILoggingSection Logging { get; }
-
-        IScheduledTasksSection ScheduledTasks { get; }
-
-        IDistributedCallSection DistributedCall { get; }
-
-        IRepositoriesSection PackageRepositories { get; }
-
-        IProvidersSection Providers { get; }
-
-        IHelpSection Help { get; }
-
-        IWebRoutingSection WebRouting { get; }
-
-        IScriptingSection Scripting { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
+    {
+        IContentSection Content { get; }
+
+        ISecuritySection Security { get; }
+
+        IRequestHandlerSection RequestHandler { get; }
+
+        ITemplatesSection Templates { get; }
+
+        IDeveloperSection Developer { get; }
+
+        IViewStateMoverModuleSection ViewStateMoverModule { get; }
+
+        ILoggingSection Logging { get; }
+
+        IScheduledTasksSection ScheduledTasks { get; }
+
+        IDistributedCallSection DistributedCall { get; }
+
+        IRepositoriesSection PackageRepositories { get; }
+
+        IProvidersSection Providers { get; }
+
+        IHelpSection Help { get; }
+
+        IWebRoutingSection WebRouting { get; }
+
+        IScriptingSection Scripting { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IViewStateMoverModuleSection.cs

@@ -1,7 +1,7 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IViewStateMoverModuleSection : IUmbracoConfigurationSection
-    {
-        bool Enable { get; }
-    }
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IViewStateMoverModuleSection : IUmbracoConfigurationSection
+    {
+        bool Enable { get; }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/IWebRoutingSection.cs

@@ -1,12 +1,12 @@
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    public interface IWebRoutingSection : IUmbracoConfigurationSection
-    {
-        bool TrySkipIisCustomErrors { get; }
-
-        bool InternalRedirectPreservesTemplate { get; }
-
-        string UrlProviderMode { get; }
-    }
-
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IWebRoutingSection : IUmbracoConfigurationSection
+    {
+        bool TrySkipIisCustomErrors { get; }
+
+        bool InternalRedirectPreservesTemplate { get; }
+
+        string UrlProviderMode { get; }
+    }
+
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ImagingAutoFillPropertiesCollection.cs

@@ -1,37 +1,37 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ImagingAutoFillPropertiesCollection : ConfigurationElementCollection, IEnumerable<IImagingAutoFillUploadField>
-    {
-
-        protected override ConfigurationElement CreateNewElement()
-        {
-            return new ImagingAutoFillUploadFieldElement();
-        }
-
-        protected override object GetElementKey(ConfigurationElement element)
-        {
-            return ((ImagingAutoFillUploadFieldElement)element).Alias;
-        }
-        
-        internal void Add(ImagingAutoFillUploadFieldElement item)
-        {
-            BaseAdd(item);
-        }
-
-        IEnumerator<IImagingAutoFillUploadField> IEnumerable<IImagingAutoFillUploadField>.GetEnumerator()
-        {
-            for (var i = 0; i < Count; i++)
-            {
-                yield return BaseGet(i) as IImagingAutoFillUploadField;
-            }
-        }
-
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-    }
+using System.Collections.Generic;
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ImagingAutoFillPropertiesCollection : ConfigurationElementCollection, IEnumerable<IImagingAutoFillUploadField>
+    {
+
+        protected override ConfigurationElement CreateNewElement()
+        {
+            return new ImagingAutoFillUploadFieldElement();
+        }
+
+        protected override object GetElementKey(ConfigurationElement element)
+        {
+            return ((ImagingAutoFillUploadFieldElement)element).Alias;
+        }
+        
+        internal void Add(ImagingAutoFillUploadFieldElement item)
+        {
+            BaseAdd(item);
+        }
+
+        IEnumerator<IImagingAutoFillUploadField> IEnumerable<IImagingAutoFillUploadField>.GetEnumerator()
+        {
+            for (var i = 0; i < Count; i++)
+            {
+                yield return BaseGet(i) as IImagingAutoFillUploadField;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ImagingAutoFillUploadFieldElement.cs

@@ -1,91 +1,91 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-    internal class ImagingAutoFillUploadFieldElement : ConfigurationElement, IImagingAutoFillUploadField
-    {
-        /// <summary>
-        /// Allow setting internally so we can create a default
-        /// </summary>
-        [ConfigurationProperty("alias", IsKey = true, IsRequired = true)]
-        public string Alias
-        {
-            get { return (string)this["alias"]; }
-            set { this["alias"] = value; }
-        }
-
-        [ConfigurationProperty("widthFieldAlias")]
-        internal InnerTextConfigurationElement<string> WidthFieldAlias
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["widthFieldAlias"],
-                    //set the default
-                       "umbracoWidth");
-            }
-        }
-
-        [ConfigurationProperty("heightFieldAlias")]
-        internal InnerTextConfigurationElement<string> HeightFieldAlias
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["heightFieldAlias"],
-                    //set the default
-                       "umbracoHeight");
-            }
-        }
-
-        [ConfigurationProperty("lengthFieldAlias")]
-        internal InnerTextConfigurationElement<string> LengthFieldAlias
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["lengthFieldAlias"],
-                    //set the default
-                       "umbracoBytes");
-            }
-        }
-
-        [ConfigurationProperty("extensionFieldAlias")]
-        internal InnerTextConfigurationElement<string> ExtensionFieldAlias
-        {
-            get
-            {
-                return new OptionalInnerTextConfigurationElement<string>(
-                       (InnerTextConfigurationElement<string>)this["extensionFieldAlias"],
-                    //set the default
-                       "umbracoExtension");
-            }
-        }
-
-        string IImagingAutoFillUploadField.Alias
-        {
-            get { return Alias; }
-            
-        }
-
-        string IImagingAutoFillUploadField.WidthFieldAlias
-        {
-            get { return WidthFieldAlias; }
-        }
-
-        string IImagingAutoFillUploadField.HeightFieldAlias
-        {
-            get { return HeightFieldAlias; }
-        }
-
-        string IImagingAutoFillUploadField.LengthFieldAlias
-        {
-            get { return LengthFieldAlias; }
-        }
-
-        string IImagingAutoFillUploadField.ExtensionFieldAlias
-        {
-            get { return ExtensionFieldAlias; }
-        }
-    }
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class ImagingAutoFillUploadFieldElement : ConfigurationElement, IImagingAutoFillUploadField
+    {
+        /// <summary>
+        /// Allow setting internally so we can create a default
+        /// </summary>
+        [ConfigurationProperty("alias", IsKey = true, IsRequired = true)]
+        public string Alias
+        {
+            get { return (string)this["alias"]; }
+            set { this["alias"] = value; }
+        }
+
+        [ConfigurationProperty("widthFieldAlias")]
+        internal InnerTextConfigurationElement<string> WidthFieldAlias
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["widthFieldAlias"],
+                    //set the default
+                       "umbracoWidth");
+            }
+        }
+
+        [ConfigurationProperty("heightFieldAlias")]
+        internal InnerTextConfigurationElement<string> HeightFieldAlias
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["heightFieldAlias"],
+                    //set the default
+                       "umbracoHeight");
+            }
+        }
+
+        [ConfigurationProperty("lengthFieldAlias")]
+        internal InnerTextConfigurationElement<string> LengthFieldAlias
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["lengthFieldAlias"],
+                    //set the default
+                       "umbracoBytes");
+            }
+        }
+
+        [ConfigurationProperty("extensionFieldAlias")]
+        internal InnerTextConfigurationElement<string> ExtensionFieldAlias
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<string>(
+                       (InnerTextConfigurationElement<string>)this["extensionFieldAlias"],
+                    //set the default
+                       "umbracoExtension");
+            }
+        }
+
+        string IImagingAutoFillUploadField.Alias
+        {
+            get { return Alias; }
+            
+        }
+
+        string IImagingAutoFillUploadField.WidthFieldAlias
+        {
+            get { return WidthFieldAlias; }
+        }
+
+        string IImagingAutoFillUploadField.HeightFieldAlias
+        {
+            get { return HeightFieldAlias; }
+        }
+
+        string IImagingAutoFillUploadField.LengthFieldAlias
+        {
+            get { return LengthFieldAlias; }
+        }
+
+        string IImagingAutoFillUploadField.ExtensionFieldAlias
+        {
+            get { return ExtensionFieldAlias; }
+        }
+    }
 }

src/Umbraco.Core/Configuration/UmbracoSettings/ObjectExtensions.cs

@@ -1,210 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-
-namespace Umbraco.Core.Configuration.UmbracoSettings
-{
-   
-    internal static class ObjectExtensions
-    {
-
-        //private static readonly ConcurrentDictionary<Type, Func<object>> ObjectFactoryCache = new ConcurrentDictionary<Type, Func<object>>();
-
-        public static IEnumerable<T> AsEnumerableOfOne<T>(this T input)
-        {
-            return Enumerable.Repeat(input, 1);
-        }
-
-        public static void DisposeIfDisposable(this object input)
-        {
-            var disposable = input as IDisposable;
-            if (disposable != null) disposable.Dispose();
-        }
-
-        /// <summary>
-        /// Provides a shortcut way of safely casting an input when you cannot guarantee the <typeparam name="T"></typeparam> is an instance type (i.e., when the C# AS keyword is not applicable)
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="input">The input.</param>
-        /// <returns></returns>
-        public static T SafeCast<T>(this object input)
-        {
-            if (ReferenceEquals(null, input) || ReferenceEquals(default(T), input)) return default(T);
-            if (input is T) return (T)input;
-            return default(T);
-        }
-
-        /// <summary>
-        /// Tries to convert the input object to the output type using TypeConverters
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public static Attempt<T> TryConvertTo<T>(this object input)
-        {
-            var result = TryConvertTo(input, typeof(T));
-            if (!result.Success)
-            {
-                //just try a straight up conversion
-                try
-                {
-                    var converted = (T)input;
-                    return Attempt.Succeed(converted);
-                }
-                catch (Exception e)
-                {
-                    return Attempt<T>.Fail(e);
-                }
-            }
-            return !result.Success ? Attempt<T>.Fail() : Attempt.Succeed((T)result.Result);
-        }
-
-        /// <summary>
-        /// Tries to convert the input object to the output type using TypeConverters. If the destination type is a superclass of the input type,
-        /// if will use <see cref="Convert.ChangeType(object,System.Type)"/>.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <param name="destinationType">Type of the destination.</param>
-        /// <returns></returns>
-        public static Attempt<object> TryConvertTo(this object input, Type destinationType)
-        {
-            if (input == null) return Attempt<object>.Fail();
-
-            if (destinationType == typeof(object)) return Attempt.Succeed(input);
-
-            if (input.GetType() == destinationType) return Attempt.Succeed(input);
-
-            if (input is string && destinationType.IsEnum)
-            {
-                try
-                {
-                    var output = Enum.Parse(destinationType, (string)input, true);
-                    return Attempt.Succeed(output);
-                }
-                catch (Exception e)
-                {
-                    return Attempt<object>.Succeed(e);
-                }
-            }
-
-            if (!destinationType.IsGenericType || destinationType.GetGenericTypeDefinition() != typeof(Nullable<>))
-            {
-                //TODO: Do a check for destination type being IEnumerable<T> and source type implementing IEnumerable<T> with
-                // the same 'T', then we'd have to find the extension method for the type AsEnumerable() and execute it.
-
-                if (TypeHelper.IsTypeAssignableFrom(destinationType, input.GetType())
-                    && TypeHelper.IsTypeAssignableFrom<IConvertible>(input))
-                {
-                    try
-                    {
-                        var casted = Convert.ChangeType(input, destinationType);
-                        return Attempt<object>.Succeed(casted);
-                    }
-                    catch (Exception e)
-                    {
-                        return Attempt<object>.Fail(e);
-                    }
-                }
-            }
-
-            var inputConverter = TypeDescriptor.GetConverter(input);
-            if (inputConverter.CanConvertTo(destinationType))
-            {
-                try
-                {
-                    var converted = inputConverter.ConvertTo(input, destinationType);
-                    return Attempt<object>.Succeed(converted);
-                }
-                catch (Exception e)
-                {
-                    return Attempt<object>.Fail(e);
-                }
-            }
-
-            if (destinationType == typeof(bool))
-            {
-                var boolConverter = new CustomBooleanTypeConverter();
-                if (boolConverter.CanConvertFrom(input.GetType()))
-                {
-                    try
-                    {
-                        var converted = boolConverter.ConvertFrom(input);
-                        return Attempt<object>.Succeed(converted);
-                    }
-                    catch (Exception e)
-                    {
-                        return Attempt<object>.Fail(e);
-                    }
-                }
-            }
-
-            var outputConverter = TypeDescriptor.GetConverter(destinationType);
-            if (outputConverter.CanConvertFrom(input.GetType()))
-            {
-                try
-                {
-                    var converted = outputConverter.ConvertFrom(input);
-                    return Attempt<object>.Succeed(converted);
-                }
-                catch (Exception e)
-                {
-                    return Attempt<object>.Fail(e);
-                }
-            }
-
-
-            if (TypeHelper.IsTypeAssignableFrom<IConvertible>(input))
-            {
-                try
-                {
-                    var casted = Convert.ChangeType(input, destinationType);
-                    return Attempt<object>.Succeed(casted);
-                }
-                catch (Exception e)
-                {
-                    return Attempt<object>.Fail(e);
-                }
-            }
-
-            return Attempt<object>.Fail();
-        }
-
-        public static void CheckThrowObjectDisposed(this IDisposable disposable, bool isDisposed, string objectname)
-        {
-            //TODO: Localise this exception
-            if (isDisposed)
-                throw new ObjectDisposedException(objectname);
-        }
-
-        /// <summary>
-        /// Turns object into dictionary
-        /// </summary>
-        /// <param name="o"></param>
-        /// <param name="ignoreProperties">Properties to ignore</param>
-        /// <returns></returns>
-        public static IDictionary<string, TVal> ToDictionary<TVal>(this object o, params string[] ignoreProperties)
-        {
-            if (o != null)
-            {
-                var props = TypeDescriptor.GetProperties(o);
-                var d = new Dictionary<string, TVal>();
-                foreach (var prop in props.Cast<PropertyDescriptor>().Where(x => !ignoreProperties.Contains(x.Name)))
-                {
-                    var val = prop.GetValue(o);
-                    if (val != null)
-                    {
-                        d.Add(prop.Name, (TVal)val);
-                    }
-                }
-                return d;
-            }
-            return new Dictionary<string, TVal>();
-        }
-
-       
-
-        
-
-    }
-}

src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs

@@ -4,7 +4,7 @@ using System.Linq;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
-    [ConfigurationKey("umbracoConfiguration/settings")]
+
     public class UmbracoSettingsSection : ConfigurationSection, IUmbracoSettingsSection
     {
         [ConfigurationProperty("content")]

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -23,7 +23,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 "alpha"; } }
+        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-Applications.cs

@@ -53,6 +53,11 @@
             /// </summary>
             public const string Content = "content";
 
+            /// <summary>
+            /// alias for the media tree.
+            /// </summary>
+            public const string Members = "member";
+
             /// <summary>
             /// alias for the media tree.
             /// </summary>

src/Umbraco.Core/Constants-Conventions.cs

@@ -99,6 +99,15 @@ namespace Umbraco.Core
 		    /// </summary>
 		    public static class Member
 		    {
+                /// <summary>
+                /// if a role starts with __umbracoRole we won't show it as it's an internal role used for public access
+                /// </summary>
+                public static readonly string InternalRolePrefix = "__umbracoRole";
+
+                public static readonly string UmbracoMemberProviderName = "UmbracoMembershipProvider";
+
+                public static readonly string UmbracoRoleProviderName = "UmbracoRoleProvider";
+
                 /// <summary>
                 /// Property alias for a Members Password Question
                 /// </summary>

src/Umbraco.Core/Constants-Examine.cs

@@ -1,24 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core
-{
-    public static partial class Constants
-    {
-        public static class Examine
-        {
-            /// <summary>
-            /// The alias of the internal member searcher
-            /// </summary>
-            public const string InternalMemberSearcher = "InternalMemberSearcher";
-
-            /// <summary>
-            /// The alias of the internal content searcher
-            /// </summary>
-            public const string InternalSearcher = "InternalSearcher";
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core
+{
+    public static partial class Constants
+    {
+        public static class Examine
+        {
+            /// <summary>
+            /// The alias of the internal member searcher
+            /// </summary>
+            public const string InternalMemberSearcher = "InternalMemberSearcher";
+
+            /// <summary>
+            /// The alias of the internal content searcher
+            /// </summary>
+            public const string InternalSearcher = "InternalSearcher";
+        }
+    }
+}

src/Umbraco.Core/Constants-PropertyEditors.cs

@@ -74,12 +74,7 @@ namespace Umbraco.Core
             /// </summary>
             [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
             public const string DictionaryPicker = "17B70066-F764-407D-AB05-3717F1E1C513";
-
-            /// <summary>
-            /// Alias for the Dictionary Picker datatype.
-            /// </summary>
-            public const string DictionaryPickerAlias = "Umbraco.DictionaryPicker";
-
+            
             /// <summary>
             /// Guid for the Dropdown list datatype.
             /// </summary>
@@ -141,10 +136,10 @@ namespace Umbraco.Core
             [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
             public const string ImageCropper = "7A2D436C-34C2-410F-898F-4A23B3D79F54";
 
-            /// <summary>
-            /// Alias for the Image Cropper datatype.
-            /// </summary>
-            public const string ImageCropperAlias = "Umbraco.ImageCropper";
+            ///// <summary>
+            ///// Alias for the Image Cropper datatype.
+            ///// </summary>
+            //public const string ImageCropperAlias = "Umbraco.ImageCropper";
 
             /// <summary>
             /// Guid for the Integer datatype.
@@ -191,6 +186,8 @@ namespace Umbraco.Core
             /// </summary>
             public const string MediaPickerAlias = "Umbraco.MediaPicker";
 
+            public const string MultipleMediaPickerAlias = "Umbraco.MultipleMediaPicker";
+
             /// <summary>
             /// Guid for the Member Picker datatype.
             /// </summary>
@@ -202,6 +199,11 @@ namespace Umbraco.Core
             /// </summary>
             public const string MemberPickerAlias = "Umbraco.MemberPicker";
 
+            /// <summary>
+            /// Alias for the Member Group Picker datatype.
+            /// </summary>
+            public const string MemberGroupPickerAlias = "Umbraco.MemberGroupPicker";
+
             /// <summary>
             /// Guid for the Multi-Node Tree Picker datatype
             /// </summary>
@@ -319,9 +321,9 @@ namespace Umbraco.Core
             public const string TinyMCEv3 = "5E9B75AE-FACE-41C8-B47E-5F4B0FD82F83";
 
             /// <summary>
-            /// Alias for the TinyMCE v3 wysiwyg datatype.
+            /// Alias for the TinyMCE wysiwyg datatype.
             /// </summary>
-            public const string TinyMCEv3Alias = "Umbraco.TinyMCEv3";
+            public const string TinyMCEAlias = "Umbraco.TinyMCEv3";
 
             /// <summary>
             /// Guid for the True/False (Ja/Nej) datatype.
@@ -339,12 +341,7 @@ namespace Umbraco.Core
             /// </summary>
             [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
             public const string UltimatePicker = "CDBF0B5D-5CB2-445F-BC12-FCAAEC07CF2C";
-
-            /// <summary>
-            /// Alias for the Ultimate Picker datatype.
-            /// </summary>
-            public const string UltimatePickerAlias = "Umbraco.UltimatePicker";
-
+            
             /// <summary>
             /// Guid for the UltraSimpleEditor datatype.
             /// </summary>
@@ -352,21 +349,16 @@ namespace Umbraco.Core
             public const string UltraSimpleEditor = "60B7DABF-99CD-41EB-B8E9-4D2E669BBDE9";
 
             /// <summary>
-            /// Alias for the UltraSimpleEditor datatype.
+            /// Alias for the MarkdownEditor datatype.
             /// </summary>
-            public const string UltraSimpleEditorAlias = "Umbraco.UltraSimpleEditor";
+            public const string MarkdownEditorAlias = "Umbraco.MarkdownEditor";
 
             /// <summary>
             /// Guid for the Umbraco Usercontrol Wrapper datatype.
             /// </summary>
             [Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
             public const string UmbracoUserControlWrapper = "D15E1281-E456-4B24-AA86-1DDA3E4299D5";
-
-            /// <summary>
-            /// Alias for the Umbraco Usercontrol Wrapper datatype.
-            /// </summary>
-            public const string UmbracoUserControlWrapperAlias = "Umbraco.UmbracoUserControlWrapper";
-
+            
             /// <summary>
             /// Guid for the Upload field datatype.
             /// </summary>
@@ -411,6 +403,11 @@ namespace Umbraco.Core
             /// Alias for the XPath DropDownList datatype.
             /// </summary>
             public const string XPathDropDownListAlias = "Umbraco.XPathDropDownList";
+
+            /// <summary>
+            /// Alias for the email address property editor
+            /// </summary>
+            public const string EmailAddressAlias = "Umbraco.EmailAddress";
         }
 	}
 }

src/Umbraco.Core/CoreBootManager.cs

@@ -7,6 +7,7 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Mapping;
+using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Mappers;
@@ -17,6 +18,7 @@ using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Profiling;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.PropertyEditors.ValueConverters;
 using Umbraco.Core.Publishing;
 using Umbraco.Core.Macros;
 using Umbraco.Core.Services;
@@ -67,6 +69,7 @@ namespace Umbraco.Core
 
             //Create the legacy prop-eds mapping
             LegacyPropertyEditorIdToAliasConverter.CreateMappingsForCoreEditors();
+            LegacyParameterEditorAliasConverter.CreateMappingsForCoreEditors();
 
 			//create database and service contexts for the app context
 			var dbFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName);
@@ -308,25 +311,35 @@ namespace Umbraco.Core
             //the database migration objects
             MigrationResolver.Current = new MigrationResolver(
                 () => PluginManager.Current.ResolveMigrationTypes());
-            
-            //NOTE: These are legacy in v7+ and will eventually need to be removed.
-			PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
+
+            // todo: remove once we drop IPropertyEditorValueConverter support.
+            PropertyEditorValueConvertersResolver.Current = new PropertyEditorValueConvertersResolver(
 				PluginManager.Current.ResolvePropertyEditorValueConverters());
 
+			//add the internal ones, these are not public currently so need to add them manually
             PropertyValueConvertersResolver.Current = new PropertyValueConvertersResolver(
                 PluginManager.Current.ResolvePropertyValueConverters());
+				// fixme - why not use the following syntax?
+                //PluginManager.Current.ResolveTypes<IPropertyValueConverter>());
 
-            // this is how we'd switch over to DefaultShortStringHelper _and_ still use
-            // UmbracoSettings UrlReplaceCharacters...
-            //ShortStringHelperResolver.Current = new ShortStringHelperResolver(
-            //    new DefaultShortStringHelper().WithConfig(DefaultShortStringHelper.ApplyUrlReplaceCharacters));
-
-            // use the Legacy one for now
+            // use the new DefaultShortStringHelper but sort-of remain compatible
+            // - use UmbracoSettings UrlReplaceCharacters
+            // - allow underscores in terms, allow leading digits
             ShortStringHelperResolver.Current = new ShortStringHelperResolver(
-		        new LegacyShortStringHelper());
+                new DefaultShortStringHelper()
+                    .WithConfig(CleanStringType.Url, DefaultShortStringHelper.ApplyUrlReplaceCharacters, 
+                        allowUnderscoreInTerm: true, allowLeadingDigits: true));
+
+            // that was the old one
+            //ShortStringHelperResolver.Current = new ShortStringHelperResolver(
+            //    new LegacyShortStringHelper());
 
 		    UrlSegmentProviderResolver.Current = new UrlSegmentProviderResolver(
 		        typeof (DefaultUrlSegmentProvider));
+
+            // keep it internal for now
+		    PublishedContentModelFactoryResolver.Current = new PublishedContentModelFactoryResolver();
+		    //    new PublishedContentModelFactoryImpl());
 		}
 	}
 }

src/Umbraco.Core/CustomBooleanTypeConverter.cs

@@ -22,8 +22,8 @@ namespace Umbraco.Core
 			if (value is string)
 			{
 				var str = (string)value;
+				if (str == null || str.Length == 0 || str == "0") return false;
 				if (str == "1") return true;
-				if (str == "0" || str == "") return false;
 			}
 
 			return base.ConvertFrom(context, culture, value);

src/Umbraco.Core/DatabaseContext.cs

@@ -6,6 +6,7 @@ using System.Linq;
 using System.Web.Configuration;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations;
@@ -28,7 +29,7 @@ namespace Umbraco.Core
         private string _providerName;
         private DatabaseSchemaResult _result;
 
-        internal DatabaseContext(IDatabaseFactory factory)
+        public DatabaseContext(IDatabaseFactory factory)
         {
             _factory = factory;
         }
@@ -112,7 +113,7 @@ namespace Umbraco.Core
         public void ConfigureEmbeddedDatabaseConnection()
         {
             const string providerName = "System.Data.SqlServerCe.4.0";
-            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;File Access Retry Timeout=10";
+            const string connectionString = @"Data Source=|DataDirectory|\Umbraco.sdf;Flush Interval=1;";
 
             SaveConnectionString(connectionString, providerName);
 
@@ -248,20 +249,10 @@ namespace Umbraco.Core
 
             _connectionString = connectionString;
             _providerName = providerName;
-
-            var webConfig = new WebConfigurationFileMap();
-            var vDir = GlobalSettings.FullpathToRoot;
-            foreach (VirtualDirectoryMapping v in webConfig.VirtualDirectories)
-            {
-                if (v.IsAppRoot)
-                {
-                    vDir = v.PhysicalDirectory;
-                }
-            }
-
-            var fileName = Path.Combine(vDir, "web.config");
+            
+            var fileName = IOHelper.MapPath(string.Format("{0}/connectionStrings.config", SystemDirectories.Config));
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
-            var connectionstrings = xml.Root.Descendants("connectionStrings").Single();
+            var connectionstrings = xml.Root.DescendantsAndSelf("connectionStrings").Single();
 
             // Update connectionString if it exists, or else create a new appSetting for the given key and value
             var setting = connectionstrings.Descendants("add").FirstOrDefault(s => s.Attribute("name").Value == GlobalSettings.UmbracoConnectionName);

src/Umbraco.Core/Dynamics/DynamicInstanceHelper.cs

@@ -112,7 +112,8 @@ namespace Umbraco.Core.Dynamics
 						{
 							//don't log here, we return this exception because the caller may need to do something specific when
 							//this exception occurs.
-							return Attempt<TryInvokeMemberResult>.Fail(ext);
+						    var mresult = new TryInvokeMemberResult(null, TryInvokeMemberSuccessReason.FoundExtensionMethod);
+							return Attempt<TryInvokeMemberResult>.Fail(mresult, ext);
 						}
 						catch (Exception ex)
 						{
@@ -124,7 +125,8 @@ namespace Umbraco.Core.Dynamics
 								sb.Append(t + ",");
 							}
 							LogHelper.Error<DynamicInstanceHelper>(sb.ToString(), ex);
-							return Attempt<TryInvokeMemberResult>.Fail(ex);
+                            var mresult = new TryInvokeMemberResult(null, TryInvokeMemberSuccessReason.FoundExtensionMethod);
+                            return Attempt<TryInvokeMemberResult>.Fail(mresult, ex);
 						}	
 					}
 					return Attempt<TryInvokeMemberResult>.Fail();

src/Umbraco.Core/Dynamics/DynamicNull.cs

@@ -11,78 +11,101 @@ namespace Umbraco.Core.Dynamics
     //Because it's IEnumerable, if the user is actually trying @Model.TextPages or similar
     //it will still return an enumerable object (assuming the call actually failed because there were no children of that type)
     //but in .Where, if they use a property that doesn't exist, the lambda will bypass this and return false
+
+    // returned when TryGetMember fails on a DynamicPublishedContent
+    //
+    // so if user does @CurrentPage.TextPages it will get something that is enumerable (but empty)
+    // note - not sure I understand the stuff about .Where, though
+
     public class DynamicNull : DynamicObject, IEnumerable, IHtmlString
     {
+        public static readonly DynamicNull Null = new DynamicNull();
+
+        private DynamicNull() {}
+
         public IEnumerator GetEnumerator()
         {
             return (new List<DynamicNull>()).GetEnumerator();
         }
+
         public DynamicNull Where(string predicate, params object[] values)
         {
             return this;
         }
+
         public DynamicNull OrderBy(string orderBy)
         {
             return this;
         }
+
+        public DynamicNull ToContentSet()
+        {
+            return this;
+        }
+
         public int Count()
         {
             return 0;
         }
+
         public override string ToString()
         {
             return string.Empty;
         }
+
         public override bool TryGetMember(GetMemberBinder binder, out object result)
         {
             result = this;
             return true;
         }
+
         public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out object result)
         {
             result = this;
             return true;
         }
+
         public override bool TryInvoke(InvokeBinder binder, object[] args, out object result)
         {
             result = this;
             return true;
         }
+
         public bool IsNull()
         {
             return true;
         }
+
         public bool HasValue()
         {
             return false;
         }
+
         public string Name
         {
-            get
-            {
-                return string.Empty;
-            }
+            get { return string.Empty; }
         }
+
         public int Id
         {
-            get
-            {
-                return 0;
-            }
+            get { return 0; }
         }
 
         public static implicit operator bool(DynamicNull n)
         {
             return false;
         }
+
         public static implicit operator DateTime(DynamicNull n)
         {
             return DateTime.MinValue;
         }
+
         public static implicit operator int(DynamicNull n)
         {
             return 0;
         }
+
         public static implicit operator string(DynamicNull n)
         {
             return string.Empty;
@@ -92,6 +115,5 @@ namespace Umbraco.Core.Dynamics
         {
             return string.Empty;
         }
-
     }
 }

src/Umbraco.Core/Dynamics/DynamicXml.cs

@@ -203,7 +203,7 @@ namespace Umbraco.Core.Dynamics
 			if (attempt.Result.Reason == DynamicInstanceHelper.TryInvokeMemberSuccessReason.FoundExtensionMethod
 				&& attempt.Exception != null && attempt.Exception is TargetInvocationException)
 			{
-				result = new DynamicNull();
+				result = DynamicNull.Null;
 				return true;
 			}
 

src/Umbraco.Core/Dynamics/ExtensionMethodFinder.cs

@@ -13,7 +13,96 @@ namespace Umbraco.Core.Dynamics
 	/// Utility class for finding extension methods on a type to execute
 	/// </summary>
     internal static class ExtensionMethodFinder
-    {	
+	{
+	    private static readonly MethodInfo[] AllExtensionMethods;
+
+	    static ExtensionMethodFinder()
+	    {
+            AllExtensionMethods = TypeFinder.GetAssembliesWithKnownExclusions()
+                // assemblies that contain extension methods
+                .Where(a => a.IsDefined(typeof(ExtensionAttribute), false))
+                // types that contain extension methods
+                .SelectMany(a => a.GetTypes()
+                    .Where(t => t.IsDefined(typeof(ExtensionAttribute), false) && t.IsSealed && t.IsGenericType == false && t.IsNested == false))
+                // actual extension methods
+                .SelectMany(t => t.GetMethods(BindingFlags.Static | BindingFlags.Public)
+                    .Where(m => m.IsDefined(typeof(ExtensionAttribute), false)))
+                // and also IEnumerable<T> extension methods - because the assembly is excluded
+                .Concat(typeof(Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public))
+                .ToArray();
+	    }
+
+        // ORIGINAL CODE IS NOT COMPLETE, DOES NOT HANDLE GENERICS, ETC...
+
+        // so this is an attempt at fixing things, but it's not done yet
+        // and do we really want to do this? extension methods are not supported on dynamics, period
+        // we should use strongly typed content instead of dynamics.
+
+        /*
+
+        // get all extension methods for type thisType, with name name,
+        // accepting argsCount arguments (not counting the instance of thisType).
+        private static IEnumerable<MethodInfo> GetExtensionMethods(Type thisType, string name, int argsCount)
+        {
+            var key = string.Format("{0}.{1}::{2}", thisType.FullName, name, argsCount);
+
+            var types = thisType.GetBaseTypes(true); // either do this OR have MatchFirstParameter handle the stuff... F*XME
+
+            var methods = AllExtensionMethods
+                .Where(m => m.Name == name)
+                .Where(m => m.GetParameters().Length == argsCount)
+                .Where(m => MatchFirstParameter(thisType, m.GetParameters()[0].ParameterType));
+
+            // f*xme - is this what we should cache?
+            return methods;
+        }
+
+        // find out whether the first parameter is a match for thisType
+        private static bool MatchFirstParameter(Type thisType, Type firstParameterType)
+        {
+            return MethodArgZeroHasCorrectTargetType(null, firstParameterType, thisType);
+        }
+
+        // get the single extension method for type thisType, with name name,
+        // that accepts the arguments in args (which does not contain the instance of thisType).
+        public static MethodInfo GetExtensionMethod(Type thisType, string name, object[] args)
+        {
+            MethodInfo result = null;
+            foreach (var method in GetExtensionMethods(thisType, name, args.Length).Where(m => MatchParameters(m, args)))
+            {
+                if (result == null)
+                    result = method;
+                else
+                    throw new AmbiguousMatchException("More than one matching extension method was found.");
+            }
+            return result;
+        }
+
+        // find out whether the method can accept the arguments
+        private static bool MatchParameters(MethodInfo method, IList<object> args)
+        {
+            var parameters = method.GetParameters();
+
+            var i = 0;
+            for (; i < parameters.Length; ++i)
+            {
+                if (MatchParameter(parameters[i].ParameterType, args[i].GetType()) == false)
+                    break;
+            }
+            return (i == parameters.Length);
+        }
+
+        internal static bool MatchParameter(Type parameterType, Type argumentType)
+        {
+            // public static int DoSomething<T>(Foo foo, T t1, T t2)
+            // DoSomething(foo, t1, t2) => how can we match?!
+            return parameterType == argumentType; // f*xme of course!
+        }
+         * 
+        */
+
+        // BELOW IS THE ORIGINAL CODE...
+
 		/// <summary>
 		/// Returns all extension methods found matching the definition
 		/// </summary>
@@ -27,6 +116,10 @@ namespace Umbraco.Core.Dynamics
 		/// </remarks>
         private static IEnumerable<MethodInfo> GetAllExtensionMethods(Type thisType, string name, int argumentCount, bool argsContainsThis)
         {
+            // at *least* we can cache the extension methods discovery
+		    var candidates = AllExtensionMethods;
+
+            /*
 			//only scan assemblies we know to contain extension methods (user assemblies)
         	var assembliesToScan = TypeFinder.GetAssembliesWithKnownExclusions();        	
 
@@ -45,6 +138,7 @@ namespace Umbraco.Core.Dynamics
 
             //add the extension methods defined in IEnumerable
             candidates = candidates.Concat(typeof(Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public));            
+            */
 
             //filter by name	
             var methodsByName = candidates.Where(m => m.Name == name);

src/Umbraco.Core/Dynamics/PropertyResult.cs

@@ -1,60 +1,46 @@
 using System;
 using Umbraco.Core.Models;
-using umbraco.interfaces;
 using System.Web;
 
 namespace Umbraco.Core.Dynamics
 {
-	internal class PropertyResult : IPublishedContentProperty, IHtmlString
-    {
-		internal PropertyResult(IPublishedContentProperty source, PropertyResultType type)
+	internal class PropertyResult : IPublishedProperty, IHtmlString
+	{
+	    private readonly IPublishedProperty _source;
+	    private readonly string _alias;
+	    private readonly object _value;
+        private readonly PropertyResultType _type;
+
+		internal PropertyResult(IPublishedProperty source, PropertyResultType type)
         {
     		if (source == null) throw new ArgumentNullException("source");
-
-    		Alias = source.Alias;
-			Value = source.Value;
-			PropertyType = type;
+            
+            _type = type;
+            _source = source;
         }
+
 		internal PropertyResult(string alias, object value, PropertyResultType type)
         {
         	if (alias == null) throw new ArgumentNullException("alias");
         	if (value == null) throw new ArgumentNullException("value");
 
-        	Alias = alias;
-			Value = value;
-        	PropertyType = type;
+            _type = type;
+            _alias = alias;
+			_value = value;
         }
 
-		internal PropertyResultType PropertyType { get; private set; }
-		
-    	public string Alias { get; private set; }
+        internal PropertyResultType PropertyType { get { return _type; } }
 
-    	public object Value { get; private set; }
-	
-		/// <summary>
-		/// Returns the value as a string output, this is used in the final rendering process of a property
-		/// </summary>
-		internal string ValueAsString
-		{
-			get
-			{
-				return Value == null ? "" : Convert.ToString(Value);
-			}
-		}
-
-		/// <summary>
-		/// The Id of the document for which this property belongs to
-		/// </summary>
-        public int DocumentId { get; set; }
-
-		/// <summary>
-		/// The alias of the document type alias for which this property belongs to
-		/// </summary>
-        public string DocumentTypeAlias { get; set; }
+        public string PropertyTypeAlias { get { return _source == null ? _alias : _source.PropertyTypeAlias; } }
+        public object DataValue { get { return _source == null ? _value : _source.DataValue; } }
+        public bool HasValue { get { return _source == null || _source.HasValue; } }
+        public object Value { get { return _source == null ? _value : _source.Value; } }
+        public object XPathValue { get { return Value == null ? null : Value.ToString(); } }
 
         public string ToHtmlString()
         {
-			return ValueAsString;
+            var value = Value;
+			return value == null ? string.Empty : value.ToString();
         }
     }
 }

src/Umbraco.Core/EnumerableExtensions.cs

@@ -13,16 +13,45 @@ namespace Umbraco.Core
     {
         public static IEnumerable<IEnumerable<T>> InGroupsOf<T>(this IEnumerable<T> source, int groupSize)
         {
-            var i = 0;
-            var length = source.Count();
+            if (source == null)
+               throw new NullReferenceException("source");
 
-            while ((i * groupSize) < length)
-            {
-                yield return source.Skip(i * groupSize).Take(groupSize);
-                i++;
-            }
+            // enumerate the source only once!
+            return new InGroupsEnumerator<T>(source, groupSize).Groups();
         }
 
+        // this class makes sure that the source is enumerated only ONCE
+        // which means that when it is enumerated, the actual groups content
+        // has to be evaluated at the same time, and stored in an array.
+        private class InGroupsEnumerator<T>
+        {
+            private readonly IEnumerator<T> _source;
+            private readonly int _count;
+            private bool _mightHaveNext;
+
+            public InGroupsEnumerator(IEnumerable<T> source, int count)
+            {
+                _source = source.GetEnumerator();
+                _count = count;
+                _mightHaveNext = true;
+            }
+
+            public IEnumerable<IEnumerable<T>> Groups()
+            {
+                while (_mightHaveNext && _source.MoveNext())
+                    yield return Group().ToArray(); // see note above
+            }
+
+            private IEnumerable<T> Group()
+            {
+                var c = 0;
+                do
+                {
+                    yield return _source.Current;
+                } while (++c < _count && _source.MoveNext());
+                _mightHaveNext = c == _count;
+            }
+        }
 
         /// <summary>The distinct by.</summary>
         /// <param name="source">The source.</param>
@@ -243,23 +272,45 @@ namespace Umbraco.Core
                 });
         }
 
-        ///<summary>Finds the index of the first item matching an expression in an enumerable.</summary>
-        ///<param name="items">The enumerable to search.</param>
-        ///<param name="predicate">The expression to test the items against.</param>
-        ///<returns>The index of the first matching item, or -1 if no items match.</returns>
+        /// <summary>
+        /// Finds the index of the first item matching an expression in an enumerable.
+        /// </summary>
+        /// <typeparam name="T">The type of the enumerated objects.</typeparam>
+        /// <param name="items">The enumerable to search.</param>
+        /// <param name="predicate">The expression to test the items against.</param>
+        /// <returns>The index of the first matching item, or -1.</returns>
         public static int FindIndex<T>(this IEnumerable<T> items, Func<T, bool> predicate)
+        {
+            return FindIndex(items, 0, predicate);
+        }
+
+        /// <summary>
+        /// Finds the index of the first item matching an expression in an enumerable.
+        /// </summary>
+        /// <typeparam name="T">The type of the enumerated objects.</typeparam>
+        /// <param name="items">The enumerable to search.</param>
+        /// <param name="startIndex">The index to start at.</param>
+        /// <param name="predicate">The expression to test the items against.</param>
+        /// <returns>The index of the first matching item, or -1.</returns>
+        public static int FindIndex<T>(this IEnumerable<T> items, int startIndex, Func<T, bool> predicate)
         {
             if (items == null) throw new ArgumentNullException("items");
             if (predicate == null) throw new ArgumentNullException("predicate");
+            if (startIndex < 0) throw new ArgumentOutOfRangeException("startIndex");
+
+            var index = startIndex;
+            if (index > 0)
+                items = items.Skip(index);
 
-            var retVal = 0;
             foreach (var item in items)
             {
-                if (predicate(item)) return retVal;
-                retVal++;
+                if (predicate(item)) return index;
+                index++;
             }
+
             return -1;
         }
+
         ///<summary>Finds the index of the first occurence of an item in an enumerable.</summary>
         ///<param name="items">The enumerable to search.</param>
         ///<param name="item">The item to find.</param>

src/Umbraco.Core/ExpressionHelper.cs

@@ -177,8 +177,21 @@ namespace Umbraco.Core
 		public static MethodInfo GetMethodInfo<T1, T2>(Expression<Func<T1, T2>> fromExpression)
 		{
 			if (fromExpression == null) return null;
-			var body = fromExpression.Body as MethodCallExpression;
-			return body != null ? body.Method : null;
+
+            MethodCallExpression me;
+            switch (fromExpression.Body.NodeType)
+            {
+                case ExpressionType.Convert:
+                case ExpressionType.ConvertChecked:
+                    var ue = fromExpression.Body as UnaryExpression;
+                    me = ((ue != null) ? ue.Operand : null) as MethodCallExpression;
+                    break;
+                default:
+                    me = fromExpression.Body as MethodCallExpression;
+                    break;
+            }
+
+            return me != null ? me.Method : null;
 		}
 
 		/// <summary>

src/Umbraco.Core/IDisposeOnRequestEnd.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Any class implementing this interface that is added to the httpcontext.items keys or values will be disposed of at the end of the request.
+    /// </summary>
+    public interface IDisposeOnRequestEnd : IDisposable
+    {
+    }
+}

src/Umbraco.Core/IO/MediaFileSystem.cs

@@ -45,11 +45,11 @@ namespace Umbraco.Core.IO
 
 		public IEnumerable<string> GetThumbnails(string path)
 		{
-			var parentDirectory = System.IO.Path.GetDirectoryName(path);
-			var extension = System.IO.Path.GetExtension(path);
+			var parentDirectory = Path.GetDirectoryName(path);
+			var extension = Path.GetExtension(path);
 
 			return GetFiles(parentDirectory)
-				.Where(x => x.StartsWith(path.TrimEnd(extension) + "_thumb"))
+				.Where(x => x.StartsWith(path.TrimEnd(extension) + "_thumb") || x.StartsWith(path.TrimEnd(extension) + "_big-thumb"))
 				.ToList();
 		}
 
@@ -57,7 +57,7 @@ namespace Umbraco.Core.IO
 		{
 			DeleteFile(path);
 
-			if (!deleteThumbnails)
+			if (deleteThumbnails == false)
 				return;
 
 			DeleteThumbnails(path);

src/Umbraco.Core/IconPickerBehaviour.cs

@@ -1,5 +1,8 @@
-namespace Umbraco.Core
+using System;
+
+namespace Umbraco.Core
 {
+    [Obsolete("This is no longer used and will be removed from the core in future versions")]
     public enum IconPickerBehaviour
     {
         /// <summary>

src/Umbraco.Core/Macros/MacroTagParser.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Macros
 	/// </summary>
 	internal class MacroTagParser
 	{
-        private static readonly Regex MacroRteContent = new Regex(@"(<div class=[""']umb-macro-holder.+?[""'].*?>.*?<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(.*?</div>)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+        private static readonly Regex MacroRteContent = new Regex(@"(<div.*?>.*?<!--\s*?)(<\?UMBRACO_MACRO.*?/>)(.*?</div>)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
         private static readonly Regex MacroPersistedFormat = new Regex(@"(<\?UMBRACO_MACRO macroAlias=[""'](\w+?)[""'].+?)(?:/>|>.*?</\?UMBRACO_MACRO>)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
 
 	    /// <summary>

src/Umbraco.Core/Manifest/ManifestParser.cs

@@ -6,6 +6,7 @@ using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Manifest
@@ -18,7 +19,8 @@ namespace Umbraco.Core.Manifest
         private readonly DirectoryInfo _pluginsDir;
         
         //used to strip comments
-        private static readonly Regex Comments = new Regex("(/\\*.*\\*/)", RegexOptions.Compiled);
+        private static readonly Regex CommentsSurround = new Regex(@"/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/", RegexOptions.Compiled);
+        private static readonly Regex CommentsLine = new Regex(@"//.*?$", RegexOptions.Compiled | RegexOptions.Multiline);
 
         public ManifestParser(DirectoryInfo pluginsDir)
         {
@@ -116,11 +118,20 @@ namespace Umbraco.Core.Manifest
             {
                 if (m.IsNullOrWhiteSpace()) continue;
 
-                //remove any comments first, NOTE: I think JSON.Net will do this for us! but we'll leave it here for now
-                Comments.Replace(m, match => "");
+                //remove any comments first
+                var replaced = CommentsSurround.Replace(m, match => " ");
+                replaced = CommentsLine.Replace(replaced, match => "");
 
-                
-                var deserialized = JsonConvert.DeserializeObject<JObject>(m);
+                JObject deserialized;
+                try
+                {
+                    deserialized = JsonConvert.DeserializeObject<JObject>(replaced);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.Error<ManifestParser>("An error occurred parsing manifest with contents: " + m, ex);
+                    continue;
+                }
 
                 //validate the javascript
                 var init = deserialized.Properties().Where(x => x.Name == "javascript").ToArray();
@@ -128,7 +139,14 @@ namespace Umbraco.Core.Manifest
                 {
                     throw new FormatException("The manifest is not formatted correctly contains more than one 'javascript' element");
                 }
-                
+
+                //validate the css
+                var cssinit = deserialized.Properties().Where(x => x.Name == "css").ToArray();
+                if (cssinit.Length > 1)
+                {
+                    throw new FormatException("The manifest is not formatted correctly contains more than one 'css' element");
+                }
+
                 //validate the property editors section
                 var propEditors = deserialized.Properties().Where(x => x.Name == "propertyEditors").ToArray();
                 if (propEditors.Length > 1)
@@ -139,6 +157,9 @@ namespace Umbraco.Core.Manifest
                 var jConfig = init.Any() ? (JArray)deserialized["javascript"] : new JArray();
                 ReplaceVirtualPaths(jConfig);
 
+                var cssConfig = cssinit.Any() ? (JArray)deserialized["css"] : new JArray();
+                ReplaceVirtualPaths(cssConfig);
+
                 //replace virtual paths for each property editor
                 if (deserialized["propertyEditors"] != null)
                 {
@@ -158,6 +179,7 @@ namespace Umbraco.Core.Manifest
                 var manifest = new PackageManifest()
                     {
                         JavaScriptInitialize = jConfig,
+                        StylesheetInitialize = cssConfig,
                         PropertyEditors = propEditors.Any() ? (JArray)deserialized["propertyEditors"] : new JArray(),
                         ParameterEditors = propEditors.Any() ? (JArray)deserialized["parameterEditors"] : new JArray()
                     };

src/Umbraco.Core/Manifest/PackageManifest.cs

@@ -12,6 +12,11 @@ namespace Umbraco.Core.Manifest
         /// </summary>
         public JArray JavaScriptInitialize { get; set; }
 
+        /// <summary>
+        /// The json array used to initialize the application with the CSS dependencies required
+        /// </summary>
+        public JArray StylesheetInitialize { get; set; }
+
         /// <summary>
         /// The json array of property editors
         /// </summary>

src/Umbraco.Core/Manifest/ParameterEditorConverter.cs

@@ -1,31 +1,31 @@
-using System;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Serialization;
-
-namespace Umbraco.Core.Manifest
-{
-    /// <summary>
-    /// Used to convert a parameter editor manifest to a property editor object
-    /// </summary>
-    internal class ParameterEditorConverter : JsonCreationConverter<ParameterEditor>
-    {
-        protected override ParameterEditor Create(Type objectType, JObject jObject)
-        {
-            return new ParameterEditor();
-        }
-
-        protected override void Deserialize(JObject jObject, ParameterEditor target, JsonSerializer serializer)
-        {
-            //since it's a manifest editor, we need to create it's instance.
-            //we need to specify the view value for the editor here otherwise we'll get an exception.
-            target.ManifestDefinedParameterValueEditor = new ParameterValueEditor
-            {
-                View = jObject["view"].ToString()
-            };
-
-            base.Deserialize(jObject, target, serializer);
-        }
-    }
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Serialization;
+
+namespace Umbraco.Core.Manifest
+{
+    /// <summary>
+    /// Used to convert a parameter editor manifest to a property editor object
+    /// </summary>
+    internal class ParameterEditorConverter : JsonCreationConverter<ParameterEditor>
+    {
+        protected override ParameterEditor Create(Type objectType, JObject jObject)
+        {
+            return new ParameterEditor();
+        }
+
+        protected override void Deserialize(JObject jObject, ParameterEditor target, JsonSerializer serializer)
+        {
+            //since it's a manifest editor, we need to create it's instance.
+            //we need to specify the view value for the editor here otherwise we'll get an exception.
+            target.ManifestDefinedParameterValueEditor = new ParameterValueEditor
+            {
+                View = jObject["view"].ToString()
+            };
+
+            base.Deserialize(jObject, target, serializer);
+        }
+    }
 }

src/Umbraco.Core/Media/ImageHelper.cs

@@ -1,137 +1,144 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-
-
-namespace Umbraco.Core.Media
-{
-    /// <summary>
-    /// A helper class used for imaging
-    /// </summary>
-    internal class ImageHelper
-    {
-        internal static IEnumerable<ResizedImage> GenerateMediaThumbnails(
-            IFileSystem fs, 
-            string fileName, 
-            string extension, 
-            Image originalImage,
-            IEnumerable<int> additionalThumbSizes)
-        {
-            // Make default thumbnails
-            var thumbs = new List<ResizedImage>
-                {
-                    Resize(fs, fileName, extension, 100, "thumb", originalImage), 
-                    Resize(fs, fileName, extension, 500, "big-thumb", originalImage)
-                };
-
-            //make custom ones
-            foreach (var thumb in additionalThumbSizes.Where(x => x > 0).Distinct())
-            {
-                thumbs.Add(Resize(fs, fileName, extension, thumb, string.Format("thumb_{0}", thumb), originalImage));
-            }
-
-            return thumbs;
-        }
-
-        private static ResizedImage Resize(IFileSystem fileSystem, string path, string extension, int maxWidthHeight, string fileNameAddition, Image originalImage)
-        {
-            var fileNameThumb = String.IsNullOrEmpty(fileNameAddition)
-                                            ? string.Format("{0}_UMBRACOSYSTHUMBNAIL.jpg", path.Substring(0, path.LastIndexOf(".")))
-                                            : string.Format("{0}_{1}.jpg", path.Substring(0, path.LastIndexOf(".")), fileNameAddition);
-
-            var thumb = GenerateThumbnail(
-                originalImage,
-                maxWidthHeight,
-                fileNameThumb,
-                extension,
-                fileSystem);
-
-            return thumb;
-        }
-
-        internal static ResizedImage GenerateThumbnail(Image image, int maxWidthHeight, string thumbnailFileName, string extension, IFileSystem fs)
-        {
-            return GenerateThumbnail(image, maxWidthHeight, -1, -1, thumbnailFileName, extension, fs);
-        }
-
-        internal static ResizedImage GenerateThumbnail(Image image, int fixedWidth, int fixedHeight, string thumbnailFileName, string extension, IFileSystem fs)
-        {
-            return GenerateThumbnail(image, -1, fixedWidth, fixedHeight, thumbnailFileName, extension, fs);
-        }
-
-        private static ResizedImage GenerateThumbnail(Image image, int maxWidthHeight, int fixedWidth, int fixedHeight, string thumbnailFileName, string extension, IFileSystem fs)
-        {
-            // Generate thumbnail
-            float f = 1;
-            if (maxWidthHeight >= 0)
-            {
-                var fx = (float)image.Size.Width / maxWidthHeight;
-                var fy = (float)image.Size.Height / maxWidthHeight;
-
-                // must fit in thumbnail size
-                f = Math.Max(fx, fy);
-            }
-
-            //depending on if we are doing fixed width resizing or not.
-            fixedWidth = (maxWidthHeight > 0) ? image.Width : fixedWidth;
-            fixedHeight = (maxWidthHeight > 0) ? image.Height : fixedHeight;
-
-            var widthTh = (int)Math.Round(fixedWidth / f);
-            var heightTh = (int)Math.Round(fixedHeight / f);
-
-            // fixes for empty width or height
-            if (widthTh == 0)
-                widthTh = 1;
-            if (heightTh == 0)
-                heightTh = 1;
-
-            // Create new image with best quality settings
-            using (var bp = new Bitmap(widthTh, heightTh))
-            {
-                using (var g = Graphics.FromImage(bp))
-                {
-                    g.SmoothingMode = SmoothingMode.HighQuality;
-                    g.InterpolationMode = InterpolationMode.HighQualityBicubic;
-                    g.PixelOffsetMode = PixelOffsetMode.HighQuality;
-                    g.CompositingQuality = CompositingQuality.HighQuality;
-
-                    // Copy the old image to the new and resized
-                    var rect = new Rectangle(0, 0, widthTh, heightTh);
-                    g.DrawImage(image, rect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel);
-
-                    // Copy metadata
-                    var imageEncoders = ImageCodecInfo.GetImageEncoders();
-
-                    var codec = extension.ToLower() == "png" || extension.ToLower() == "gif"
-                        ? imageEncoders.Single(t => t.MimeType.Equals("image/png"))
-                        : imageEncoders.Single(t => t.MimeType.Equals("image/jpeg"));
-
-                    // Set compresion ratio to 90%
-                    var ep = new EncoderParameters();
-                    ep.Param[0] = new EncoderParameter(Encoder.Quality, 90L);
-
-                    // Save the new image using the dimensions of the image
-                    var newFileName = thumbnailFileName.Replace("UMBRACOSYSTHUMBNAIL", string.Format("{0}x{1}", widthTh, heightTh));
-                    using (var ms = new MemoryStream())
-                    {
-                        bp.Save(ms, codec, ep);
-                        ms.Seek(0, 0);
-
-                        fs.AddFile(newFileName, ms);
-                    }
-
-                    return new ResizedImage(widthTh, heightTh, newFileName);
-                }
-            }
-        }
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+
+
+namespace Umbraco.Core.Media
+{
+    /// <summary>
+    /// A helper class used for imaging
+    /// </summary>
+    internal static class ImageHelper
+    {
+        public static string GetMimeType(this Image image)
+        {
+            var format = image.RawFormat;
+            var codec = ImageCodecInfo.GetImageDecoders().First(c => c.FormatID == format.Guid);
+            return codec.MimeType;
+        }
+
+        internal static IEnumerable<ResizedImage> GenerateMediaThumbnails(
+            IFileSystem fs, 
+            string fileName, 
+            string extension, 
+            Image originalImage,
+            IEnumerable<int> additionalThumbSizes)
+        {
+            // Make default thumbnails
+            var thumbs = new List<ResizedImage>
+                {
+                    Resize(fs, fileName, extension, 100, "thumb", originalImage), 
+                    Resize(fs, fileName, extension, 500, "big-thumb", originalImage)
+                };
+
+            //make custom ones
+            foreach (var thumb in additionalThumbSizes.Where(x => x > 0).Distinct())
+            {
+                thumbs.Add(Resize(fs, fileName, extension, thumb, string.Format("thumb_{0}", thumb), originalImage));
+            }
+
+            return thumbs;
+        }
+
+        private static ResizedImage Resize(IFileSystem fileSystem, string path, string extension, int maxWidthHeight, string fileNameAddition, Image originalImage)
+        {
+            var fileNameThumb = String.IsNullOrEmpty(fileNameAddition)
+                                            ? string.Format("{0}_UMBRACOSYSTHUMBNAIL.jpg", path.Substring(0, path.LastIndexOf(".")))
+                                            : string.Format("{0}_{1}.jpg", path.Substring(0, path.LastIndexOf(".")), fileNameAddition);
+
+            var thumb = GenerateThumbnail(
+                originalImage,
+                maxWidthHeight,
+                fileNameThumb,
+                extension,
+                fileSystem);
+
+            return thumb;
+        }
+
+        internal static ResizedImage GenerateThumbnail(Image image, int maxWidthHeight, string thumbnailFileName, string extension, IFileSystem fs)
+        {
+            return GenerateThumbnail(image, maxWidthHeight, -1, -1, thumbnailFileName, extension, fs);
+        }
+
+        internal static ResizedImage GenerateThumbnail(Image image, int fixedWidth, int fixedHeight, string thumbnailFileName, string extension, IFileSystem fs)
+        {
+            return GenerateThumbnail(image, -1, fixedWidth, fixedHeight, thumbnailFileName, extension, fs);
+        }
+
+        private static ResizedImage GenerateThumbnail(Image image, int maxWidthHeight, int fixedWidth, int fixedHeight, string thumbnailFileName, string extension, IFileSystem fs)
+        {
+            // Generate thumbnail
+            float f = 1;
+            if (maxWidthHeight >= 0)
+            {
+                var fx = (float)image.Size.Width / maxWidthHeight;
+                var fy = (float)image.Size.Height / maxWidthHeight;
+
+                // must fit in thumbnail size
+                f = Math.Max(fx, fy);
+            }
+
+            //depending on if we are doing fixed width resizing or not.
+            fixedWidth = (maxWidthHeight > 0) ? image.Width : fixedWidth;
+            fixedHeight = (maxWidthHeight > 0) ? image.Height : fixedHeight;
+
+            var widthTh = (int)Math.Round(fixedWidth / f);
+            var heightTh = (int)Math.Round(fixedHeight / f);
+
+            // fixes for empty width or height
+            if (widthTh == 0)
+                widthTh = 1;
+            if (heightTh == 0)
+                heightTh = 1;
+
+            // Create new image with best quality settings
+            using (var bp = new Bitmap(widthTh, heightTh))
+            {
+                using (var g = Graphics.FromImage(bp))
+                {
+                    g.SmoothingMode = SmoothingMode.HighQuality;
+                    g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+                    g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+                    g.CompositingQuality = CompositingQuality.HighQuality;
+
+                    // Copy the old image to the new and resized
+                    var rect = new Rectangle(0, 0, widthTh, heightTh);
+                    g.DrawImage(image, rect, 0, 0, image.Width, image.Height, GraphicsUnit.Pixel);
+
+                    // Copy metadata
+                    var imageEncoders = ImageCodecInfo.GetImageEncoders();
+
+                    var codec = extension.ToLower() == "png" || extension.ToLower() == "gif"
+                        ? imageEncoders.Single(t => t.MimeType.Equals("image/png"))
+                        : imageEncoders.Single(t => t.MimeType.Equals("image/jpeg"));
+
+                    // Set compresion ratio to 90%
+                    var ep = new EncoderParameters();
+                    ep.Param[0] = new EncoderParameter(Encoder.Quality, 90L);
+
+                    // Save the new image using the dimensions of the image
+                    var newFileName = thumbnailFileName.Replace("UMBRACOSYSTHUMBNAIL", string.Format("{0}x{1}", widthTh, heightTh));
+                    using (var ms = new MemoryStream())
+                    {
+                        bp.Save(ms, codec, ep);
+                        ms.Seek(0, 0);
+
+                        fs.AddFile(newFileName, ms);
+                    }
+
+                    return new ResizedImage(widthTh, heightTh, newFileName);
+                }
+            }
+        }
+
+    }
+}

src/Umbraco.Core/Models/ApplicationTree.cs

@@ -4,7 +4,7 @@ using System.Diagnostics;
 namespace Umbraco.Core.Models
 {
     [DebuggerDisplay("Tree - {Title} ({ApplicationAlias})")]
-    internal class ApplicationTree
+    public class ApplicationTree
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ApplicationTree"/> class.
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Models
         /// <param name="iconClosed">The icon closed.</param>
         /// <param name="iconOpened">The icon opened.</param>
         /// <param name="type">The tree type.</param>
-        public ApplicationTree(bool initialize, byte sortOrder, string applicationAlias, string alias, string title, string iconClosed, string iconOpened, string type)
+        public ApplicationTree(bool initialize, int sortOrder, string applicationAlias, string alias, string title, string iconClosed, string iconOpened, string type)
         {
             this.Initialize = initialize;
             this.SortOrder = sortOrder;
@@ -45,7 +45,7 @@ namespace Umbraco.Core.Models
         /// Gets or sets the sort order.
         /// </summary>
         /// <value>The sort order.</value>
-        public byte SortOrder { get; set; }
+        public int SortOrder { get; set; }
 
         /// <summary>
         /// Gets the application alias.