fixes datepicker css ref issue

Returning root element instead of document node from JsonToXml()

.gitignore

@@ -104,4 +104,5 @@ 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/[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=beta
-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

@@ -15,9 +15,11 @@
         <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, 3.0.0.0)" />
@@ -27,7 +29,7 @@
             <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="[5.0.0, 6.0.0)" />
+            <dependency id="Newtonsoft.Json" version="[4.5.11, 5.0.0)" />
         </dependencies>
     </metadata>
     <files>

build/NuSpecs/UmbracoCms.nuspec

@@ -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,13 +21,7 @@ if ($project) {
 	$projectDestinationPath = Split-Path $project.FullName -Parent
 	$umbracoFilesPath = Join-Path $rootPath "UmbracoFiles\*"
 	Copy-Item $umbracoFilesPath $projectDestinationPath -recurse -force
-	
-	# Remove Newtonsoft.Json if present in the bin folder
-	# If we don't do this, the correct version never gets copied in
-	$projectDestinationPath = Split-Path $project.FullName -Parent
-	$jsonDllFile = Join-Path $projectDestinationPath "bin\Newtonsoft.Json.dll"
-	Remove-Item $jsonDllFile -Confirm:$false
-	
+		
 	# Open readme.txt file
 	$DTE.ItemOperations.OpenFile($toolsPath + '\Readme.txt')
 }

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/Configuration/BaseRest/BaseRestSection.cs

@@ -1,38 +1,38 @@
-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; }
-        }
-
-    }
-}
+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/Dashboard/AccessElement.cs

@@ -1,34 +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;
-            }
-        }
-    }
+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

@@ -1,15 +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; }
-    }
+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

@@ -1,9 +1,9 @@
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    public enum AccessType
-    {
-        Grant,
-        Deny,
-        GrantBySection
-    }
+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

@@ -1,18 +1,15 @@
-using System.Configuration;
-
-namespace Umbraco.Core.Configuration.Dashboard
-{
-    internal class AreasElement : ConfigurationElement, IArea
-    {
-        [ConfigurationProperty("area", IsRequired = true)]
-        public InnerTextConfigurationElement<string> AreaName
-        {
-            get { return (InnerTextConfigurationElement<string>)this["area"]; }
-        }
-        
-        string IArea.AreaName
-        {
-            get { return AreaName; }
-        }
-    }
+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

@@ -1,37 +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();
-        }
-    }
+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

@@ -1,74 +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; }
-        }
-    }
+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

@@ -1,24 +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; }
-        }
-    }
-}
+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

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

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

@@ -1,15 +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; }
-    }
+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

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

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

@@ -1,15 +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; }
-    }
+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

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

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

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

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

@@ -1,37 +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();
-        }
-    }
+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

@@ -1,49 +1,50 @@
-using System.Collections.Generic;
-using System.Configuration;
-
-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 Area
-        {
-            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; }            
-        }
-        
-        string ISection.Area
-        {
-            get { return Area.AreaName; }
-        }
-
-        IAccess ISection.AccessRights
-        {
-            get { return Access; }
-        }
-    }
+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

@@ -1,37 +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();
-        }
-    }
+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

@@ -1,38 +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; }
-        }
-    }
+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();
             }
         }
 

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.Trim();
-
-            //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,127 +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.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 !
-    }
+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,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Configuration;
 
 namespace Umbraco.Core.Configuration.UmbracoSettings
@@ -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/UmbracoVersion.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 
 namespace Umbraco.Core.Configuration
@@ -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 "beta"; } }
+        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-Conventions.cs

@@ -99,6 +99,11 @@ 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";

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>

src/Umbraco.Core/CoreBootManager.cs

@@ -69,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);

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/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

@@ -1,14 +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
-    {
-    }
-}
+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/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,144 +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 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);
-                }
-            }
-        }
-
-    }
-}
+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/ContentBase.cs

@@ -266,11 +266,6 @@ namespace Umbraco.Core.Models
             get { return _additionalData; }
         }
 
-        /// <summary>
-        /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
-        /// </summary>
-        public IDictionary<string, object> AdditionalData { get; private set; }
-
         /// <summary>
         /// List of PropertyGroups available on this Content object
         /// </summary>

src/Umbraco.Core/Models/ContentExtensions.cs

@@ -528,6 +528,21 @@ namespace Umbraco.Core.Models
         
         #region Tag methods
 
+        ///// <summary>
+        ///// Returns the tags for the given property
+        ///// </summary>
+        ///// <param name="content"></param>
+        ///// <param name="propertyTypeAlias"></param>
+        ///// <param name="tagGroup"></param>
+        ///// <returns></returns>
+        ///// <remarks>
+        ///// The tags returned are only relavent for published content & saved media or members 
+        ///// </remarks>
+        //public static IEnumerable<ITag> GetTags(this IContentBase content, string propertyTypeAlias, string tagGroup = "default")
+        //{
+
+        //}
+
         /// <summary>
         /// Sets tags for the property - will add tags to the tags table and set the property value to be the comma delimited value of the tags.
         /// </summary>
@@ -631,6 +646,16 @@ namespace Umbraco.Core.Models
             return ApplicationContext.Current.Services.PackagingService.Export(media, true);
         }
 
+        /// <summary>
+        /// Creates the xml representation for the <see cref="IMedia"/> object
+        /// </summary>
+        /// <param name="member"><see cref="IContent"/> to generate xml for</param>
+        /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
+        public static XElement ToXml(this IMember member)
+        {
+            return ApplicationContext.Current.Services.PackagingService.Export(member);
+        }
+        
         /// <summary>
         /// Creates the xml representation for the <see cref="IContent"/> object
         /// </summary>

src/Umbraco.Core/Models/DataTypeDefinition.cs

@@ -3,9 +3,11 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
 using System.Runtime.Serialization;
+using Umbraco.Core.Logging;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Models
 {
@@ -34,8 +36,15 @@ namespace Umbraco.Core.Models
         public DataTypeDefinition(int parentId, Guid controlId)
         {
             _parentId = parentId;
-            _propertyEditorAlias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(controlId, true);
-            
+
+            _propertyEditorAlias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(controlId, false);
+            if (_propertyEditorAlias == null)
+            {
+                //convert to Label!
+                LogHelper.Warn<DataTypeDefinition>("Could not find a GUID -> Alias mapping for the legacy property editor with id " + controlId + ". The DataType has been converted to a Label.");
+                _propertyEditorAlias = Constants.PropertyEditors.NoEditAlias;
+            }
+
             _additionalData = new Dictionary<string, object>();
         }
         public DataTypeDefinition(int parentId, string propertyEditorAlias)

src/Umbraco.Core/Models/IMacro.cs

@@ -1,93 +1,93 @@
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Defines a Macro
-    /// </summary>
-    public interface IMacro : IAggregateRoot
-    {
-        /// <summary>
-        /// Gets or sets the alias of the Macro
-        /// </summary>
-        [DataMember]
-        string Alias { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the Macro
-        /// </summary>
-        [DataMember]
-        string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Macro can be used in an Editor
-        /// </summary>
-        [DataMember]
-        bool UseInEditor { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Cache Duration for the Macro
-        /// </summary>
-        [DataMember]
-        int CacheDuration { get; set; }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Macro should be Cached by Page
-        /// </summary>
-        [DataMember]
-        bool CacheByPage { get; set; }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Macro should be Cached Personally
-        /// </summary>
-        [DataMember]
-        bool CacheByMember { get; set; }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Macro should be rendered in an Editor
-        /// </summary>
-        [DataMember]
-        bool DontRender { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path to user control or the Control Type to render
-        /// </summary>
-        [DataMember]
-        string ControlType { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the assembly, which should be used by the Macro
-        /// </summary>
-        /// <remarks>Will usually only be filled if the ScriptFile is a Usercontrol</remarks>
-        [DataMember]
-        string ControlAssembly { get; set; }
-
-        /// <summary>
-        /// Gets or set the path to the Python file in use
-        /// </summary>
-        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
-        [DataMember]
-        string ScriptPath { get; set; }
-
-        /// <summary>
-        /// Gets or sets the path to the Xslt file in use
-        /// </summary>
-        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
-        [DataMember]
-        string XsltPath { get; set; }
-
-        /// <summary>
-        /// Gets or sets a list of Macro Properties
-        /// </summary>
-        [DataMember]
-        MacroPropertyCollection Properties { get; }
-
-        ///// <summary>
-        ///// Returns an enum <see cref="MacroTypes"/> based on the properties on the Macro
-        ///// </summary>
-        ///// <returns><see cref="MacroTypes"/></returns>
-        //MacroTypes MacroType();
-    }
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a Macro
+    /// </summary>
+    public interface IMacro : IAggregateRoot
+    {
+        /// <summary>
+        /// Gets or sets the alias of the Macro
+        /// </summary>
+        [DataMember]
+        string Alias { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the Macro
+        /// </summary>
+        [DataMember]
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro can be used in an Editor
+        /// </summary>
+        [DataMember]
+        bool UseInEditor { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Cache Duration for the Macro
+        /// </summary>
+        [DataMember]
+        int CacheDuration { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be Cached by Page
+        /// </summary>
+        [DataMember]
+        bool CacheByPage { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be Cached Personally
+        /// </summary>
+        [DataMember]
+        bool CacheByMember { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be rendered in an Editor
+        /// </summary>
+        [DataMember]
+        bool DontRender { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path to user control or the Control Type to render
+        /// </summary>
+        [DataMember]
+        string ControlType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the assembly, which should be used by the Macro
+        /// </summary>
+        /// <remarks>Will usually only be filled if the ScriptFile is a Usercontrol</remarks>
+        [DataMember]
+        string ControlAssembly { get; set; }
+
+        /// <summary>
+        /// Gets or set the path to the Python file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        string ScriptPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the path to the Xslt file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        string XsltPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets a list of Macro Properties
+        /// </summary>
+        [DataMember]
+        MacroPropertyCollection Properties { get; }
+
+        ///// <summary>
+        ///// Returns an enum <see cref="MacroTypes"/> based on the properties on the Macro
+        ///// </summary>
+        ///// <returns><see cref="MacroTypes"/></returns>
+        //MacroTypes MacroType();
+    }
 }

src/Umbraco.Core/Models/IMacroProperty.cs

@@ -1,38 +1,38 @@
-using System.Runtime.Serialization;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Defines a Property for a Macro
-    /// </summary>
-    public interface IMacroProperty : IValueObject
-    {
-        [DataMember]
-        int Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Alias of the Property
-        /// </summary>
-        [DataMember]
-        string Alias { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Name of the Property
-        /// </summary>
-        [DataMember]
-        string Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Sort Order of the Property
-        /// </summary>
-        [DataMember]
-        int SortOrder { get; set; }
-
-        /// <summary>
-        /// Gets or sets the parameter editor alias
-        /// </summary>        
-        [DataMember]
-        string EditorAlias { get; set; }
-    }
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a Property for a Macro
+    /// </summary>
+    public interface IMacroProperty : IValueObject
+    {
+        [DataMember]
+        int Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Alias of the Property
+        /// </summary>
+        [DataMember]
+        string Alias { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Name of the Property
+        /// </summary>
+        [DataMember]
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Sort Order of the Property
+        /// </summary>
+        [DataMember]
+        int SortOrder { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parameter editor alias
+        /// </summary>        
+        [DataMember]
+        string EditorAlias { get; set; }
+    }
 }

src/Umbraco.Core/Models/IMacroPropertyType.cs

@@ -1,28 +1,28 @@
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Defines a PropertyType (plugin) for a Macro
-    /// </summary>
-    internal interface IMacroPropertyType
-    {
-        /// <summary>
-        /// Gets the unique Alias of the Property Type
-        /// </summary>
-        string Alias { get; }
-
-        /// <summary>
-        /// Gets the name of the Assembly used to render the Property Type
-        /// </summary>
-        string RenderingAssembly { get; }
-        
-        /// <summary>
-        /// Gets the name of the Type used to render the Property Type
-        /// </summary>
-        string RenderingType { get; }
-        
-        /// <summary>
-        /// Gets the Base Type for storing the PropertyType (Int32, String, Boolean)
-        /// </summary>
-        MacroPropertyTypeBaseTypes BaseType { get; }
-    }
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a PropertyType (plugin) for a Macro
+    /// </summary>
+    internal interface IMacroPropertyType
+    {
+        /// <summary>
+        /// Gets the unique Alias of the Property Type
+        /// </summary>
+        string Alias { get; }
+
+        /// <summary>
+        /// Gets the name of the Assembly used to render the Property Type
+        /// </summary>
+        string RenderingAssembly { get; }
+        
+        /// <summary>
+        /// Gets the name of the Type used to render the Property Type
+        /// </summary>
+        string RenderingType { get; }
+        
+        /// <summary>
+        /// Gets the Base Type for storing the PropertyType (Int32, String, Boolean)
+        /// </summary>
+        MacroPropertyTypeBaseTypes BaseType { get; }
+    }
 }

src/Umbraco.Core/Models/IMember.cs

@@ -1,114 +1,114 @@
-using System;
-
-namespace Umbraco.Core.Models
-{
-    public interface IMember : IContentBase
-    {
-        /// <summary>
-        /// Gets or sets the Username
-        /// </summary>
-        string Username { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Email
-        /// </summary>
-        string Email { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Password
-        /// </summary>
-        string Password { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Password Question
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoPasswordRetrievalQuestionPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        string PasswordQuestion { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Password Answer
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoPasswordRetrievalAnswerPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        string PasswordAnswer { get; set; }
-
-        /// <summary>
-        /// Gets or set the comments for the member
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoCommentPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        string Comments { get; set; }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Member is approved
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoApprovePropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        bool IsApproved { get; set; }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Member is locked out
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoLockPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        bool IsLockedOut { get; set; }
-
-        /// <summary>
-        /// Gets or sets the date for last login
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoLastLoginPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        DateTime LastLoginDate { get; set; }
-
-        /// <summary>
-        /// Gest or sets the date for last password change
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoMemberLastPasswordChange
-        /// Part of the standard properties collection.
-        /// </remarks>
-        DateTime LastPasswordChangeDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the date for when Member was locked out
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoMemberLastLockout
-        /// Part of the standard properties collection.
-        /// </remarks>
-        DateTime LastLockoutDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the number of failed password attempts.
-        /// This is the number of times the password was entered incorrectly upon login.
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoFailedPasswordAttemptsPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        int FailedPasswordAttempts { get; set; }
-
-        /// <summary>
-        /// String alias of the default ContentType
-        /// </summary>
-        string ContentTypeAlias { get; }
-
-        /// <summary>
-        /// Gets the ContentType used by this content object
-        /// </summary>
-        IMemberType ContentType { get; }
-    }
+using System;
+
+namespace Umbraco.Core.Models
+{
+    public interface IMember : IContentBase
+    {
+        /// <summary>
+        /// Gets or sets the Username
+        /// </summary>
+        string Username { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Email
+        /// </summary>
+        string Email { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Password
+        /// </summary>
+        string Password { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Password Question
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoPasswordRetrievalQuestionPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        string PasswordQuestion { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Password Answer
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoPasswordRetrievalAnswerPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        string PasswordAnswer { get; set; }
+
+        /// <summary>
+        /// Gets or set the comments for the member
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoCommentPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        string Comments { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Member is approved
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoApprovePropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        bool IsApproved { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Member is locked out
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoLockPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        bool IsLockedOut { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date for last login
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoLastLoginPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        DateTime LastLoginDate { get; set; }
+
+        /// <summary>
+        /// Gest or sets the date for last password change
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoMemberLastPasswordChange
+        /// Part of the standard properties collection.
+        /// </remarks>
+        DateTime LastPasswordChangeDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date for when Member was locked out
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoMemberLastLockout
+        /// Part of the standard properties collection.
+        /// </remarks>
+        DateTime LastLockoutDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the number of failed password attempts.
+        /// This is the number of times the password was entered incorrectly upon login.
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoFailedPasswordAttemptsPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        int FailedPasswordAttempts { get; set; }
+
+        /// <summary>
+        /// String alias of the default ContentType
+        /// </summary>
+        string ContentTypeAlias { get; }
+
+        /// <summary>
+        /// Gets the ContentType used by this content object
+        /// </summary>
+        IMemberType ContentType { get; }
+    }
 }

src/Umbraco.Core/Models/IMemberType.cs

@@ -1,36 +1,36 @@
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Defines a MemberType, which Member is based on
-    /// </summary>
-    public interface IMemberType : IContentTypeComposition
-    {
-        /// <summary>
-        /// Gets a boolean indicating whether a Property is editable by the Member.
-        /// </summary>
-        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to check</param>
-        /// <returns></returns>
-        bool MemberCanEditProperty(string propertyTypeAlias);
-
-        /// <summary>
-        /// Gets a boolean indicating whether a Property is visible on the Members profile.
-        /// </summary>
-        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to check</param>
-        /// <returns></returns>
-        bool MemberCanViewProperty(string propertyTypeAlias);
-
-        /// <summary>
-        /// Sets a boolean indicating whether a Property is editable by the Member.
-        /// </summary>
-        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
-        /// <param name="value">Boolean value, true or false</param>
-        void SetMemberCanEditProperty(string propertyTypeAlias, bool value);
-
-        /// <summary>
-        /// Sets a boolean indicating whether a Property is visible on the Members profile.
-        /// </summary>
-        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
-        /// <param name="value">Boolean value, true or false</param>
-        void SetMemberCanViewProperty(string propertyTypeAlias, bool value);
-    }
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Defines a MemberType, which Member is based on
+    /// </summary>
+    public interface IMemberType : IContentTypeComposition
+    {
+        /// <summary>
+        /// Gets a boolean indicating whether a Property is editable by the Member.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to check</param>
+        /// <returns></returns>
+        bool MemberCanEditProperty(string propertyTypeAlias);
+
+        /// <summary>
+        /// Gets a boolean indicating whether a Property is visible on the Members profile.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to check</param>
+        /// <returns></returns>
+        bool MemberCanViewProperty(string propertyTypeAlias);
+
+        /// <summary>
+        /// Sets a boolean indicating whether a Property is editable by the Member.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
+        /// <param name="value">Boolean value, true or false</param>
+        void SetMemberCanEditProperty(string propertyTypeAlias, bool value);
+
+        /// <summary>
+        /// Sets a boolean indicating whether a Property is visible on the Members profile.
+        /// </summary>
+        /// <param name="propertyTypeAlias">PropertyType Alias of the Property to set</param>
+        /// <param name="value">Boolean value, true or false</param>
+        void SetMemberCanViewProperty(string propertyTypeAlias, bool value);
+    }
 }

src/Umbraco.Core/Models/IPublishedProperty.cs

@@ -1,60 +1,60 @@
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Represents a property of an <c>IPublishedContent</c>.
-    /// </summary>
-	public interface IPublishedProperty
-	{
-        /// <summary>
-        /// Gets the alias of the property.
-        /// </summary>
-		string PropertyTypeAlias { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the property has a value.
-        /// </summary>
-        /// <remarks>
-        /// <para>This is somewhat implementation-dependent -- depending on whatever IPublishedCache considers
-        /// a missing value.</para>
-        /// <para>The XmlPublishedCache raw values are strings, and it will consider missing, null or empty (and
-        /// that includes whitespace-only) strings as "no value".</para>
-        /// <para>Other caches that get their raw value from the database would consider that a property has "no
-        /// value" if it is missing, null, or an empty string (including whitespace-only).</para>
-        /// </remarks>
-        bool HasValue { get; }
-
-        /// <summary>
-        /// Gets the data value of the property.
-        /// </summary>
-        /// <remarks>
-        /// <para>The data value is whatever was passed to the property when it was instanciated, and it is
-        /// somewhat implementation-dependent -- depending on how the IPublishedCache is implemented.</para>
-        /// <para>The XmlPublishedCache raw values are strings exclusively since they come from the Xml cache.</para>
-        /// <para>For other caches that get their raw value from the database, it would be either a string,
-        /// an integer (Int32), or a date and time (DateTime).</para>
-        /// <para>If you're using that value, you're probably wrong, unless you're doing some internal
-        /// Umbraco stuff.</para>
-        /// </remarks>
-        object DataValue { get; }
-
-        /// <summary>
-        /// Gets the object value of the property.
-        /// </summary>
-        /// <remarks>
-        /// <para>The value is what you want to use when rendering content in an MVC view ie in C#.</para>
-        /// <para>It can be null, or any type of CLR object.</para>
-        /// <para>It has been fully prepared and processed by the appropriate converter.</para>
-        /// </remarks>
-        object Value { get; }
-
-        /// <summary>
-        /// Gets the XPath value of the property.
-        /// </summary>
-        /// <remarks>
-        /// <para>The XPath value is what you want to use when navigating content via XPath eg in the XSLT engine.</para>
-        /// <para>It must be either null, or a string, or an XPathNavigator.</para>
-        /// <para>It has been fully prepared and processed by the appropriate converter.</para>
-        /// </remarks>
-        object XPathValue { get; }
-	}
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a property of an <c>IPublishedContent</c>.
+    /// </summary>
+	public interface IPublishedProperty
+	{
+        /// <summary>
+        /// Gets the alias of the property.
+        /// </summary>
+		string PropertyTypeAlias { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the property has a value.
+        /// </summary>
+        /// <remarks>
+        /// <para>This is somewhat implementation-dependent -- depending on whatever IPublishedCache considers
+        /// a missing value.</para>
+        /// <para>The XmlPublishedCache raw values are strings, and it will consider missing, null or empty (and
+        /// that includes whitespace-only) strings as "no value".</para>
+        /// <para>Other caches that get their raw value from the database would consider that a property has "no
+        /// value" if it is missing, null, or an empty string (including whitespace-only).</para>
+        /// </remarks>
+        bool HasValue { get; }
+
+        /// <summary>
+        /// Gets the data value of the property.
+        /// </summary>
+        /// <remarks>
+        /// <para>The data value is whatever was passed to the property when it was instanciated, and it is
+        /// somewhat implementation-dependent -- depending on how the IPublishedCache is implemented.</para>
+        /// <para>The XmlPublishedCache raw values are strings exclusively since they come from the Xml cache.</para>
+        /// <para>For other caches that get their raw value from the database, it would be either a string,
+        /// an integer (Int32), or a date and time (DateTime).</para>
+        /// <para>If you're using that value, you're probably wrong, unless you're doing some internal
+        /// Umbraco stuff.</para>
+        /// </remarks>
+        object DataValue { get; }
+
+        /// <summary>
+        /// Gets the object value of the property.
+        /// </summary>
+        /// <remarks>
+        /// <para>The value is what you want to use when rendering content in an MVC view ie in C#.</para>
+        /// <para>It can be null, or any type of CLR object.</para>
+        /// <para>It has been fully prepared and processed by the appropriate converter.</para>
+        /// </remarks>
+        object Value { get; }
+
+        /// <summary>
+        /// Gets the XPath value of the property.
+        /// </summary>
+        /// <remarks>
+        /// <para>The XPath value is what you want to use when navigating content via XPath eg in the XSLT engine.</para>
+        /// <para>It must be either null, or a string, or an XPathNavigator.</para>
+        /// <para>It has been fully prepared and processed by the appropriate converter.</para>
+        /// </remarks>
+        object XPathValue { get; }
+	}
 }

src/Umbraco.Core/Models/IRelation.cs

@@ -0,0 +1,38 @@
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public interface IRelation : IAggregateRoot
+    {
+        /// <summary>
+        /// Gets or sets the Parent Id of the Relation (Source)
+        /// </summary>
+        [DataMember]
+        int ParentId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Child Id of the Relation (Destination)
+        /// </summary>
+        [DataMember]
+        int ChildId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the <see cref="RelationType"/> for the Relation
+        /// </summary>
+        [DataMember]
+        IRelationType RelationType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a comment for the Relation
+        /// </summary>
+        [DataMember]
+        string Comment { get; set; }
+
+        /// <summary>
+        /// Gets the Id of the <see cref="RelationType"/> that this Relation is based on.
+        /// </summary>
+        [IgnoreDataMember]
+        int RelationTypeId { get; }
+    }
+}

src/Umbraco.Core/Models/IRelationType.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public interface IRelationType : IAggregateRoot
+    {
+        /// <summary>
+        /// Gets or sets the Name of the RelationType
+        /// </summary>
+        [DataMember]
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Alias of the RelationType
+        /// </summary>
+        [DataMember]
+        string Alias { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the RelationType is Bidirectional (true) or Parent to Child (false)
+        /// </summary>
+        [DataMember]
+        bool IsBidirectional { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Parents object type id
+        /// </summary>
+        /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
+        [DataMember]
+        Guid ParentObjectType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Childs object type id
+        /// </summary>
+        /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
+        [DataMember]
+        Guid ChildObjectType { get; set; }
+    }
+}

src/Umbraco.Core/Models/ITag.cs

@@ -1,17 +1,17 @@
-using System.Runtime.Serialization;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Models
-{
-    public interface ITag : IAggregateRoot
-    {
-        [DataMember]
-        string Text { get; set; }
-
-        [DataMember]
-        string Group { get; set; }
-
-        //TODO: enable this at some stage
-        //int ParentId { get; set; }
-    }
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public interface ITag : IAggregateRoot
+    {
+        [DataMember]
+        string Text { get; set; }
+
+        [DataMember]
+        string Group { get; set; }
+
+        //TODO: enable this at some stage
+        //int ParentId { get; set; }
+    }
 }

src/Umbraco.Core/Models/Macro.cs

@@ -1,403 +1,403 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Reflection;
-using System.Runtime.Serialization;
-using System.Text.RegularExpressions;
-using Umbraco.Core.IO;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Represents a Macro
-    /// </summary>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    internal class Macro : Entity, IMacro
-    {
-        public Macro()
-        {
-            _properties = new MacroPropertyCollection();
-            _properties.CollectionChanged += PropertiesChanged;
-            _addedProperties = new List<string>();
-            _removedProperties = new List<string>();
-        }
-        
-        /// <summary>
-        /// Creates an item with pre-filled properties
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="useInEditor"></param>
-        /// <param name="cacheDuration"></param>
-        /// <param name="alias"></param>
-        /// <param name="name"></param>
-        /// <param name="controlType"></param>
-        /// <param name="controlAssembly"></param>
-        /// <param name="xsltPath"></param>
-        /// <param name="cacheByPage"></param>
-        /// <param name="cacheByMember"></param>
-        /// <param name="dontRender"></param>
-        /// <param name="scriptPath"></param>
-        public Macro(int id, bool useInEditor, int cacheDuration, string @alias, string name, string controlType, string controlAssembly, string xsltPath, bool cacheByPage, bool cacheByMember, bool dontRender, string scriptPath)
-            : this()
-        {
-            Id = id;
-            UseInEditor = useInEditor;
-            CacheDuration = cacheDuration;
-            Alias = alias;
-            Name = name;
-            ControlType = controlType;
-            ControlAssembly = controlAssembly;
-            XsltPath = xsltPath;
-            CacheByPage = cacheByPage;
-            CacheByMember = cacheByMember;
-            DontRender = dontRender;
-            ScriptPath = scriptPath;
-        }
-
-        /// <summary>
-        /// Creates an instance for persisting a new item
-        /// </summary>
-        /// <param name="useInEditor"></param>
-        /// <param name="cacheDuration"></param>
-        /// <param name="alias"></param>
-        /// <param name="name"></param>
-        /// <param name="controlType"></param>
-        /// <param name="controlAssembly"></param>
-        /// <param name="xsltPath"></param>
-        /// <param name="cacheByPage"></param>
-        /// <param name="cacheByMember"></param>
-        /// <param name="dontRender"></param>
-        /// <param name="scriptPath"></param>
-        public Macro(string @alias, string name,
-            string controlType = "",
-            string controlAssembly = "",
-            string xsltPath = "",
-            string scriptPath = "",
-            bool cacheByPage = false,
-            bool cacheByMember = false,
-            bool dontRender = true,
-            bool useInEditor = false,
-            int cacheDuration = 0)
-            : this()
-        {
-            UseInEditor = useInEditor;
-            CacheDuration = cacheDuration;
-            Alias = alias;
-            Name = name;
-            ControlType = controlType;
-            ControlAssembly = controlAssembly;
-            XsltPath = xsltPath;
-            CacheByPage = cacheByPage;
-            CacheByMember = cacheByMember;
-            DontRender = dontRender;
-            ScriptPath = scriptPath;
-        }
-
-        private string _alias;
-        private string _name;
-        private bool _useInEditor;
-        private int _cacheDuration;
-        private bool _cacheByPage;
-        private bool _cacheByMember;
-        private bool _dontRender;
-        private string _scriptFile;
-        private string _scriptAssembly;
-        private string _python;
-        private string _xslt;
-        private readonly MacroPropertyCollection _properties;
-        private readonly List<string> _addedProperties;
-        private readonly List<string> _removedProperties;
-
-        private static readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.Alias);
-        private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.Name);
-        private static readonly PropertyInfo UseInEditorSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.UseInEditor);
-        private static readonly PropertyInfo CacheDurationSelector = ExpressionHelper.GetPropertyInfo<Macro, int>(x => x.CacheDuration);
-        private static readonly PropertyInfo CacheByPageSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.CacheByPage);
-        private static readonly PropertyInfo CacheByMemberSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.CacheByMember);
-        private static readonly PropertyInfo DontRenderSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.DontRender);
-        private static readonly PropertyInfo ControlPathSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.ControlType);
-        private static readonly PropertyInfo ControlAssemblySelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.ControlAssembly);
-        private static readonly PropertyInfo ScriptPathSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.ScriptPath);
-        private static readonly PropertyInfo XsltPathSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.XsltPath);
-        private static readonly PropertyInfo PropertiesSelector = ExpressionHelper.GetPropertyInfo<Macro, MacroPropertyCollection>(x => x.Properties);
-
-        void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            OnPropertyChanged(PropertiesSelector);
-
-            if (e.Action == NotifyCollectionChangedAction.Add)
-            {
-                //listen for changes
-                var prop = e.NewItems.Cast<MacroProperty>().First();
-                prop.PropertyChanged += PropertyDataChanged;
-
-                var alias = prop.Alias;
-
-                //remove from the removed/added props (since people could add/remove all they want in one request)
-                _removedProperties.RemoveAll(s => s == alias);
-                _addedProperties.RemoveAll(s => s == alias);
-
-                //add to the added props
-                _addedProperties.Add(alias);
-            }
-            else if (e.Action == NotifyCollectionChangedAction.Remove)
-            {
-                //remove listening for changes
-                var prop = e.OldItems.Cast<MacroProperty>().First();
-                prop.PropertyChanged -= PropertyDataChanged;
-
-                var alias = prop.Alias;
-
-                //remove from the removed/added props (since people could add/remove all they want in one request)
-                _removedProperties.RemoveAll(s => s == alias);
-                _addedProperties.RemoveAll(s => s == alias);
-
-                //add to the added props
-                _removedProperties.Add(alias);
-            }
-        }
-
-        /// <summary>
-        /// When some data of a property has changed ensure our Properties flag is dirty
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        void PropertyDataChanged(object sender, PropertyChangedEventArgs e)
-        {
-            OnPropertyChanged(PropertiesSelector);
-        }
-        
-        public override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
-        {
-            _addedProperties.Clear();
-            _removedProperties.Clear();
-            base.ResetDirtyProperties(rememberPreviouslyChangedProperties);
-            foreach (var prop in Properties)
-            {
-                ((TracksChangesEntityBase)prop).ResetDirtyProperties(rememberPreviouslyChangedProperties);
-            }
-        }
-
-        /// <summary>
-        /// Used internally to check if we need to add a section in the repository to the db
-        /// </summary>
-        internal IEnumerable<string> AddedProperties
-        {
-            get { return _addedProperties; }
-        }
-
-        /// <summary>
-        /// Used internally to check if we need to remove  a section in the repository to the db
-        /// </summary>
-        internal IEnumerable<string> RemovedProperties
-        {
-            get { return _removedProperties; }
-        }
-
-        /// <summary>
-        /// Gets or sets the alias of the Macro
-        /// </summary>
-        [DataMember]
-        public string Alias
-        {
-            get { return _alias; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _alias = value;
-                    return _alias;
-                }, _alias, AliasSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the Macro
-        /// </summary>
-        [DataMember]
-        public string Name
-        {
-            get { return _name; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _name = value;
-                    return _name;
-                }, _name, NameSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Macro can be used in an Editor
-        /// </summary>
-        [DataMember]
-        public bool UseInEditor
-        {
-            get { return _useInEditor; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _useInEditor = value;
-                    return _useInEditor;
-                }, _useInEditor, UseInEditorSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Cache Duration for the Macro
-        /// </summary>
-        [DataMember]
-        public int CacheDuration
-        {
-            get { return _cacheDuration; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _cacheDuration = value;
-                    return _cacheDuration;
-                }, _cacheDuration, CacheDurationSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Macro should be Cached by Page
-        /// </summary>
-        [DataMember]
-        public bool CacheByPage
-        {
-            get { return _cacheByPage; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _cacheByPage = value;
-                    return _cacheByPage;
-                }, _cacheByPage, CacheByPageSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Macro should be Cached Personally
-        /// </summary>
-        [DataMember]
-        public bool CacheByMember
-        {
-            get { return _cacheByMember; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _cacheByMember = value;
-                    return _cacheByMember;
-                }, _cacheByMember, CacheByMemberSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Macro should be rendered in an Editor
-        /// </summary>
-        [DataMember]
-        public bool DontRender
-        {
-            get { return _dontRender; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _dontRender = value;
-                    return _dontRender;
-                }, _dontRender, DontRenderSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the path to user control or the Control Type to render
-        /// </summary>
-        [DataMember]
-        public string ControlType
-        {
-            get { return _scriptFile; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _scriptFile = value;
-                    return _scriptFile;
-                }, _scriptFile, ControlPathSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the assembly, which should be used by the Macro
-        /// </summary>
-        /// <remarks>Will usually only be filled if the ControlType is a Usercontrol</remarks>
-        [DataMember]
-        public string ControlAssembly
-        {
-            get { return _scriptAssembly; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _scriptAssembly = value;
-                    return _scriptAssembly;
-                }, _scriptAssembly, ControlAssemblySelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or set the path to the Python file in use
-        /// </summary>
-        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
-        [DataMember]
-        public string ScriptPath
-        {
-            get { return _python; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _python = value;
-                    return _python;
-                }, _python, ScriptPathSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the path to the Xslt file in use
-        /// </summary>
-        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
-        [DataMember]
-        public string XsltPath
-        {
-            get { return _xslt; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _xslt = value;
-                    return _xslt;
-                }, _xslt, XsltPathSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a list of Macro Properties
-        /// </summary>
-        [DataMember]
-        public MacroPropertyCollection Properties
-        {
-            get { return _properties; }            
-        }
-        
-        
-    }
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text.RegularExpressions;
+using Umbraco.Core.IO;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a Macro
+    /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    internal class Macro : Entity, IMacro
+    {
+        public Macro()
+        {
+            _properties = new MacroPropertyCollection();
+            _properties.CollectionChanged += PropertiesChanged;
+            _addedProperties = new List<string>();
+            _removedProperties = new List<string>();
+        }
+        
+        /// <summary>
+        /// Creates an item with pre-filled properties
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="useInEditor"></param>
+        /// <param name="cacheDuration"></param>
+        /// <param name="alias"></param>
+        /// <param name="name"></param>
+        /// <param name="controlType"></param>
+        /// <param name="controlAssembly"></param>
+        /// <param name="xsltPath"></param>
+        /// <param name="cacheByPage"></param>
+        /// <param name="cacheByMember"></param>
+        /// <param name="dontRender"></param>
+        /// <param name="scriptPath"></param>
+        public Macro(int id, bool useInEditor, int cacheDuration, string @alias, string name, string controlType, string controlAssembly, string xsltPath, bool cacheByPage, bool cacheByMember, bool dontRender, string scriptPath)
+            : this()
+        {
+            Id = id;
+            UseInEditor = useInEditor;
+            CacheDuration = cacheDuration;
+            Alias = alias;
+            Name = name;
+            ControlType = controlType;
+            ControlAssembly = controlAssembly;
+            XsltPath = xsltPath;
+            CacheByPage = cacheByPage;
+            CacheByMember = cacheByMember;
+            DontRender = dontRender;
+            ScriptPath = scriptPath;
+        }
+
+        /// <summary>
+        /// Creates an instance for persisting a new item
+        /// </summary>
+        /// <param name="useInEditor"></param>
+        /// <param name="cacheDuration"></param>
+        /// <param name="alias"></param>
+        /// <param name="name"></param>
+        /// <param name="controlType"></param>
+        /// <param name="controlAssembly"></param>
+        /// <param name="xsltPath"></param>
+        /// <param name="cacheByPage"></param>
+        /// <param name="cacheByMember"></param>
+        /// <param name="dontRender"></param>
+        /// <param name="scriptPath"></param>
+        public Macro(string @alias, string name,
+            string controlType = "",
+            string controlAssembly = "",
+            string xsltPath = "",
+            string scriptPath = "",
+            bool cacheByPage = false,
+            bool cacheByMember = false,
+            bool dontRender = true,
+            bool useInEditor = false,
+            int cacheDuration = 0)
+            : this()
+        {
+            UseInEditor = useInEditor;
+            CacheDuration = cacheDuration;
+            Alias = alias;
+            Name = name;
+            ControlType = controlType;
+            ControlAssembly = controlAssembly;
+            XsltPath = xsltPath;
+            CacheByPage = cacheByPage;
+            CacheByMember = cacheByMember;
+            DontRender = dontRender;
+            ScriptPath = scriptPath;
+        }
+
+        private string _alias;
+        private string _name;
+        private bool _useInEditor;
+        private int _cacheDuration;
+        private bool _cacheByPage;
+        private bool _cacheByMember;
+        private bool _dontRender;
+        private string _scriptFile;
+        private string _scriptAssembly;
+        private string _python;
+        private string _xslt;
+        private readonly MacroPropertyCollection _properties;
+        private readonly List<string> _addedProperties;
+        private readonly List<string> _removedProperties;
+
+        private static readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.Alias);
+        private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.Name);
+        private static readonly PropertyInfo UseInEditorSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.UseInEditor);
+        private static readonly PropertyInfo CacheDurationSelector = ExpressionHelper.GetPropertyInfo<Macro, int>(x => x.CacheDuration);
+        private static readonly PropertyInfo CacheByPageSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.CacheByPage);
+        private static readonly PropertyInfo CacheByMemberSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.CacheByMember);
+        private static readonly PropertyInfo DontRenderSelector = ExpressionHelper.GetPropertyInfo<Macro, bool>(x => x.DontRender);
+        private static readonly PropertyInfo ControlPathSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.ControlType);
+        private static readonly PropertyInfo ControlAssemblySelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.ControlAssembly);
+        private static readonly PropertyInfo ScriptPathSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.ScriptPath);
+        private static readonly PropertyInfo XsltPathSelector = ExpressionHelper.GetPropertyInfo<Macro, string>(x => x.XsltPath);
+        private static readonly PropertyInfo PropertiesSelector = ExpressionHelper.GetPropertyInfo<Macro, MacroPropertyCollection>(x => x.Properties);
+
+        void PropertiesChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            OnPropertyChanged(PropertiesSelector);
+
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                //listen for changes
+                var prop = e.NewItems.Cast<MacroProperty>().First();
+                prop.PropertyChanged += PropertyDataChanged;
+
+                var alias = prop.Alias;
+
+                //remove from the removed/added props (since people could add/remove all they want in one request)
+                _removedProperties.RemoveAll(s => s == alias);
+                _addedProperties.RemoveAll(s => s == alias);
+
+                //add to the added props
+                _addedProperties.Add(alias);
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                //remove listening for changes
+                var prop = e.OldItems.Cast<MacroProperty>().First();
+                prop.PropertyChanged -= PropertyDataChanged;
+
+                var alias = prop.Alias;
+
+                //remove from the removed/added props (since people could add/remove all they want in one request)
+                _removedProperties.RemoveAll(s => s == alias);
+                _addedProperties.RemoveAll(s => s == alias);
+
+                //add to the added props
+                _removedProperties.Add(alias);
+            }
+        }
+
+        /// <summary>
+        /// When some data of a property has changed ensure our Properties flag is dirty
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void PropertyDataChanged(object sender, PropertyChangedEventArgs e)
+        {
+            OnPropertyChanged(PropertiesSelector);
+        }
+        
+        public override void ResetDirtyProperties(bool rememberPreviouslyChangedProperties)
+        {
+            _addedProperties.Clear();
+            _removedProperties.Clear();
+            base.ResetDirtyProperties(rememberPreviouslyChangedProperties);
+            foreach (var prop in Properties)
+            {
+                ((TracksChangesEntityBase)prop).ResetDirtyProperties(rememberPreviouslyChangedProperties);
+            }
+        }
+
+        /// <summary>
+        /// Used internally to check if we need to add a section in the repository to the db
+        /// </summary>
+        internal IEnumerable<string> AddedProperties
+        {
+            get { return _addedProperties; }
+        }
+
+        /// <summary>
+        /// Used internally to check if we need to remove  a section in the repository to the db
+        /// </summary>
+        internal IEnumerable<string> RemovedProperties
+        {
+            get { return _removedProperties; }
+        }
+
+        /// <summary>
+        /// Gets or sets the alias of the Macro
+        /// </summary>
+        [DataMember]
+        public string Alias
+        {
+            get { return _alias; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _alias = value;
+                    return _alias;
+                }, _alias, AliasSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the Macro
+        /// </summary>
+        [DataMember]
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _name = value;
+                    return _name;
+                }, _name, NameSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro can be used in an Editor
+        /// </summary>
+        [DataMember]
+        public bool UseInEditor
+        {
+            get { return _useInEditor; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _useInEditor = value;
+                    return _useInEditor;
+                }, _useInEditor, UseInEditorSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Cache Duration for the Macro
+        /// </summary>
+        [DataMember]
+        public int CacheDuration
+        {
+            get { return _cacheDuration; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _cacheDuration = value;
+                    return _cacheDuration;
+                }, _cacheDuration, CacheDurationSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be Cached by Page
+        /// </summary>
+        [DataMember]
+        public bool CacheByPage
+        {
+            get { return _cacheByPage; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _cacheByPage = value;
+                    return _cacheByPage;
+                }, _cacheByPage, CacheByPageSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be Cached Personally
+        /// </summary>
+        [DataMember]
+        public bool CacheByMember
+        {
+            get { return _cacheByMember; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _cacheByMember = value;
+                    return _cacheByMember;
+                }, _cacheByMember, CacheByMemberSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Macro should be rendered in an Editor
+        /// </summary>
+        [DataMember]
+        public bool DontRender
+        {
+            get { return _dontRender; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _dontRender = value;
+                    return _dontRender;
+                }, _dontRender, DontRenderSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the path to user control or the Control Type to render
+        /// </summary>
+        [DataMember]
+        public string ControlType
+        {
+            get { return _scriptFile; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _scriptFile = value;
+                    return _scriptFile;
+                }, _scriptFile, ControlPathSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the assembly, which should be used by the Macro
+        /// </summary>
+        /// <remarks>Will usually only be filled if the ControlType is a Usercontrol</remarks>
+        [DataMember]
+        public string ControlAssembly
+        {
+            get { return _scriptAssembly; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _scriptAssembly = value;
+                    return _scriptAssembly;
+                }, _scriptAssembly, ControlAssemblySelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or set the path to the Python file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        public string ScriptPath
+        {
+            get { return _python; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _python = value;
+                    return _python;
+                }, _python, ScriptPathSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the path to the Xslt file in use
+        /// </summary>
+        /// <remarks>Optional: Can only be one of three Script, Python or Xslt</remarks>
+        [DataMember]
+        public string XsltPath
+        {
+            get { return _xslt; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _xslt = value;
+                    return _xslt;
+                }, _xslt, XsltPathSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a list of Macro Properties
+        /// </summary>
+        [DataMember]
+        public MacroPropertyCollection Properties
+        {
+            get { return _properties; }            
+        }
+        
+        
+    }
 }

src/Umbraco.Core/Models/MacroProperty.cs

@@ -1,154 +1,181 @@
-using System;
-using System.Reflection;
-using System.Runtime.Serialization;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Represents a Macro Property
-    /// </summary>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    internal class MacroProperty : TracksChangesEntityBase, IMacroProperty, IRememberBeingDirty
-    {
-        public MacroProperty()
-        {
-            
-        }
-
-        /// <summary>
-        /// Ctor for creating a new property
-        /// </summary>
-        /// <param name="alias"></param>
-        /// <param name="name"></param>
-        /// <param name="sortOrder"></param>
-        /// <param name="editorAlias"></param>
-        public MacroProperty(string @alias, string name, int sortOrder, string editorAlias)
-        {
-            _alias = alias;
-            _name = name;
-            _sortOrder = sortOrder;
-            _editorAlias = editorAlias;
-        }
-
-        /// <summary>
-        /// Ctor for creating an existing property
-        /// </summary>
-        /// <param name="id"></param>
-        /// <param name="alias"></param>
-        /// <param name="name"></param>
-        /// <param name="sortOrder"></param>
-        /// <param name="editorAlias"></param>
-        internal MacroProperty(int id, string @alias, string name, int sortOrder, string editorAlias)
-        {
-            _id = id;
-            _alias = alias;
-            _name = name;
-            _sortOrder = sortOrder;
-            _editorAlias = editorAlias;
-        }
-
-        private string _alias;
-        private string _name;
-        private int _sortOrder;
-        private int _id;
-        private string _editorAlias;
-
-        private static readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.Alias);
-        private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.Name);
-        private static readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, int>(x => x.SortOrder);
-        private static readonly PropertyInfo IdSelector = ExpressionHelper.GetPropertyInfo<Entity, int>(x => x.Id);
-        private static readonly PropertyInfo PropertyTypeSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.EditorAlias);
-
-        /// <summary>
-        /// Gets or sets the Alias of the Property
-        /// </summary>
-        [DataMember]
-        public int Id
-        {
-            get { return _id; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _id = value;
-                    return _alias;
-                }, _alias, IdSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Alias of the Property
-        /// </summary>
-        [DataMember]
-        public string Alias
-        {
-            get { return _alias; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _alias = value;
-                    return _alias;
-                }, _alias, AliasSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Name of the Property
-        /// </summary>
-        [DataMember]
-        public string Name
-        {
-            get { return _name; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _name = value;
-                    return _name;
-                }, _name, NameSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Sort Order of the Property
-        /// </summary>
-        [DataMember]
-        public int SortOrder
-        {
-            get { return _sortOrder; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _sortOrder = value;
-                    return _sortOrder;
-                }, _sortOrder, SortOrderSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Type for this Property
-        /// </summary>
-        /// <remarks>
-        /// The MacroPropertyTypes acts as a plugin for Macros.
-        /// All types was previously contained in the database, but has been ported to code.
-        /// </remarks>
-        [DataMember]
-        public string EditorAlias
-
-        {
-            get { return _editorAlias; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _editorAlias = value;
-                    return _editorAlias;
-                }, _editorAlias, PropertyTypeSelector);
-            }
-        }
-    }
+using System;
+using System.Reflection;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+using Umbraco.Core.PropertyEditors;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a Macro Property
+    /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    internal class MacroProperty : TracksChangesEntityBase, IMacroProperty, IRememberBeingDirty
+    {
+        public MacroProperty()
+        {
+            
+        }
+
+        /// <summary>
+        /// Ctor for creating a new property
+        /// </summary>
+        /// <param name="alias"></param>
+        /// <param name="name"></param>
+        /// <param name="sortOrder"></param>
+        /// <param name="editorAlias"></param>
+        public MacroProperty(string @alias, string name, int sortOrder, string editorAlias)
+        {
+            _alias = alias;
+            _name = name;
+            _sortOrder = sortOrder;
+
+            //try to get the new mapped parameter editor
+            var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(editorAlias, false);
+            if (mapped.IsNullOrWhiteSpace() == false)
+            {
+                editorAlias = mapped;
+            }
+
+            _editorAlias = editorAlias;
+        }
+
+        /// <summary>
+        /// Ctor for creating an existing property
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="alias"></param>
+        /// <param name="name"></param>
+        /// <param name="sortOrder"></param>
+        /// <param name="editorAlias"></param>
+        internal MacroProperty(int id, string @alias, string name, int sortOrder, string editorAlias)
+        {
+            _id = id;
+            _alias = alias;
+            _name = name;
+            _sortOrder = sortOrder;
+
+            //try to get the new mapped parameter editor
+            var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(editorAlias, false);
+            if (mapped.IsNullOrWhiteSpace() == false)
+            {
+                editorAlias = mapped;
+            }
+
+            _editorAlias = editorAlias;
+        }
+
+        private string _alias;
+        private string _name;
+        private int _sortOrder;
+        private int _id;
+        private string _editorAlias;
+
+        private static readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.Alias);
+        private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.Name);
+        private static readonly PropertyInfo SortOrderSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, int>(x => x.SortOrder);
+        private static readonly PropertyInfo IdSelector = ExpressionHelper.GetPropertyInfo<Entity, int>(x => x.Id);
+        private static readonly PropertyInfo PropertyTypeSelector = ExpressionHelper.GetPropertyInfo<MacroProperty, string>(x => x.EditorAlias);
+
+        /// <summary>
+        /// Gets or sets the Alias of the Property
+        /// </summary>
+        [DataMember]
+        public int Id
+        {
+            get { return _id; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _id = value;
+                    return _alias;
+                }, _alias, IdSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Alias of the Property
+        /// </summary>
+        [DataMember]
+        public string Alias
+        {
+            get { return _alias; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _alias = value;
+                    return _alias;
+                }, _alias, AliasSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Name of the Property
+        /// </summary>
+        [DataMember]
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _name = value;
+                    return _name;
+                }, _name, NameSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Sort Order of the Property
+        /// </summary>
+        [DataMember]
+        public int SortOrder
+        {
+            get { return _sortOrder; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _sortOrder = value;
+                    return _sortOrder;
+                }, _sortOrder, SortOrderSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Type for this Property
+        /// </summary>
+        /// <remarks>
+        /// The MacroPropertyTypes acts as a plugin for Macros.
+        /// All types was previously contained in the database, but has been ported to code.
+        /// </remarks>
+        [DataMember]
+        public string EditorAlias
+
+        {
+            get { return _editorAlias; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    //try to get the new mapped parameter editor
+                    var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(value, false);
+                    if (mapped.IsNullOrWhiteSpace() == false)
+                    {
+                        _editorAlias = mapped;
+                    }
+                    else
+                    {
+                        _editorAlias = value;
+                    }
+
+                    return _editorAlias;
+                }, _editorAlias, PropertyTypeSelector);
+            }
+        }
+    }
 }

src/Umbraco.Core/Models/MacroPropertyCollection.cs

@@ -1,20 +1,20 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// A macro's property collection
-    /// </summary>
-    public class MacroPropertyCollection : ObservableDictionary<string, IMacroProperty>
-    {
-        public MacroPropertyCollection() 
-            : base(property => property.Alias)
-        {
-        }
-
-    }
-
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// A macro's property collection
+    /// </summary>
+    public class MacroPropertyCollection : ObservableDictionary<string, IMacroProperty>
+    {
+        public MacroPropertyCollection() 
+            : base(property => property.Alias)
+        {
+        }
+
+    }
+
 }

src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs

@@ -1,20 +1,20 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Enum for the three allowed BaseTypes
-    /// </summary>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    internal enum MacroPropertyTypeBaseTypes
-    {
-        [EnumMember]
-        Int32,
-        [EnumMember]
-        Boolean,
-        [EnumMember]
-        String
-    }
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Enum for the three allowed BaseTypes
+    /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    internal enum MacroPropertyTypeBaseTypes
+    {
+        [EnumMember]
+        Int32,
+        [EnumMember]
+        Boolean,
+        [EnumMember]
+        String
+    }
 }

src/Umbraco.Core/Models/MacroTypes.cs

@@ -1,28 +1,28 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Enum for the various types of Macros
-    /// </summary>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    internal enum MacroTypes
-    {
-        [EnumMember]
-        Xslt = 1,
-        [EnumMember]
-        CustomControl = 2,
-        [EnumMember]
-        UserControl = 3,
-        [EnumMember]
-        Unknown = 4,
-        [EnumMember]
-        Python = 5,
-        [EnumMember]
-        Script = 6,
-        [EnumMember]
-        PartialView = 7
-    }
+using System;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Enum for the various types of Macros
+    /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    internal enum MacroTypes
+    {
+        [EnumMember]
+        Xslt = 1,
+        [EnumMember]
+        CustomControl = 2,
+        [EnumMember]
+        UserControl = 3,
+        [EnumMember]
+        Unknown = 4,
+        [EnumMember]
+        Python = 5,
+        [EnumMember]
+        Script = 6,
+        [EnumMember]
+        PartialView = 7
+    }
 }

src/Umbraco.Core/Models/Member.cs

@@ -1,454 +1,464 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Runtime.Serialization;
-
-namespace Umbraco.Core.Models
-{
-    /// <summary>
-    /// Represents a Member object
-    /// </summary>
-    [Serializable]
-    [DataContract(IsReference = true)]
-    public class Member : ContentBase, IMember
-    {
-        private readonly IMemberType _contentType;
-        private string _contentTypeAlias;
-        private string _username;
-        private string _email;
-        private string _password;
-        private object _providerUserKey;
-        private Type _userTypeKey;
-
-        /// <summary>
-        /// Constructor for creating a Member object
-        /// </summary>
-        /// <param name="name">Name of the content</param>
-        /// <param name="contentType">ContentType for the current Content object</param>
-        public Member(string name, IMemberType contentType)
-            : base(name, -1, contentType, new PropertyCollection())
-        {
-            _contentType = contentType;
-        }
-
-        public Member(string name, string email, string username, string password, int parentId, IMemberType contentType)
-            : base(name, parentId, contentType, new PropertyCollection())
-        {
-            Mandate.ParameterNotNull(contentType, "contentType");
-
-            _contentType = contentType;
-            _email = email;
-            _username = username;
-            _password = password;
-        }
-
-        public Member(string name, string email, string username, string password, IContentBase parent, IMemberType contentType)
-            : base(name, parent, contentType, new PropertyCollection())
-        {
-            Mandate.ParameterNotNull(contentType, "contentType");
-
-            _contentType = contentType;
-            _email = email;
-            _username = username;
-            _password = password;
-        }
-
-        private static readonly PropertyInfo DefaultContentTypeAliasSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.ContentTypeAlias);
-        private static readonly PropertyInfo UsernameSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Username);
-        private static readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Email);
-        private static readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Password);
-        private static readonly PropertyInfo ProviderUserKeySelector = ExpressionHelper.GetPropertyInfo<Member, object>(x => x.ProviderUserKey);
-        private static readonly PropertyInfo UserTypeKeySelector = ExpressionHelper.GetPropertyInfo<Member, Type>(x => x.ProviderUserKeyType);
-
-        /// <summary>
-        /// Gets or sets the Username
-        /// </summary>
-        [DataMember]
-        public string Username
-        {
-            get { return _username; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _username = value;
-                    return _username;
-                }, _username, UsernameSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Email
-        /// </summary>
-        [DataMember]
-        public string Email
-        {
-            get { return _email; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _email = value;
-                    return _email;
-                }, _email, EmailSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Password
-        /// </summary>
-        [DataMember]
-        public string Password
-        {
-            get { return _password; }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _password = value;
-                    return _password;
-                }, _password, PasswordSelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Groups that Member is part of
-        /// </summary>
-        [DataMember]
-        public IEnumerable<string> Groups { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Password Question
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoPasswordRetrievalQuestionPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public string PasswordQuestion
-        {
-            get
-            {
-                return Properties[Constants.Conventions.Member.PasswordQuestion].Value == null
-                    ? string.Empty
-                    : Properties[Constants.Conventions.Member.PasswordQuestion].Value.ToString();
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.PasswordQuestion].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Password Answer
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoPasswordRetrievalAnswerPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public string PasswordAnswer
-        {
-            get
-            {
-                return Properties[Constants.Conventions.Member.PasswordAnswer].Value == null
-                    ? string.Empty
-                    : Properties[Constants.Conventions.Member.PasswordAnswer].Value.ToString();
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.PasswordAnswer].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or set the comments for the member
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoCommentPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public string Comments
-        {
-            get
-            {
-                return Properties[Constants.Conventions.Member.Comments].Value == null
-                    ? string.Empty
-                    : Properties[Constants.Conventions.Member.Comments].Value.ToString();
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.Comments].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Member is approved
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoApprovePropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public bool IsApproved
-        {
-            get
-            {
-                if (Properties[Constants.Conventions.Member.IsApproved].Value == null)
-                    return default(bool);
-
-                if (Properties[Constants.Conventions.Member.IsApproved].Value is bool)
-                    return (bool)Properties[Constants.Conventions.Member.IsApproved].Value;
-
-                return (bool)Convert.ChangeType(Properties[Constants.Conventions.Member.IsApproved].Value, typeof(bool));
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.IsApproved].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a boolean indicating whether the Member is locked out
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoLockPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public bool IsLockedOut
-        {
-            get
-            {
-                if (Properties[Constants.Conventions.Member.IsLockedOut].Value == null)
-                    return default(bool);
-
-                if (Properties[Constants.Conventions.Member.IsLockedOut].Value is bool)
-                    return (bool)Properties[Constants.Conventions.Member.IsLockedOut].Value;
-
-                return (bool)Convert.ChangeType(Properties[Constants.Conventions.Member.IsLockedOut].Value, typeof(bool));
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.IsLockedOut].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the date for last login
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoLastLoginPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public DateTime LastLoginDate
-        {
-            get
-            {
-                if (Properties[Constants.Conventions.Member.LastLoginDate].Value == null)
-                    return default(DateTime);
-
-                if (Properties[Constants.Conventions.Member.LastLoginDate].Value is DateTime)
-                    return (DateTime)Properties[Constants.Conventions.Member.LastLoginDate].Value;
-
-                return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastLoginDate].Value, typeof(DateTime));
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.LastLoginDate].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gest or sets the date for last password change
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoMemberLastPasswordChange
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public DateTime LastPasswordChangeDate
-        {
-            get
-            {
-                if (Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value == null)
-                    return default(DateTime);
-
-                if (Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value is DateTime)
-                    return (DateTime)Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value;
-
-                return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value, typeof(DateTime));
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the date for when Member was locked out
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoMemberLastLockout
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public DateTime LastLockoutDate
-        {
-            get
-            {
-                if (Properties[Constants.Conventions.Member.LastLockoutDate].Value == null)
-                    return default(DateTime);
-
-                if (Properties[Constants.Conventions.Member.LastLockoutDate].Value is DateTime)
-                    return (DateTime)Properties[Constants.Conventions.Member.LastLockoutDate].Value;
-
-                return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastLockoutDate].Value, typeof(DateTime));
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.LastLockoutDate].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the number of failed password attempts.
-        /// This is the number of times the password was entered incorrectly upon login.
-        /// </summary>
-        /// <remarks>
-        /// Alias: umbracoFailedPasswordAttemptsPropertyTypeAlias
-        /// Part of the standard properties collection.
-        /// </remarks>
-        [IgnoreDataMember]
-        public int FailedPasswordAttempts
-        {
-            get
-            {
-                if (Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value == null)
-                    return default(int);
-
-                if (Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value is int)
-                    return (int)Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value;
-
-                return (int)Convert.ChangeType(Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value, typeof(int));
-            }
-            set
-            {
-                Properties[Constants.Conventions.Member.LastLockoutDate].Value = value;
-            }
-        }
-
-        /// <summary>
-        /// String alias of the default ContentType
-        /// </summary>
-        [DataMember]
-        public virtual string ContentTypeAlias
-        {
-            get { return _contentTypeAlias; }
-            internal set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _contentTypeAlias = value;
-                    return _contentTypeAlias;
-                }, _contentTypeAlias, DefaultContentTypeAliasSelector);
-            }
-        }
-
-        /// <summary>
-        /// User key from the Provider.
-        /// </summary>
-        /// <remarks>
-        /// When using standard umbraco provider this key will 
-        /// correspond to the guid UniqueId/Key.
-        /// Otherwise it will the one available from the asp.net
-        /// membership provider.
-        /// </remarks>
-        [DataMember]
-        internal virtual object ProviderUserKey
-        {
-            get
-            {
-                return _providerUserKey;
-            }
-            set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _providerUserKey = value;
-                    return _providerUserKey;
-                }, _providerUserKey, ProviderUserKeySelector);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the type of the provider user key.
-        /// </summary>
-        /// <value>
-        /// The type of the provider user key.
-        /// </value>
-        [IgnoreDataMember]
-        internal Type ProviderUserKeyType
-        {
-            get
-            {
-                return _userTypeKey;
-            }
-            private set
-            {
-                SetPropertyValueAndDetectChanges(o =>
-                {
-                    _userTypeKey = value;
-                    return _userTypeKey;
-                }, _userTypeKey, UserTypeKeySelector);
-            }
-        }
-
-        /// <summary>
-        /// Sets the type of the provider user key.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        internal void SetProviderUserKeyType(Type type)
-        {
-            ProviderUserKeyType = type;
-        }
-
-        /// <summary>
-        /// Method to call when Entity is being saved
-        /// </summary>
-        /// <remarks>Created date is set and a Unique key is assigned</remarks>
-        internal override void AddingEntity()
-        {
-            base.AddingEntity();
-
-            if (Key == Guid.Empty)
-                Key = Guid.NewGuid();
-        }
-
-        /// <summary>
-        /// Gets the ContentType used by this content object
-        /// </summary>
-        [IgnoreDataMember]
-        public IMemberType ContentType
-        {
-            get { return _contentType; }
-        }
-
-        public override void ChangeTrashedState(bool isTrashed, int parentId = -20)
-        {
-            throw new NotSupportedException("Members can't be trashed as no Recycle Bin exists, so use of this method is invalid");
-        }
-
-        /* Internal experiment - only used for mapping queries. 
-         * Adding these to have first level properties instead of the Properties collection.
-         */
-        internal string LongStringPropertyValue { get; set; }
-        internal string ShortStringPropertyValue { get; set; }
-        internal int IntegerropertyValue { get; set; }
-        internal bool BoolPropertyValue { get; set; }
-        internal DateTime DateTimePropertyValue { get; set; }
-        internal string PropertyTypeAlias { get; set; }
-    }
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a Member object
+    /// </summary>
+    [Serializable]
+    [DataContract(IsReference = true)]
+    public class Member : ContentBase, IMember
+    {
+        private readonly IMemberType _contentType;
+        private string _contentTypeAlias;
+        private string _username;
+        private string _email;
+        private string _password;
+        private object _providerUserKey;
+        private Type _userTypeKey;
+
+        /// <summary>
+        /// Constructor for creating a Member object
+        /// </summary>
+        /// <param name="name">Name of the content</param>
+        /// <param name="contentType">ContentType for the current Content object</param>
+        public Member(string name, IMemberType contentType)
+            : base(name, -1, contentType, new PropertyCollection())
+        {
+            _contentType = contentType;
+        }
+
+        public Member(string name, string email, string username, string password, int parentId, IMemberType contentType)
+            : base(name, parentId, contentType, new PropertyCollection())
+        {
+            Mandate.ParameterNotNull(contentType, "contentType");
+
+            _contentType = contentType;
+            _email = email;
+            _username = username;
+            _password = password;
+        }
+
+        public Member(string name, string email, string username, string password, IContentBase parent, IMemberType contentType)
+            : base(name, parent, contentType, new PropertyCollection())
+        {
+            Mandate.ParameterNotNull(contentType, "contentType");
+
+            _contentType = contentType;
+            _email = email;
+            _username = username;
+            _password = password;
+        }
+
+        private static readonly PropertyInfo DefaultContentTypeAliasSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.ContentTypeAlias);
+        private static readonly PropertyInfo UsernameSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Username);
+        private static readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Email);
+        private static readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo<Member, string>(x => x.Password);
+        private static readonly PropertyInfo ProviderUserKeySelector = ExpressionHelper.GetPropertyInfo<Member, object>(x => x.ProviderUserKey);
+        private static readonly PropertyInfo UserTypeKeySelector = ExpressionHelper.GetPropertyInfo<Member, Type>(x => x.ProviderUserKeyType);
+
+        /// <summary>
+        /// Gets or sets the Username
+        /// </summary>
+        [DataMember]
+        public string Username
+        {
+            get { return _username; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _username = value;
+                    return _username;
+                }, _username, UsernameSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Email
+        /// </summary>
+        [DataMember]
+        public string Email
+        {
+            get { return _email; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _email = value;
+                    return _email;
+                }, _email, EmailSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Password
+        /// </summary>
+        [DataMember]
+        public string Password
+        {
+            get { return _password; }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _password = value;
+                    return _password;
+                }, _password, PasswordSelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Groups that Member is part of
+        /// </summary>
+        [DataMember]
+        public IEnumerable<string> Groups { get; set; }
+
+        //TODO: When get/setting all of these properties we MUST:
+        // * Check if we are using the umbraco membership provider, if so then we need to use the configured fields - not the explicit fields below
+        // * If any of the fields don't exist, what should we do? Currently it will throw an exception!
+
+        /// <summary>
+        /// Gets or sets the Password Question
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoPasswordRetrievalQuestionPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public string PasswordQuestion
+        {
+            get
+            {
+                return Properties[Constants.Conventions.Member.PasswordQuestion].Value == null
+                    ? string.Empty
+                    : Properties[Constants.Conventions.Member.PasswordQuestion].Value.ToString();
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.PasswordQuestion].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Password Answer
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoPasswordRetrievalAnswerPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public string PasswordAnswer
+        {
+            get
+            {
+                return Properties[Constants.Conventions.Member.PasswordAnswer].Value == null
+                    ? string.Empty
+                    : Properties[Constants.Conventions.Member.PasswordAnswer].Value.ToString();
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.PasswordAnswer].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or set the comments for the member
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoCommentPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public string Comments
+        {
+            get
+            {
+                return Properties[Constants.Conventions.Member.Comments].Value == null
+                    ? string.Empty
+                    : Properties[Constants.Conventions.Member.Comments].Value.ToString();
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.Comments].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Member is approved
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoApprovePropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public bool IsApproved
+        {
+            get
+            {
+                if (Properties[Constants.Conventions.Member.IsApproved].Value == null)
+                    return default(bool);
+
+                if (Properties[Constants.Conventions.Member.IsApproved].Value is bool)
+                    return (bool)Properties[Constants.Conventions.Member.IsApproved].Value;
+
+                //TODO: Use TryConvertTo<T> instead
+                return (bool)Convert.ChangeType(Properties[Constants.Conventions.Member.IsApproved].Value, typeof(bool));
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.IsApproved].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean indicating whether the Member is locked out
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoLockPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public bool IsLockedOut
+        {
+            get
+            {
+                if (Properties[Constants.Conventions.Member.IsLockedOut].Value == null)
+                    return default(bool);
+
+                if (Properties[Constants.Conventions.Member.IsLockedOut].Value is bool)
+                    return (bool)Properties[Constants.Conventions.Member.IsLockedOut].Value;
+
+                //TODO: Use TryConvertTo<T> instead
+                return (bool)Convert.ChangeType(Properties[Constants.Conventions.Member.IsLockedOut].Value, typeof(bool));
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.IsLockedOut].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the date for last login
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoLastLoginPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public DateTime LastLoginDate
+        {
+            get
+            {
+                if (Properties[Constants.Conventions.Member.LastLoginDate].Value == null)
+                    return default(DateTime);
+
+                if (Properties[Constants.Conventions.Member.LastLoginDate].Value is DateTime)
+                    return (DateTime)Properties[Constants.Conventions.Member.LastLoginDate].Value;
+
+                //TODO: Use TryConvertTo<T> instead
+                return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastLoginDate].Value, typeof(DateTime));
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.LastLoginDate].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gest or sets the date for last password change
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoMemberLastPasswordChange
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public DateTime LastPasswordChangeDate
+        {
+            get
+            {
+                if (Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value == null)
+                    return default(DateTime);
+
+                if (Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value is DateTime)
+                    return (DateTime)Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value;
+
+                //TODO: Use TryConvertTo<T> instead
+                return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value, typeof(DateTime));
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the date for when Member was locked out
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoMemberLastLockout
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public DateTime LastLockoutDate
+        {
+            get
+            {
+                if (Properties[Constants.Conventions.Member.LastLockoutDate].Value == null)
+                    return default(DateTime);
+
+                if (Properties[Constants.Conventions.Member.LastLockoutDate].Value is DateTime)
+                    return (DateTime)Properties[Constants.Conventions.Member.LastLockoutDate].Value;
+
+                //TODO: Use TryConvertTo<T> instead
+                return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastLockoutDate].Value, typeof(DateTime));
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.LastLockoutDate].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the number of failed password attempts.
+        /// This is the number of times the password was entered incorrectly upon login.
+        /// </summary>
+        /// <remarks>
+        /// Alias: umbracoFailedPasswordAttemptsPropertyTypeAlias
+        /// Part of the standard properties collection.
+        /// </remarks>
+        [IgnoreDataMember]
+        public int FailedPasswordAttempts
+        {
+            get
+            {
+                if (Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value == null)
+                    return default(int);
+
+                if (Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value is int)
+                    return (int)Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value;
+
+                //TODO: Use TryConvertTo<T> instead
+                return (int)Convert.ChangeType(Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value, typeof(int));
+            }
+            set
+            {
+                Properties[Constants.Conventions.Member.LastLockoutDate].Value = value;
+            }
+        }
+
+        /// <summary>
+        /// String alias of the default ContentType
+        /// </summary>
+        [DataMember]
+        public virtual string ContentTypeAlias
+        {
+            get { return _contentTypeAlias; }
+            internal set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _contentTypeAlias = value;
+                    return _contentTypeAlias;
+                }, _contentTypeAlias, DefaultContentTypeAliasSelector);
+            }
+        }
+
+        /// <summary>
+        /// User key from the Provider.
+        /// </summary>
+        /// <remarks>
+        /// When using standard umbraco provider this key will 
+        /// correspond to the guid UniqueId/Key.
+        /// Otherwise it will the one available from the asp.net
+        /// membership provider.
+        /// </remarks>
+        [DataMember]
+        internal virtual object ProviderUserKey
+        {
+            get
+            {
+                return _providerUserKey;
+            }
+            set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _providerUserKey = value;
+                    return _providerUserKey;
+                }, _providerUserKey, ProviderUserKeySelector);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the provider user key.
+        /// </summary>
+        /// <value>
+        /// The type of the provider user key.
+        /// </value>
+        [IgnoreDataMember]
+        internal Type ProviderUserKeyType
+        {
+            get
+            {
+                return _userTypeKey;
+            }
+            private set
+            {
+                SetPropertyValueAndDetectChanges(o =>
+                {
+                    _userTypeKey = value;
+                    return _userTypeKey;
+                }, _userTypeKey, UserTypeKeySelector);
+            }
+        }
+
+        /// <summary>
+        /// Sets the type of the provider user key.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        internal void SetProviderUserKeyType(Type type)
+        {
+            ProviderUserKeyType = type;
+        }
+
+        /// <summary>
+        /// Method to call when Entity is being saved
+        /// </summary>
+        /// <remarks>Created date is set and a Unique key is assigned</remarks>
+        internal override void AddingEntity()
+        {
+            base.AddingEntity();
+
+            if (Key == Guid.Empty)
+                Key = Guid.NewGuid();
+        }
+
+        /// <summary>
+        /// Gets the ContentType used by this content object
+        /// </summary>
+        [IgnoreDataMember]
+        public IMemberType ContentType
+        {
+            get { return _contentType; }
+        }
+
+        public override void ChangeTrashedState(bool isTrashed, int parentId = -20)
+        {
+            throw new NotSupportedException("Members can't be trashed as no Recycle Bin exists, so use of this method is invalid");
+        }
+
+        /* Internal experiment - only used for mapping queries. 
+         * Adding these to have first level properties instead of the Properties collection.
+         */
+        internal string LongStringPropertyValue { get; set; }
+        internal string ShortStringPropertyValue { get; set; }
+        internal int IntegerropertyValue { get; set; }
+        internal bool BoolPropertyValue { get; set; }
+        internal DateTime DateTimePropertyValue { get; set; }
+        internal string PropertyTypeAlias { get; set; }
+    }
 }