Merge pull request #1464 from umbraco/temp-U4-8939

Temp u4 8939
No longer need this now that it's part of JsJQueryCore
2016-09-05 15:11:23 +02:00 · 2016-09-05 14:59:22 +02:00 · 2016-09-05 14:56:06 +02:00 · 2016-09-05 14:51:29 +02:00 · 2016-09-05 14:42:45 +02:00 · 2016-09-05 12:48:30 +02:00
295 changed files with 6747 additions and 3839 deletions
@@ -3,9 +3,11 @@ Umbraco CMS
 Umbraco is a free open source Content Management System built on the ASP.NET platform.

 ## Building Umbraco from source ##
-The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt dev` in `src\Umbraco.Web.UI.Client`.
+The easiest way to get started is to run `build/build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `grunt vs` in `src\Umbraco.Web.UI.Client`.
 
-If you're interested in making changes to Belle make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). Note that you can always [download a nightly build](http://nightly.umbraco.org/umbraco%207.0.0/) so you don't have to build the code yourself.
+If you're interested in making changes to Belle without running Visual Studio make sure to read the [Belle ReadMe file](src/Umbraco.Web.UI.Client/README.md). 
+
+Note that you can always [download a nightly build](http://nightly.umbraco.org/?container=umbraco-750) so you don't have to build the code yourself.

 ## Watch a introduction video ##

@@ -35,7 +35,18 @@ test:
  assemblies: src\Umbraco.Tests\bin\Debug\Umbraco.Tests.dll
 artifacts:
 - path: build\UmbracoCms.*
+  name: UmbracoFiles
 - path: build\msbuild.log
+  name: BuildLog
+deploy:
+- provider: AzureBlob
+  storage_account_name: umbraconightlies
+  storage_access_key:
+    secure: bmEMml2SF7QLHULiePa/a01XOeIa2SxJeXuaZ+1R27b+Vb2nNUQVYiPlUyF2cZAFSHI/zO/LekRsVU1rTescGhJjF7SSjKybymI3p+F/OWpwqiu2WfFee1ofXBFx8QHw
+  container: umbraco-750
+  artifact: UmbracoFiles
+  on:
+    branch: dev-v7
 notifications:
 - provider: Slack
  auth_token:
@@ -1,23 +1,33 @@
@ECHO OFF
 SETLOCAL
-REM SETLOCAL is on, so changes to the path not persist to the actual user's path
+	:: SETLOCAL is on, so changes to the path not persist to the actual user's path

 git.exe --version
-if %ERRORLEVEL%==9009 GOTO :trydefaultpath
+IF %ERRORLEVEL%==9009 GOTO :trydefaultpath
 GOTO :EOF
+	:: Git is installed, no need to to anything else

 :trydefaultpath
-path=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
+PATH=C:\Program Files (x86)\Git\cmd;C:\Program Files\Git\cmd;%PATH%
 git.exe --version
-if %ERRORLEVEL%==9009 GOTO :showerror
+IF %ERRORLEVEL%==9009 GOTO :showerror
 GOTO :EOF
+	:: Git is installed, no need to to anything else

 :showerror
 ECHO Git is not in your path and could not be found in C:\Program Files (x86)\Git\cmd nor in C:\Program Files\Git\cmd
-set /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
-if %install%==y (
+SET /p install=" Do you want to install Git through Chocolatey [y/n]? " %=%
+IF %install%==y (
+	:: Create a temporary batch file to execute either after elevating to admin or as-is when the user is already admin
+	ECHO @ECHO OFF > "%temp%\ChocoInstallGit.cmd"
+	ECHO SETLOCAL >> "%temp%\ChocoInstallGit.cmd"
+	ECHO ECHO Installing Chocolatey first >> "%temp%\ChocoInstallGit.cmd"
+	ECHO @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" >> "%temp%\ChocoInstallGit.cmd"
+	ECHO SET PATH=%%PATH%%;%%ALLUSERSPROFILE%%\chocolatey\bin >> "%temp%\ChocoInstallGit.cmd"
+	ECHO choco install git -y >> "%temp%\ChocoInstallGit.cmd"
+	
 	GOTO :installgit
-) else (
+) ELSE (
 	GOTO :cantcontinue
 )

@@ -26,7 +36,28 @@ ECHO Can't complete the build without Git being in the path. Please add it to be
 GOTO :EOF

 :installgit
-ECHO Installing Chocolatey first
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin
-ECHO Installing Git through Chocolatey
-choco install git
+pushd %~dp0
+    :: Running prompt elevated
+
+:: --> Check for permissions
+>nul 2>&1 "%SYSTEMROOT%\system32\cacls.exe" "%SYSTEMROOT%\system32\config\system"
+
+:: --> If error flag set, we do not have admin.
+IF '%errorlevel%' NEQ '0' (
+    GOTO UACPrompt
+) ELSE ( GOTO gotAdmin )
+
+:UACPrompt
+    ECHO You're not currently running this with admin privileges, we'll now try to execute the install of Git through Chocolatey after elevating to admin privileges
+    ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\getadmin.vbs"
+    ECHO UAC.ShellExecute "%temp%\ChocoInstallGit.cmd", "", "", "runas", 1 >> "%temp%\getadmin.vbs"
+	
+    "%temp%\getadmin.vbs"
+    EXIT /B
+	
+:gotAdmin
+    IF EXIST "%temp%\getadmin.vbs" ( DEL "%temp%\getadmin.vbs" )
+    pushd "%CD%"
+    CD /D "%~dp0"
+	
+    CALL "%temp%\ChocoInstallGit.cmd"
@@ -27,14 +27,14 @@
      <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
      <dependency id="MySql.Data" version="[6.9.8, 7.0.0)" />
      <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.0-beta4, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.1, 2.0.0)" />
      <dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
 	  <!-- AutoMapper can not be updated due to: https://github.com/AutoMapper/AutoMapper/issues/373#issuecomment-127644405 -->
      <dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
-      <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
-      <dependency id="Examine" version="[0.1.69-beta, 1.0.0)" />
-      <dependency id="ImageProcessor" version="[2.4.3, 3.0.0)" />
-      <dependency id="ImageProcessor.Web" version="[4.6.3, 5.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
+      <dependency id="Examine" version="[0.1.69, 1.0.0)" />
+      <dependency id="ImageProcessor" version="[2.4.4, 3.0.0)" />
+      <dependency id="ImageProcessor.Web" version="[4.6.4, 5.0.0)" />
      <dependency id="semver" version="[1.1.2, 2.0.0)" />
      <dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />	  
 	  <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
@@ -16,8 +16,8 @@
    <tags>umbraco</tags>
    <dependencies>
      <dependency id="UmbracoCms.Core" version="[$version$]" />
-      <dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.3, 4.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[6.0.8, 10.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.4, 4.0.0)" />
    </dependencies>
  </metadata>
  <files>
@@ -45,4 +45,4 @@
    <file src="tools\Views.Web.config.install.xdt" target="Views\Web.config.install.xdt" />
    <file src="build\**" target="build" />
  </files>
-</package>
+</package>
@@ -21,6 +21,12 @@
  </section>

  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
+    <areas xdt:Transform="InsertIfMissing">
+      <area xdt:Transform="InsertIfMissing">developer</area>
+    </areas>  
+  </section>
+  
+  <section alias="StartupDeveloperDashboardSection">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Replace">
      <control showOnce="true" addPanel="true" panelCaption="">
        views/dashboard/developer/developerdashboardvideos.html
@@ -30,16 +36,21 @@
  </section>
  
  <section alias="StartupDeveloperDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-      <tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
+	<tab caption="Examine Management" xdt:Locator="Match(caption)" xdt:Transform="InsertIfMissing">
      <control>
        views/dashboard/developer/examinemanagement.html
      </control>
-    </tab>    
-    <tab caption="Xml Data Integrity Report" xdt:Transform="InsertIfMissing">
+    </tab>
+    <tab caption="Health Check" xdt:Transform="InsertIfMissing" xdt:Locator="Match(caption)">
      <control>
-        views/dashboard/developer/xmldataintegrityreport.html
+        views/dashboard/developer/healthcheck.html
      </control>
-    </tab>  
+    </tab>
+    <tab caption="Redirect URL Management" xdt:Transform="InsertIfMissing" xdt:Locator="Match(caption)">
+      <control>
+        views/dashboard/developer/redirecturls.html
+      </control>
+    </tab>	
  </section>
  
  <section alias="StartupMediaDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
@@ -52,19 +63,6 @@
    </tab>
  </section>
  
-  <section alias="StartupDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
-    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-    <tab caption="Get Started" xdt:Transform="Insert">
-      <access>
-        <grant>admin</grant>
-      </access>
-      <control showOnce="true" addPanel="true" panelCaption="">
-        views/dashboard/default/startupdashboardintro.html
-      </control>
-    </tab>
-    <tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
-  </section>
-  
  <section alias="StartupMemberDashboardSection" xdt:Locator="Match(alias)" xdt:Transform="InsertIfMissing">
    <tab caption="Get Started" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
    <tab caption="Get Started" xdt:Transform="Insert">
@@ -80,5 +78,6 @@
    
  <section alias="StartupDashboardSection">
 	<tab caption="Change Password" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
+	<tab caption="Last Edits" xdt:Locator="Match(caption)" xdt:Transform="Remove" />
  </section>
 </dashBoard>
@@ -292,6 +292,8 @@
      <mimeMap fileExtension=".svg" mimeType="image/svg+xml" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
      <remove fileExtension=".woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
      <mimeMap fileExtension=".woff" mimeType="application/x-font-woff" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+      <remove fileExtension=".woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
+      <mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
      <remove fileExtension=".less" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
      <mimeMap fileExtension=".less" mimeType="text/css" xdt:Locator="Match(fileExtension)" xdt:Transform="InsertIfMissing" />
    </staticContent>
@@ -55,21 +55,29 @@
       xdt:Transform="SetAttributes()" />

  <!--Developer-->
-  <add alias="datatype" application="developer"
+  <add alias="packager" application="developer"
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="Remove" />
-  <add initialize="true" sortOrder="0" alias="datatypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" 
+  <add alias="packagerPackages" application="developer"
       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="InsertIfMissing" />
+       xdt:Transform="Remove" />
+  <add initialize="true" sortOrder="0" alias="packager" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.PackagesTreeController, umbraco" 
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="InsertIfMissing"  />
+  
+  <!-- Before 7.4 this tree had the alias 'dataType', without the 's' on the end, this is here to rename it  -->
+  <add sortOrder="1" alias="dataTypes" application="developer" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco"
+       xdt:Locator="Match(application,type)" 
+       xdt:Transform="SetAttributes(alias,sortOrder)" />
+	   
+  <!-- Yes, set the sortOrder again, like above because.. sometimes apparently we already have a dataTypes node and we can't remove more than one.. if they're equal though (same alias,application and sortOrder) it doesn't throw an error -->   
+  <add sortOrder="1" alias="dataTypes" application="developer"
+       xdt:Locator="Match(application,alias)" 
+       xdt:Transform="SetAttributes(sortOrder)" />
+	   
  <add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
-  <add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" 
-       xdt:Locator="Match(application,alias)" 
-       xdt:Transform="SetAttributes()" />
  <add application="developer" alias="relationTypes" title="Relation Types" type="umbraco.loadRelationTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" 
       xdt:Locator="Match(application,alias)" 
       xdt:Transform="SetAttributes()" />
@@ -1,3 +1,2 @@
 # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta)
-7.5.0
-beta2
+7.5.3
@@ -11,5 +11,5 @@ using System.Resources;

 [assembly: AssemblyVersion("1.0.*")]

-[assembly: AssemblyFileVersion("7.5.0")]
-[assembly: AssemblyInformationalVersion("7.5.0-beta2")]
+[assembly: AssemblyFileVersion("7.5.3")]
+[assembly: AssemblyInformationalVersion("7.5.3")]
@@ -291,7 +291,19 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
                    true);
            }
        }
-        
+
+        [ConfigurationProperty("EnableInheritedMediaTypes")]
+        internal InnerTextConfigurationElement<bool> EnableInheritedMediaTypes
+        {
+            get
+            {
+                return new OptionalInnerTextConfigurationElement<bool>(
+                    (InnerTextConfigurationElement<bool>)this["EnableInheritedMediaTypes"],
+                    //set the default
+                    true);
+            }
+        }
+
        string IContentSection.NotificationEmailAddress
        {
            get { return Notifications.NotificationEmailAddress; }
@@ -431,5 +443,10 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        {
            get { return EnableInheritedDocumentTypes; }
        }
+
+        bool IContentSection.EnableInheritedMediaTypes
+        {
+            get { return EnableInheritedMediaTypes; }
+        }
    }
 }
@@ -61,5 +61,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        string DefaultDocumentTypeProperty { get; }

        bool EnableInheritedDocumentTypes { get; }
+
+        bool EnableInheritedMediaTypes { get; }
    }
 }
@@ -9,6 +9,8 @@
        bool DisableAlternativeTemplates { get; }

        bool DisableFindContentByIdPath { get; }
+		
+        bool DisableRedirectUrlTracking { get; }

        string UrlProviderMode { get; }

@@ -27,6 +27,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
            get { return (bool) base["disableFindContentByIdPath"]; }
        }

+        [ConfigurationProperty("disableRedirectUrlTracking", DefaultValue = "false")]
+        public bool DisableRedirectUrlTracking
+        {
+            get { return (bool) base["disableRedirectUrlTracking"]; }
+        }
+
        [ConfigurationProperty("urlProviderMode", DefaultValue = "AutoLegacy")]
        public string UrlProviderMode
        {
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.5.0");
+        private static readonly Version Version = new Version("7.5.3");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
        /// Gets the version comment (like beta or RC).
        /// </summary>
        /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "beta2"; } }
+        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
@@ -1,15 +1,23 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Umbraco.Core
+namespace Umbraco.Core
 {
    public static partial class Constants
    {
        public static class Examine
        {
+            /// <summary>
+            /// The alias of the internal member indexer
+            /// </summary>
+            public const string InternalMemberIndexer = "InternalMemberIndexer";
+
+            /// <summary>
+            /// The alias of the internal content indexer
+            /// </summary>
+            public const string InternalIndexer = "InternalIndexer";
+
+            /// <summary>
+            /// The alias of the external content indexer
+            /// </summary>
+            public const string ExternalIndexer = "ExternalIndexer";
            /// <summary>
            /// The alias of the internal member searcher
            /// </summary>
@@ -19,6 +27,11 @@ namespace Umbraco.Core
            /// The alias of the internal content searcher
            /// </summary>
            public const string InternalSearcher = "InternalSearcher";
+
+            /// <summary>
+            /// The alias of the external content searcher
+            /// </summary>
+            public const string ExternalSearcher = "ExternalSearcher";
        }
    }
 }
@@ -1,33 +1,40 @@
 namespace Umbraco.Core
 {
-	public static partial class Constants
-	{
-		/// <summary>
-		/// Defines the identifiers for Umbraco system nodes.
-		/// </summary>
-		public static class System
-		{
-			/// <summary>
-			/// The integer identifier for global system root node.
-			/// </summary>
-			public const int Root = -1;
+    public static partial class Constants
+    {
+        /// <summary>
+        /// Defines the identifiers for Umbraco system nodes.
+        /// </summary>
+        public static class System
+        {
+            /// <summary>
+            /// The integer identifier for global system root node.
+            /// </summary>
+            public const int Root = -1;

-			/// <summary>
-			/// The integer identifier for content's recycle bin.
-			/// </summary>
-			public const int RecycleBinContent = -20;
+            /// <summary>
+            /// The integer identifier for content's recycle bin.
+            /// </summary>
+            public const int RecycleBinContent = -20;

-			/// <summary>
-			/// The integer identifier for media's recycle bin.
-			/// </summary>
-			public const int RecycleBinMedia = -21;
+            /// <summary>
+            /// The integer identifier for media's recycle bin.
+            /// </summary>
+            public const int RecycleBinMedia = -21;

-		    public const int DefaultContentListViewDataTypeId = -95;
+            public const int DefaultContentListViewDataTypeId = -95;
            public const int DefaultMediaListViewDataTypeId = -96;
            public const int DefaultMembersListViewDataTypeId = -97;

            // identifiers for lock objects
-		    public const int ServersLock = -331;
-		}
-	}
+            public const int ServersLock = -331;
+        }
+
+        public static class DatabaseProviders
+        {
+            public const string SqlCe = "System.Data.SqlServerCe.4.0";
+            public const string SqlServer = "System.Data.SqlClient";
+            public const string MySql = "MySql.Data.MySqlClient";
+        }
+    }
 }
@@ -135,7 +135,7 @@ namespace Umbraco.Core
                if (string.IsNullOrEmpty(_providerName) == false)
                    return _providerName;

-                _providerName = "System.Data.SqlClient";
+                _providerName = Constants.DatabaseProviders.SqlServer;
                if (ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName] != null)
                {
                    if (string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName) == false)
@@ -212,10 +212,10 @@ namespace Umbraco.Core
        {
            var provider = DbConnectionExtensions.DetectProviderFromConnectionString(connectionString);
            var databaseProvider = provider.ToString();
-            var providerName = "System.Data.SqlClient";
+            var providerName = Constants.DatabaseProviders.SqlServer;
            if (databaseProvider.ToLower().Contains("mysql"))
            {
-                providerName = "MySql.Data.MySqlClient";
+                providerName = Constants.DatabaseProviders.MySql;
            }
            SaveConnectionString(connectionString, providerName);
            Initialize(string.Empty);
@@ -240,10 +240,10 @@ namespace Umbraco.Core
        
        public string GetDatabaseConnectionString(string server, string databaseName, string user, string password, string databaseProvider, out string providerName)
        {
-            providerName = "System.Data.SqlClient";
+            providerName = Constants.DatabaseProviders.SqlServer;
            if (databaseProvider.ToLower().Contains("mysql"))
            {
-                providerName = "MySql.Data.MySqlClient";
+                providerName = Constants.DatabaseProviders.MySql;
                return string.Format("Server={0}; Database={1};Uid={2};Pwd={3}", server, databaseName, user, password);
            }
            if (databaseProvider.ToLower().Contains("azure"))
@@ -260,7 +260,7 @@ namespace Umbraco.Core
        /// <param name="databaseName">Name of the database</param>
        public void ConfigureIntegratedSecurityDatabaseConnection(string server, string databaseName)
        {
-            const string providerName = "System.Data.SqlClient";
+            const string providerName = Constants.DatabaseProviders.SqlServer;
            var connectionString = GetIntegratedSecurityDatabaseConnectionString(server, databaseName);
            SaveConnectionString(connectionString, providerName);
            Initialize(providerName);
@@ -373,7 +373,7 @@ namespace Umbraco.Core
            var databaseSettings = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName];
            if (databaseSettings != null && string.IsNullOrWhiteSpace(databaseSettings.ConnectionString) == false && string.IsNullOrWhiteSpace(databaseSettings.ProviderName) == false)
            {
-                var providerName = "System.Data.SqlClient";
+                var providerName = Constants.DatabaseProviders.SqlServer;
                string connString = null;
                if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ProviderName))
                {
@@ -381,8 +381,7 @@ namespace Umbraco.Core
                    connString = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
                }
                Initialize(providerName, connString);
-
-                DetermineSqlServerVersion();
+                
            }
            else if (ConfigurationManager.AppSettings.ContainsKey(GlobalSettings.UmbracoConnectionName) && string.IsNullOrEmpty(ConfigurationManager.AppSettings[GlobalSettings.UmbracoConnectionName]) == false)
            {
@@ -395,8 +394,8 @@ namespace Umbraco.Core
                else if (legacyConnString.ToLowerInvariant().Contains("tcp:"))
                {
                    //Must be sql azure
-                    SaveConnectionString(legacyConnString, "System.Data.SqlClient");
-                    Initialize("System.Data.SqlClient");
+                    SaveConnectionString(legacyConnString, Constants.DatabaseProviders.SqlServer);
+                    Initialize(Constants.DatabaseProviders.SqlServer);
                }
                else if (legacyConnString.ToLowerInvariant().Contains("datalayer=mysql"))
                {
@@ -407,20 +406,19 @@ namespace Umbraco.Core
                    foreach (var variable in legacyConnString.Split(';').Where(x => x.ToLowerInvariant().StartsWith("datalayer") == false))
                        connectionStringWithoutDatalayer = string.Format("{0}{1};", connectionStringWithoutDatalayer, variable);

-                    SaveConnectionString(connectionStringWithoutDatalayer, "MySql.Data.MySqlClient");
-                    Initialize("MySql.Data.MySqlClient");
+                    SaveConnectionString(connectionStringWithoutDatalayer, Constants.DatabaseProviders.MySql);
+                    Initialize(Constants.DatabaseProviders.MySql);
                }
                else
                {
                    //Must be sql
-                    SaveConnectionString(legacyConnString, "System.Data.SqlClient");
-                    Initialize("System.Data.SqlClient");
+                    SaveConnectionString(legacyConnString, Constants.DatabaseProviders.SqlServer);
+                    Initialize(Constants.DatabaseProviders.SqlServer);
                }

                //Remove the legacy connection string, so we don't end up in a loop if something goes wrong.
                GlobalSettings.RemoveSetting(GlobalSettings.UmbracoConnectionName);
-
-                DetermineSqlServerVersion();
+                
            }
            else
            {
@@ -465,49 +463,6 @@ namespace Umbraco.Core
            Initialize(providerName);
        }

-        /// <summary>
-        /// Set the lazy resolution of determining the SQL server version if that is the db type we're using
-        /// </summary>
-        private void DetermineSqlServerVersion()
-        {
-
-            var sqlServerSyntax = SqlSyntax as SqlServerSyntaxProvider;
-            if (sqlServerSyntax != null)
-            {
-                //this will not execute now, it is lazy so will only execute when we need to actually know
-                // the sql server version.
-                sqlServerSyntax.VersionName = new Lazy<SqlServerVersionName>(() =>
-                {
-                    try
-                    {
-                        var database = this._factory.CreateDatabase();
-
-                        var version = database.ExecuteScalar<string>("SELECT SERVERPROPERTY('productversion')");
-                        var firstPart = version.Split('.')[0];
-                        switch (firstPart)
-                        {
-                            case "11":
-                                return SqlServerVersionName.V2012;
-                            case "10":
-                                return SqlServerVersionName.V2008;
-                            case "9":
-                                return SqlServerVersionName.V2005;
-                            case "8":
-                                return SqlServerVersionName.V2000;
-                            case "7":
-                                return SqlServerVersionName.V7;
-                            default:
-                                return SqlServerVersionName.Other;
-                        }
-                    }
-                    catch (Exception)
-                    {
-                        return SqlServerVersionName.Invalid;
-                    }
-                });
-            }
-        }
-
        internal DatabaseSchemaResult ValidateDatabaseSchema()
        {
            if (_configured == false || (string.IsNullOrEmpty(_connectionString) || string.IsNullOrEmpty(ProviderName)))
@@ -517,7 +472,7 @@ namespace Umbraco.Core
            {

                if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted
-                    && ProviderName == "MySql.Data.MySqlClient")
+                    && ProviderName == Constants.DatabaseProviders.MySql)
                {
                    throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
                }
@@ -625,13 +580,8 @@ namespace Umbraco.Core

                var installedSchemaVersion = new SemVersion(schemaResult.DetermineInstalledVersion());

-                var installedMigrationVersion = new SemVersion(0);
-                //we cannot check the migrations table if it doesn't exist, this will occur when upgrading to 7.3
-                if (schemaResult.ValidTables.Any(x => x.InvariantEquals("umbracoMigration")))
-                {
-                    installedMigrationVersion = schemaResult.DetermineInstalledVersionByMigrations(migrationEntryService);    
-                }
-
+                var installedMigrationVersion = schemaResult.DetermineInstalledVersionByMigrations(migrationEntryService);    
+                
                var targetVersion = UmbracoVersion.Current;
                
                //In some cases - like upgrading from 7.2.6 -> 7.3, there will be no migration information in the database and therefore it will
@@ -731,7 +681,7 @@ namespace Umbraco.Core
        private Attempt<Result> CheckReadyForInstall()
        {
            if (SystemUtilities.GetCurrentTrustLevel() != AspNetHostingPermissionLevel.Unrestricted
-                    && ProviderName == "MySql.Data.MySqlClient")
+                    && ProviderName == Constants.DatabaseProviders.MySql)
            {
                throw new InvalidOperationException("Cannot use MySql in Medium Trust configuration");
            }
@@ -780,7 +730,7 @@ namespace Umbraco.Core
        {
            var dbIsSqlCe = false;
            if (databaseSettings != null && databaseSettings.ProviderName != null)
-                dbIsSqlCe = databaseSettings.ProviderName == "System.Data.SqlServerCe.4.0";
+                dbIsSqlCe = databaseSettings.ProviderName == Constants.DatabaseProviders.SqlCe;
            var sqlCeDatabaseExists = false;
            if (dbIsSqlCe)
            {
@@ -19,7 +19,7 @@ namespace Umbraco.Core.Models.Identity
            Culture = Configuration.GlobalSettings.DefaultUILanguage;
        }

-        public virtual async Task<ClaimsIdentity> GenerateUserIdentityAsync(BackOfficeUserManager manager)
+        public virtual async Task<ClaimsIdentity> GenerateUserIdentityAsync(BackOfficeUserManager<BackOfficeIdentityUser> manager)
        {
            // NOTE the authenticationType must match the umbraco one
            // defined in CookieAuthenticationOptions.AuthenticationType
@@ -135,7 +135,7 @@ namespace Umbraco.Core.Models

        private static void ThrowTypeException(object value, Type expected, string alias)
        {
-            throw new Exception(string.Format("Value \"{0}\" of type \"{1}\" could not be converted"
+            throw new InvalidOperationException(string.Format("Value \"{0}\" of type \"{1}\" could not be converted"
                + " to type \"{2}\" which is expected by property type \"{3}\".",
                value, value.GetType(), expected, alias));
        }
@@ -5,7 +5,7 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
 namespace Umbraco.Core.Models.Rdbms
 {
    [TableName("umbracoRedirectUrl")]
-    [PrimaryKey("id")]
+    [PrimaryKey("id", autoIncrement = false)]
    [ExplicitColumns]
    class RedirectUrlDto
    {
@@ -22,8 +22,8 @@ namespace Umbraco.Core.Models.Rdbms
        // inserts, and much faster on reads, so... we have an index on a hash.

        [Column("id")]
-        [PrimaryKeyColumn(IdentitySeed = 1, Name = "PK_umbracoRedirectUrl")]
-        public int Id { get; set; }
+        [PrimaryKeyColumn(Name = "PK_umbracoRedirectUrl", AutoIncrement = false)]
+        public Guid Id { get; set; }

        [ResultColumn]
        public int ContentId { get; set; }
@@ -39,12 +39,12 @@ namespace Umbraco.Core.Models.Rdbms

        [Column("url")]
        [NullSetting(NullSetting = NullSettings.NotNull)]
-        //[Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRedirectUrl", ForColumns = "url, createDateUtc")]
        public string Url { get; set; }

        [Column("urlHash")]
        [NullSetting(NullSetting = NullSettings.NotNull)]
        [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRedirectUrl", ForColumns = "urlHash, contentKey, createDateUtc")]
+        [Length(40)]
        public string UrlHash { get; set; }
    }
 }
@@ -1,8 +1,5 @@
 using System;
 using System.Globalization;
-using System.Linq;
-using System.Threading;
-using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Services;

@@ -83,5 +80,19 @@ namespace Umbraco.Core.Models
            if (media == null) throw new ArgumentNullException("media");
            return HasPathAccess(media.Path, user.StartMediaId, Constants.System.RecycleBinMedia);
        }
+
+
+        /// <summary>
+        /// Determines whether this user is an admin.
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns>
+        /// 	<c>true</c> if this user is admin; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool IsAdmin(this IUser user)
+        {
+            if (user == null) throw new ArgumentNullException("user");
+            return user.UserType.Alias == "admin";
+        }
    }
 }
@@ -107,10 +107,10 @@ namespace Umbraco.Core.Persistence
            var foreignSql = _syntaxProvider.Format(tableDefinition.ForeignKeys);
            var indexSql = _syntaxProvider.Format(tableDefinition.Indexes);

-            var tableExist = _db.TableExist(tableName);
+            var tableExist = TableExist(tableName);
            if (overwrite && tableExist)
            {
-                _db.DropTable(tableName);
+                DropTable(tableName);
                tableExist = false;
            }

@@ -42,13 +42,13 @@ namespace Umbraco.Core.Persistence
            {
                case DatabaseProviders.SqlServer:
                case DatabaseProviders.SqlAzure:
-                    factory = DbProviderFactories.GetFactory("System.Data.SqlClient");
+                    factory = DbProviderFactories.GetFactory(Constants.DatabaseProviders.SqlServer);
                    break;
                case DatabaseProviders.SqlServerCE:
                    factory = DbProviderFactories.GetFactory("System.Data.SqlServerCe.4.0");
                    break;
                case DatabaseProviders.MySql:
-                    factory = DbProviderFactories.GetFactory("MySql.Data.MySqlClient");
+                    factory = DbProviderFactories.GetFactory(Constants.DatabaseProviders.MySql);
                    break;
                case DatabaseProviders.PostgreSQL:
                case DatabaseProviders.Oracle:
@@ -266,9 +266,9 @@ namespace Umbraco.Core.Persistence.Migrations.Initial

            //defaults for the member list
            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -1, Alias = "pageSize", SortOrder = 1, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "10" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -2, Alias = "orderBy", SortOrder = 2, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "Name" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -2, Alias = "orderBy", SortOrder = 2, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "username" });
            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -3, Alias = "orderDirection", SortOrder = 3, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "asc" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -4, Alias = "includeProperties", SortOrder = 4, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "[{\"alias\":\"email\",\"isSystem\":1},{\"alias\":\"username\",\"isSystem\":1},{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1}]" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -4, Alias = "includeProperties", SortOrder = 4, DataTypeNodeId = Constants.System.DefaultMembersListViewDataTypeId, Value = "[{\"alias\":\"username\",\"isSystem\":1},{\"alias\":\"email\",\"isSystem\":1},{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1}]" });

            //layouts for the list view
            var cardLayout = "{\"name\": \"Grid\",\"path\": \"views/propertyeditors/listview/layouts/grid/grid.html\", \"icon\": \"icon-thumbnails-small\", \"isSystem\": 1, \"selected\": true}";
@@ -276,10 +276,10 @@ namespace Umbraco.Core.Persistence.Migrations.Initial

            //defaults for the media list
            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -5, Alias = "pageSize", SortOrder = 1, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "100" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -6, Alias = "orderBy", SortOrder = 2, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "VersionDate" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -6, Alias = "orderBy", SortOrder = 2, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "updateDate" });
            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -7, Alias = "orderDirection", SortOrder = 3, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "desc" });
            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -8, Alias = "layouts", SortOrder = 4, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "[" + cardLayout + "," + listLayout + "]" });
-            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -9, Alias = "includeProperties", SortOrder = 5, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "[{\"alias\":\"sortOrder\",\"isSystem\":1, \"header\": \"Sort order\"},{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1},{\"alias\":\"owner\",\"header\":\"Updated by\",\"isSystem\":1}]" });
+            _database.Insert("cmsDataTypePreValues", "id", false, new DataTypePreValueDto { Id = -9, Alias = "includeProperties", SortOrder = 5, DataTypeNodeId = Constants.System.DefaultMediaListViewDataTypeId, Value = "[{\"alias\":\"updateDate\",\"header\":\"Last edited\",\"isSystem\":1},{\"alias\":\"owner\",\"header\":\"Updated by\",\"isSystem\":1}]" });
        }

        private void CreateUmbracoRelationTypeData()
@@ -43,8 +43,13 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
        /// <returns></returns>
        public SemVersion DetermineInstalledVersionByMigrations(IMigrationEntryService migrationEntryService)
        {
-            var allMigrations = migrationEntryService.GetAll(GlobalSettings.UmbracoMigrationName);
-            var mostrecent = allMigrations.OrderByDescending(x => x.Version).Select(x => x.Version).FirstOrDefault();
+            SemVersion mostrecent = null;
+
+            if (ValidTables.Any(x => x.InvariantEquals("umbracoMigration")))
+            {
+                var allMigrations = migrationEntryService.GetAll(GlobalSettings.UmbracoMigrationName);
+                 mostrecent = allMigrations.OrderByDescending(x => x.Version).Select(x => x.Version).FirstOrDefault();
+            }

            return mostrecent ?? new SemVersion(new Version(0, 0, 0));
        }
@@ -116,13 +121,19 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            //if the error is for umbracoAccess it must be the previous version to 7.3 since that is when it is added
            if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoAccess"))))
            {
-                return new Version(7, 2, 5);
+                return new Version(7, 2, 0);
            }

            //if the error is for umbracoDeployChecksum it must be the previous version to 7.4 since that is when it is added
            if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoDeployChecksum"))))
            {
-                return new Version(7, 3, 4);
+                return new Version(7, 3, 0);
+            }
+
+            //if the error is for umbracoRedirectUrl it must be the previous version to 7.5 since that is when it is added
+            if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("umbracoRedirectUrl"))))
+            {
+                return new Version(7, 4, 0);
            }

            return UmbracoVersion.Current;
@@ -1,7 +1,6 @@
 using System.Linq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.Migrations.Syntax.Create;
 using Umbraco.Core.Persistence.SqlSyntax;

 namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero
@@ -21,24 +20,40 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZer

        private string MigrationCode(Database database)
        {
-            // don't execute if the table is already there
-            var tables = SqlSyntax.GetTablesInSchema(database).ToArray();
-            if (tables.InvariantContains("umbracoRedirectUrl")) return null;
+            var umbracoRedirectUrlTableName = "umbracoRedirectUrl";

            var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);

-            localContext.Create.Table("umbracoRedirectUrl")
-                .WithColumn("id").AsInt32().Identity().PrimaryKey("PK_umbracoRedirectUrl")
-                .WithColumn("contentId").AsInt32().NotNullable()
-                .WithColumn("createDateUtc").AsDateTime().NotNullable()
-                .WithColumn("url").AsString(2048).NotNullable();
+            var tables = SqlSyntax.GetTablesInSchema(database).ToArray();
+            
+            if (tables.InvariantContains(umbracoRedirectUrlTableName))
+            {
+                var columns = SqlSyntax.GetColumnsInSchema(database).ToArray();
+                if (columns.Any(x => x.TableName.InvariantEquals(umbracoRedirectUrlTableName) && x.ColumnName.InvariantEquals("id") && x.DataType == "uniqueidentifier"))
+                    return null;
+                localContext.Delete.Table(umbracoRedirectUrlTableName);
+            }

-            localContext.Create.Index("IX_umbracoRedirectUrl")
-                .OnTable("umbracoRedirectUrl")
-                .OnColumn("url").Ascending()
-                .OnColumn("createDateUtc").Ascending()
+            localContext.Create.Table(umbracoRedirectUrlTableName)
+                .WithColumn("id").AsGuid().NotNullable().PrimaryKey("PK_" + umbracoRedirectUrlTableName)
+                .WithColumn("createDateUtc").AsDateTime().NotNullable()
+                .WithColumn("url").AsString(2048).NotNullable()
+                .WithColumn("contentKey").AsGuid().NotNullable()
+                .WithColumn("urlHash").AsString(40).NotNullable();
+
+            localContext.Create.Index("IX_" + umbracoRedirectUrlTableName).OnTable(umbracoRedirectUrlTableName)
+                .OnColumn("urlHash")
+                .Ascending()
+                .OnColumn("contentKey")
+                .Ascending()
+                .OnColumn("createDateUtc")
+                .Descending()
                .WithOptions().NonClustered();

+            localContext.Create.ForeignKey("FK_" + umbracoRedirectUrlTableName)
+                .FromTable(umbracoRedirectUrlTableName).ForeignColumn("contentKey")
+                .ToTable("umbracoNode").PrimaryColumn("uniqueID");
+
            return localContext.GetSql();
        }

@@ -1,57 +0,0 @@
-using System.Linq;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.Migrations.Syntax.Alter;
-using Umbraco.Core.Persistence.Migrations.Syntax.Create;
-using Umbraco.Core.Persistence.Migrations.Syntax.Delete;
-using Umbraco.Core.Persistence.Migrations.Syntax.Execute;
-using Umbraco.Core.Persistence.SqlSyntax;
-
-namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero
-{
-    [Migration("7.5.0", 101, GlobalSettings.UmbracoMigrationName)]
-    public class AddRedirectUrlTable2 : MigrationBase
-    {
-        public AddRedirectUrlTable2(ISqlSyntaxProvider sqlSyntax, ILogger logger)
-            : base(sqlSyntax, logger)
-        { }
-
-        public override void Up()
-        {
-            // defer, because we are making decisions based upon what's in the database
-            Execute.Code(MigrationCode);
-        }
-
-        private string MigrationCode(Database database)
-        {
-            var columns = SqlSyntax.GetColumnsInSchema(database).ToArray();
-
-            if (columns.Any(x => x.TableName.InvariantEquals("umbracoRedirectUrl") && x.ColumnName.InvariantEquals("contentKey")))
-                return null;
-
-            var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
-
-            localContext.Execute.Sql("DELETE FROM umbracoRedirectUrl"); // else cannot add non-nullable field
-
-            localContext.Delete.Column("contentId").FromTable("umbracoRedirectUrl");
-
-            // SQL CE does not want to alter-add non-nullable columns ;-(
-            // but it's OK to create as nullable then alter, go figure
-            //localContext.Alter.Table("umbracoRedirectUrl")
-            //    .AddColumn("contentKey").AsGuid().NotNullable();
-            localContext.Alter.Table("umbracoRedirectUrl")
-                .AddColumn("contentKey").AsGuid().Nullable();
-            localContext.Alter.Table("umbracoRedirectUrl")
-                .AlterColumn("contentKey").AsGuid().NotNullable();
-
-            localContext.Create.ForeignKey("FK_umbracoRedirectUrl")
-                .FromTable("umbracoRedirectUrl").ForeignColumn("contentKey")
-                .ToTable("umbracoNode").PrimaryColumn("uniqueID");
-
-            return localContext.GetSql();
-        }
-
-        public override void Down()
-        { }
-    }
-}
@@ -1,57 +0,0 @@
-using System.Linq;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.SqlSyntax;
-
-namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero
-{
-    [Migration("7.5.0", 102, GlobalSettings.UmbracoMigrationName)]
-    public class AddRedirectUrlTable3 : MigrationBase
-    {
-        public AddRedirectUrlTable3(ISqlSyntaxProvider sqlSyntax, ILogger logger)
-            : base(sqlSyntax, logger)
-        { }
-
-        public override void Up()
-        {
-            // defer, because we are making decisions based upon what's in the database
-            Execute.Code(MigrationCode);
-        }
-        private string MigrationCode(Database database)
-        {
-            var columns = SqlSyntax.GetColumnsInSchema(database).ToArray();
-
-            if (columns.Any(x => x.TableName.InvariantEquals("umbracoRedirectUrl") && x.ColumnName.InvariantEquals("hurl")))
-                return null;
-
-            var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
-
-            localContext.Execute.Sql("DELETE FROM umbracoRedirectUrl"); // else cannot add non-nullable field
-
-            localContext.Delete.Index("IX_umbracoRedirectUrl").OnTable("umbracoRedirectUrl");
-
-            // SQL CE does not want to alter-add non-nullable columns ;-(
-            // but it's OK to create as nullable then alter, go figure
-            //localContext.Alter.Table("umbracoRedirectUrl")
-            //    .AddColumn("urlHash").AsString(16).NotNullable();
-            localContext.Alter.Table("umbracoRedirectUrl")
-                .AddColumn("hurl").AsString(16).Nullable();
-            localContext.Alter.Table("umbracoRedirectUrl")
-                .AlterColumn("hurl").AsString(16).NotNullable();
-
-            localContext.Create.Index("IX_umbracoRedirectUrl").OnTable("umbracoRedirectUrl")
-                .OnColumn("hurl")
-                .Ascending()
-                .OnColumn("contentKey")
-                .Ascending()
-                .OnColumn("createDateUtc")
-                .Descending()
-                .WithOptions().NonClustered();
-
-            return localContext.GetSql();
-        }
-
-        public override void Down()
-        { }
-    }
-}
@@ -1,59 +0,0 @@
-using System.Linq;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.SqlSyntax;
-
-namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZero
-{
-    [Migration("7.5.0", 103, GlobalSettings.UmbracoMigrationName)]
-    public class AddRedirectUrlTable4 : MigrationBase
-    {
-        public AddRedirectUrlTable4(ISqlSyntaxProvider sqlSyntax, ILogger logger)
-            : base(sqlSyntax, logger)
-        { }
-
-        public override void Up()
-        {
-            // defer, because we are making decisions based upon what's in the database
-            Execute.Code(MigrationCode);
-        }
-        private string MigrationCode(Database database)
-        {
-            var columns = SqlSyntax.GetColumnsInSchema(database).ToArray();
-
-            if (columns.Any(x => x.TableName.InvariantEquals("umbracoRedirectUrl") && x.ColumnName.InvariantEquals("urlHash")))
-                return null;
-
-            var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
-
-            localContext.Execute.Sql("DELETE FROM umbracoRedirectUrl"); // else cannot add non-nullable field
-
-            localContext.Delete.Index("IX_umbracoRedirectUrl").OnTable("umbracoRedirectUrl");
-
-            localContext.Delete.Column("hurl").FromTable("umbracoRedirectUrl");
-
-            // SQL CE does not want to alter-add non-nullable columns ;-(
-            // but it's OK to create as nullable then alter, go figure
-            //localContext.Alter.Table("umbracoRedirectUrl")
-            //    .AddColumn("urlHash").AsString(16).NotNullable();
-            localContext.Alter.Table("umbracoRedirectUrl")
-                .AddColumn("urlHash").AsString(16).Nullable();
-            localContext.Alter.Table("umbracoRedirectUrl")
-                .AlterColumn("urlHash").AsString(16).NotNullable();
-
-            localContext.Create.Index("IX_umbracoRedirectUrl").OnTable("umbracoRedirectUrl")
-                .OnColumn("urlHash")
-                .Ascending()
-                .OnColumn("contentKey")
-                .Ascending()
-                .OnColumn("createDateUtc")
-                .Descending()
-                .WithOptions().NonClustered();
-
-            return localContext.GetSql();
-        }
-
-        public override void Down()
-        { }
-    }
-}
@@ -19,22 +19,32 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenFiveZer

        public override void Up()
        {
+            // defer, because we are making decisions based upon what's in the database
+            Execute.Code(MigrationCode);
+        }
+
+        private string MigrationCode(Database database)
+        {
+            var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
+            
            //Clear all stylesheet data if the tables exist
            var tables = SqlSyntax.GetTablesInSchema(Context.Database).ToArray();
            if (tables.InvariantContains("cmsStylesheetProperty"))
            {
-                Delete.FromTable("cmsStylesheetProperty").AllRows();
-                Delete.FromTable("umbracoNode").Row(new { nodeObjectType = new Guid(Constants.ObjectTypes.StylesheetProperty) });
+                localContext.Delete.FromTable("cmsStylesheetProperty").AllRows();
+                localContext.Delete.FromTable("umbracoNode").Row(new { nodeObjectType = new Guid(Constants.ObjectTypes.StylesheetProperty) });

-                Delete.Table("cmsStylesheetProperty");
+                localContext.Delete.Table("cmsStylesheetProperty");
            }
            if (tables.InvariantContains("cmsStylesheet"))
            {
-                Delete.FromTable("cmsStylesheet").AllRows();
-                Delete.FromTable("umbracoNode").Row(new { nodeObjectType = new Guid(Constants.ObjectTypes.Stylesheet) });
+                localContext.Delete.FromTable("cmsStylesheet").AllRows();
+                localContext.Delete.FromTable("umbracoNode").Row(new { nodeObjectType = new Guid(Constants.ObjectTypes.Stylesheet) });

-                Delete.Table("cmsStylesheet");
+                localContext.Delete.Table("cmsStylesheet");
            }
+
+            return localContext.GetSql();
        }

        public override void Down()
@@ -164,7 +164,7 @@ namespace Umbraco.Core.Persistence
 				connectionStringName = ConfigurationManager.ConnectionStrings[0].Name;

 			// Work out connection string and provider name
-			var providerName = "System.Data.SqlClient";
+			var providerName = Constants.DatabaseProviders.SqlServer;
 			if (ConfigurationManager.ConnectionStrings[connectionStringName] != null)
 			{
 				if (!string.IsNullOrEmpty(ConfigurationManager.ConnectionStrings[connectionStringName].ProviderName))
@@ -181,7 +181,7 @@ namespace Umbraco.Core.Persistence
 			CommonConstruct();
 		}

-		enum DBType
+		internal enum DBType
 		{
 			SqlServer,
 			SqlServerCE,
@@ -726,6 +726,42 @@ namespace Umbraco.Core.Persistence
 			return true;
 		}

+	    /// <summary>
+	    /// NOTE: This is a custom mod of PetaPoco!! This builds the paging sql for different db providers
+	    /// </summary>
+	    /// <param name="sql"></param>
+	    /// <param name="sqlSelectRemoved"></param>
+	    /// <param name="sqlOrderBy"></param>
+	    /// <param name="args"></param>
+	    /// <param name="sqlPage"></param>
+	    /// <param name="databaseType"></param>
+	    /// <param name="skip"></param>
+	    /// <param name="take"></param>
+	    internal virtual void BuildSqlDbSpecificPagingQuery(DBType databaseType, long skip, long take, string sql, string sqlSelectRemoved, string sqlOrderBy, ref object[] args, out string sqlPage)
+	    {
+            if (databaseType == DBType.SqlServer || databaseType == DBType.Oracle)
+            {
+                sqlSelectRemoved = rxOrderBy.Replace(sqlSelectRemoved, "");
+                if (rxDistinct.IsMatch(sqlSelectRemoved))
+                {
+                    sqlSelectRemoved = "peta_inner.* FROM (SELECT " + sqlSelectRemoved + ") peta_inner";
+                }
+                sqlPage = string.Format("SELECT * FROM (SELECT ROW_NUMBER() OVER ({0}) peta_rn, {1}) peta_paged WHERE peta_rn>@{2} AND peta_rn<=@{3}",
+                                        sqlOrderBy == null ? "ORDER BY (SELECT NULL)" : sqlOrderBy, sqlSelectRemoved, args.Length, args.Length + 1);
+                args = args.Concat(new object[] { skip, skip + take }).ToArray();
+            }
+            else if (databaseType == DBType.SqlServerCE)
+            {
+                sqlPage = string.Format("{0}\nOFFSET @{1} ROWS FETCH NEXT @{2} ROWS ONLY", sql, args.Length, args.Length + 1);
+                args = args.Concat(new object[] { skip, take }).ToArray();
+            }
+            else
+            {
+                sqlPage = string.Format("{0}\nLIMIT @{1} OFFSET @{2}", sql, args.Length, args.Length + 1);
+                args = args.Concat(new object[] { take, skip }).ToArray();
+            }
+        }
+
 		public void BuildPageQueries<T>(long skip, long take, string sql, ref object[] args, out string sqlCount, out string sqlPage)
 		{
 			// Add auto select clause
@@ -734,34 +770,12 @@ namespace Umbraco.Core.Persistence

 			// Split the SQL into the bits we need
 			string sqlSelectRemoved, sqlOrderBy;
-			if (!SplitSqlForPaging(sql, out sqlCount, out sqlSelectRemoved, out sqlOrderBy))
+			if (SplitSqlForPaging(sql, out sqlCount, out sqlSelectRemoved, out sqlOrderBy) == false)
 				throw new Exception("Unable to parse SQL statement for paged query");
 			if (_dbType == DBType.Oracle && sqlSelectRemoved.StartsWith("*"))
                throw new Exception("Query must alias '*' when performing a paged query.\neg. select t.* from table t order by t.id");
-
-			// Build the SQL for the actual final result
-			if (_dbType == DBType.SqlServer || _dbType == DBType.Oracle)
-			{
-				sqlSelectRemoved = rxOrderBy.Replace(sqlSelectRemoved, "");
-				if (rxDistinct.IsMatch(sqlSelectRemoved))
-				{
-					sqlSelectRemoved = "peta_inner.* FROM (SELECT " + sqlSelectRemoved + ") peta_inner";
-				}
-				sqlPage = string.Format("SELECT * FROM (SELECT ROW_NUMBER() OVER ({0}) peta_rn, {1}) peta_paged WHERE peta_rn>@{2} AND peta_rn<=@{3}",
-										sqlOrderBy==null ? "ORDER BY (SELECT NULL)" : sqlOrderBy, sqlSelectRemoved, args.Length, args.Length + 1);
-				args = args.Concat(new object[] { skip, skip+take }).ToArray();
-			}
-			else if (_dbType == DBType.SqlServerCE)
-			{
-				sqlPage = string.Format("{0}\nOFFSET @{1} ROWS FETCH NEXT @{2} ROWS ONLY", sql, args.Length, args.Length + 1);
-				args = args.Concat(new object[] { skip, take }).ToArray();
-			}
-			else
-			{
-				sqlPage = string.Format("{0}\nLIMIT @{1} OFFSET @{2}", sql, args.Length, args.Length + 1);
-				args = args.Concat(new object[] { take, skip }).ToArray();
-			}
-
+            
+		    BuildSqlDbSpecificPagingQuery(_dbType, skip, take, sql, sqlSelectRemoved, sqlOrderBy, ref args, out sqlPage);
 		}

 		// Fetch a page
@@ -2315,8 +2329,8 @@ namespace Umbraco.Core.Persistence


 		// Member variables
-		string _connectionString;
-		string _providerName;
+	    readonly string _connectionString;
+	    readonly string _providerName;
 		DbProviderFactory _factory;
 		IDbConnection _sharedConnection;
 		IDbTransaction _transaction;
@@ -203,7 +203,8 @@ namespace Umbraco.Core.Persistence
            {
                //if it is sql ce or it is a sql server version less than 2008, we need to do individual inserts.
                var sqlServerSyntax = SqlSyntaxContext.SqlSyntaxProvider as SqlServerSyntaxProvider;
-                if ((sqlServerSyntax != null && (int)sqlServerSyntax.VersionName.Value < (int)SqlServerVersionName.V2008) 
+
+                if ((sqlServerSyntax != null && (int)sqlServerSyntax.GetVersionName(db) < (int)SqlServerVersionName.V2008) 
                    || SqlSyntaxContext.SqlSyntaxProvider is SqlCeSyntaxProvider)
                {
                    //SqlCe doesn't support bulk insert statements!
@@ -77,7 +77,8 @@ namespace Umbraco.Core.Persistence
            var type = typeof(TColumn);
            var tableName = type.GetTableName();

-            var syntax = string.Format("{0}.{1} DESC",
+            //need to ensure the order by is in brackets, see: https://github.com/toptensoftware/PetaPoco/issues/177
+            var syntax = string.Format("({0}.{1}) DESC",
                sqlSyntax.GetQuotedTableName(tableName),
                sqlSyntax.GetQuotedColumnName(columnName));

@@ -440,6 +440,55 @@ namespace Umbraco.Core.Persistence.Querying
                    }

                    return HandleStringComparison(visitedObjectForMethod, compareValue, m.Method.Name, colType);
+
+                case "Replace":
+                    string searchValue;
+
+                    if (methodArgs[0].NodeType != ExpressionType.Constant)
+                    {
+                        //This occurs when we are getting a value from a non constant such as: x => x.Path.StartsWith(content.Path)
+                        // So we'll go get the value:
+                        var member = Expression.Convert(methodArgs[0], typeof(object));
+                        var lambda = Expression.Lambda<Func<object>>(member);
+                        var getter = lambda.Compile();
+                        searchValue = getter().ToString();
+                    }
+                    else
+                    {
+                        searchValue = methodArgs[0].ToString();
+                    }
+
+                    if (methodArgs[0].Type != typeof(string) && TypeHelper.IsTypeAssignableFrom<IEnumerable>(methodArgs[0].Type))
+                    {
+                        throw new NotSupportedException("An array Contains method is not supported");
+                    }
+
+                    string replaceValue;
+
+                    if (methodArgs[1].NodeType != ExpressionType.Constant)
+                    {
+                        //This occurs when we are getting a value from a non constant such as: x => x.Path.StartsWith(content.Path)
+                        // So we'll go get the value:
+                        var member = Expression.Convert(methodArgs[1], typeof(object));
+                        var lambda = Expression.Lambda<Func<object>>(member);
+                        var getter = lambda.Compile();
+                        replaceValue = getter().ToString();
+                    }
+                    else
+                    {
+                        replaceValue = methodArgs[1].ToString();
+                    }
+
+                    if (methodArgs[1].Type != typeof(string) && TypeHelper.IsTypeAssignableFrom<IEnumerable>(methodArgs[1].Type))
+                    {
+                        throw new NotSupportedException("An array Contains method is not supported");
+                    }
+
+                    SqlParameters.Add(RemoveQuote(searchValue));
+
+                    SqlParameters.Add(RemoveQuote(replaceValue));
+
+                    return string.Format("replace({0}, @{1}, @{2})", visitedObjectForMethod, SqlParameters.Count - 2, SqlParameters.Count - 1);
                //case "Substring":
                //    var startIndex = Int32.Parse(args[0].ToString()) + 1;
                //    if (args.Count == 2)
@@ -501,7 +550,7 @@ namespace Umbraco.Core.Persistence.Querying
                //case "As":
                //    return string.Format("{0} As {1}", r,
                //                                GetQuotedColumnName(RemoveQuoteFromAlias(RemoveQuote(args[0].ToString()))));
-                
+
                default:

                    throw new ArgumentOutOfRangeException("No logic supported for " + m.Method.Name);
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Dynamics;
@@ -63,9 +64,9 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false)
                .Where(GetBaseWhereClause(), new { Id = id })
                .Where<DocumentDto>(x => x.Newest)
-                .OrderByDescending<ContentVersionDto>(x => x.VersionDate);
+                .OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);

-            var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto, DocumentPublishedReadOnlyDto>(sql).FirstOrDefault();
+            var dto = Database.Fetch<DocumentDto, ContentVersionDto, ContentDto, NodeDto, DocumentPublishedReadOnlyDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();

            if (dto == null)
                return null;
@@ -688,6 +689,77 @@ namespace Umbraco.Core.Persistence.Repositories
            }
        }

+
+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        public XmlDocument BuildXmlCache()
+        {
+            //TODO: This is what we should do , but converting to use XDocument would be breaking unless we convert
+            // to XmlDocument at the end of this, but again, this would be bad for memory... though still not nearly as
+            // bad as what is happening before!
+            // We'll keep using XmlDocument for now though, but XDocument xml generation is much faster:
+            // https://blogs.msdn.microsoft.com/codejunkie/2008/10/08/xmldocument-vs-xelement-performance/
+            // I think we already have code in here to convert XDocument to XmlDocument but in case we don't here
+            // it is: https://blogs.msdn.microsoft.com/marcelolr/2009/03/13/fast-way-to-convert-xmldocument-into-xdocument/
+
+            //// Prepare an XmlDocument with an appropriate inline DTD to match
+            //// the expected content
+            //var parent = new XElement("root", new XAttribute("id", "-1"));
+            //var xmlDoc = new XDocument(
+            //    new XDocumentType("root", null, null, DocumentType.GenerateDtd()),
+            //    parent);
+
+            var xmlDoc = new XmlDocument();
+            var doctype = xmlDoc.CreateDocumentType("root", null, null,
+                ApplicationContext.Current.Services.ContentTypeService.GetContentTypesDtd());
+            xmlDoc.AppendChild(doctype);
+            var parent = xmlDoc.CreateElement("root");
+            var pIdAtt = xmlDoc.CreateAttribute("id");
+            pIdAtt.Value = "-1";
+            parent.Attributes.Append(pIdAtt);
+            xmlDoc.AppendChild(parent);
+
+            const string sql = @"select umbracoNode.id, umbracoNode.parentID, umbracoNode.sortOrder, cmsContentXml.xml, umbracoNode.level from umbracoNode
+inner join cmsContentXml on cmsContentXml.nodeId = umbracoNode.id and umbracoNode.nodeObjectType = @type
+where umbracoNode.id in (select cmsDocument.nodeId from cmsDocument where cmsDocument.published = 1)
+order by umbracoNode.level, umbracoNode.parentID, umbracoNode.sortOrder";
+
+            XmlElement last = null;
+
+            //NOTE: Query creates a reader - does not load all into memory
+            foreach (var row in Database.Query<dynamic>(sql, new { type = new Guid(Constants.ObjectTypes.Document) }))
+            {
+                string parentId = ((int)row.parentID).ToInvariantString();
+                string xml = row.xml;
+                int sortOrder = row.sortOrder;
+
+                //if the parentid is changing
+                if (last != null && last.GetAttribute("parentID") != parentId)
+                {
+                    parent = xmlDoc.GetElementById(parentId);
+                    if (parent == null)
+                    {
+                        //Need to short circuit here, if the parent is not there it means that the parent is unpublished
+                        // and therefore the child is not published either so cannot be included in the xml cache
+                        continue;
+                    }
+                }
+
+                var xmlDocFragment = xmlDoc.CreateDocumentFragment();
+                xmlDocFragment.InnerXml = xml;
+
+                last = (XmlElement)parent.AppendChild(xmlDocFragment);
+
+                // fix sortOrder - see notes in UpdateSortOrder
+                last.Attributes["sortOrder"].Value = sortOrder.ToInvariantString();
+            }
+
+            return xmlDoc;
+
+        }
+
        public int CountPublished()
        {
            var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
@@ -251,8 +251,8 @@ AND umbracoNode.id <> @id",
            var nodeDto = dto.NodeDto;
            Database.Update(nodeDto);

+            // look up ContentType entry to get PrimaryKey for updating the DTO
            // fixme - why? we are UPDATING so we should ALREADY have a PK!
-            //Look up ContentType entry to get PrimaryKey for updating the DTO
            var dtoPk = Database.First<ContentTypeDto>("WHERE nodeId = @Id", new { Id = entity.Id });
            dto.PrimaryKey = dtoPk.PrimaryKey;
            Database.Update(dto);
@@ -262,31 +262,30 @@ AND umbracoNode.id <> @id",
            foreach (var composition in entity.ContentTypeComposition)
                Database.Insert(new ContentType2ContentTypeDto { ParentId = composition.Id, ChildId = entity.Id });

-            //Removing a ContentType from a composition (U4-1690)
-            //1. Find content based on the current ContentType: entity.Id
-            //2. Find all PropertyTypes on the ContentType that was removed - tracked id (key)
-            //3. Remove properties based on property types from the removed content type where the content ids correspond to those found in step one
+            // removing a ContentType from a composition (U4-1690)
+            // 1. Find content based on the current ContentType: entity.Id
+            // 2. Find all PropertyTypes on the ContentType that was removed - tracked id (key)
+            // 3. Remove properties based on property types from the removed content type where the content ids correspond to those found in step one
            var compositionBase = entity as ContentTypeCompositionBase;
            if (compositionBase != null && compositionBase.RemovedContentTypeKeyTracker != null &&
                compositionBase.RemovedContentTypeKeyTracker.Any())
            {
-                //Find Content based on the current ContentType
+                // find Content based on the current ContentType
                var sql = new Sql();
                sql.Select("*")
-                   .From<ContentDto>()
-                   .InnerJoin<NodeDto>()
-                   .On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                   .From<ContentDto>(SqlSyntax)
+                   .InnerJoin<NodeDto>(SqlSyntax).On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                   .Where<NodeDto>(x => x.NodeObjectType == new Guid(Constants.ObjectTypes.Document))
                   .Where<ContentDto>(x => x.ContentTypeId == entity.Id);
-
                var contentDtos = Database.Fetch<ContentDto, NodeDto>(sql);
-                //Loop through all tracked keys, which corresponds to the ContentTypes that has been removed from the composition
+
+                // loop through all tracked keys, which corresponds to the ContentTypes that has been removed from the composition
                foreach (var key in compositionBase.RemovedContentTypeKeyTracker)
                {
-                    //Find PropertyTypes for the removed ContentType
+                    // find PropertyTypes for the removed ContentType
                    var propertyTypes = Database.Fetch<PropertyTypeDto>("WHERE contentTypeId = @Id", new { Id = key });
-                    //Loop through the Content that is based on the current ContentType in order to remove the Properties that are
-                    //based on the PropertyTypes that belong to the removed ContentType.
+                    // loop through the Content that is based on the current ContentType in order to remove the Properties that are
+                    // based on the PropertyTypes that belong to the removed ContentType.
                    foreach (var contentDto in contentDtos)
                    {
                        foreach (var propertyType in propertyTypes)
@@ -294,51 +293,47 @@ AND umbracoNode.id <> @id",
                            var nodeId = contentDto.NodeId;
                            var propertyTypeId = propertyType.Id;
                            var propertySql = new Sql().Select("cmsPropertyData.id")
-                                                       .From<PropertyDataDto>()
-                                                       .InnerJoin<PropertyTypeDto>()
-                                                       .On<PropertyDataDto, PropertyTypeDto>(
-                                                           left => left.PropertyTypeId, right => right.Id)
-                                                       .Where<PropertyDataDto>(x => x.NodeId == nodeId)
-                                                       .Where<PropertyTypeDto>(x => x.Id == propertyTypeId);
+                                .From<PropertyDataDto>(SqlSyntax)
+                                .InnerJoin<PropertyTypeDto>(SqlSyntax).On<PropertyDataDto, PropertyTypeDto>(SqlSyntax, left => left.PropertyTypeId, right => right.Id)
+                                .Where<PropertyDataDto>(x => x.NodeId == nodeId)
+                                .Where<PropertyTypeDto>(x => x.Id == propertyTypeId);

-                            //Finally delete the properties that match our criteria for removing a ContentType from the composition
+                            // finally delete the properties that match our criteria for removing a ContentType from the composition
                            Database.Delete<PropertyDataDto>(new Sql("WHERE id IN (" + propertySql.SQL + ")", propertySql.Arguments));
                        }
                    }
                }
            }

-            //Delete the allowed content type entries before adding the updated collection
-            Database.Delete<ContentTypeAllowedContentTypeDto>("WHERE Id = @Id", new { Id = entity.Id });
-            //Insert collection of allowed content types
+            // delete the allowed content type entries before re-inserting the collectino of allowed content types
+            Database.Delete<ContentTypeAllowedContentTypeDto>("WHERE Id = @Id", new { entity.Id });
            foreach (var allowedContentType in entity.AllowedContentTypes)
            {
                Database.Insert(new ContentTypeAllowedContentTypeDto
-                                    {
-                                        Id = entity.Id,
-                                        AllowedId = allowedContentType.Id.Value,
-                                        SortOrder = allowedContentType.SortOrder
-                                    });
+                {
+                    Id = entity.Id,
+                    AllowedId = allowedContentType.Id.Value,
+                    SortOrder = allowedContentType.SortOrder
+                });
            }

+            // FIXME below, manage the property types

-            if (((ICanBeDirty)entity).IsPropertyDirty("PropertyTypes") || entity.PropertyTypes.Any(x => x.IsDirty()))
+            // delete ??? fixme wtf is this?!
+            // by excepting entries from db with entries from collections
+            if (entity.IsPropertyDirty("PropertyTypes") || entity.PropertyTypes.Any(x => x.IsDirty()))
            {
-                //Delete PropertyTypes by excepting entries from db with entries from collections
                var dbPropertyTypes = Database.Fetch<PropertyTypeDto>("WHERE contentTypeId = @Id", new { Id = entity.Id });
                var dbPropertyTypeAlias = dbPropertyTypes.Select(x => x.Id);
                var entityPropertyTypes = entity.PropertyTypes.Where(x => x.HasIdentity).Select(x => x.Id);
                var items = dbPropertyTypeAlias.Except(entityPropertyTypes);
                foreach (var item in items)
-                {
-                    //Before a PropertyType can be deleted, all Properties based on that PropertyType should be deleted.
-                    Database.Delete<TagRelationshipDto>("WHERE propertyTypeId = @Id", new { Id = item });
-                    Database.Delete<PropertyDataDto>("WHERE propertytypeid = @Id", new { Id = item });
-                    Database.Delete<PropertyTypeDto>("WHERE contentTypeId = @Id AND id = @PropertyTypeId",
-                                                     new { Id = entity.Id, PropertyTypeId = item });
-                }
+                    DeletePropertyType(entity.Id, item);
            }

+            // delete tabs
+            // by excepting entries from db with entries from collections
+            List<int> orphanPropertyTypeIds = null;
            if (entity.IsPropertyDirty("PropertyGroups") || entity.PropertyGroups.Any(x => x.IsDirty()))
            {
                // todo
@@ -357,68 +352,97 @@ AND umbracoNode.id <> @id",
                // (all gone)

                // delete tabs that do not exist anymore
-                // get the tabs that are currently existing (in the db)
-                // get the tabs that we want, now
-                // and derive the tabs that we want to delete
+                // get the tabs that are currently existing (in the db), get the tabs that we want,
+                // now, and derive the tabs that we want to delete
                var existingPropertyGroups = Database.Fetch<PropertyTypeGroupDto>("WHERE contentTypeNodeId = @id", new { id = entity.Id })
                    .Select(x => x.Id)
                    .ToList();
                var newPropertyGroups = entity.PropertyGroups.Select(x => x.Id).ToList();
-                var tabsToDelete = existingPropertyGroups
+                var groupsToDelete = existingPropertyGroups
                    .Except(newPropertyGroups)
                    .ToArray();

-                // move properties to generic properties, and delete the tabs
-                if (tabsToDelete.Length > 0)
+                // delete the tabs
+                if (groupsToDelete.Length > 0)
                {
-                    Database.Update<PropertyTypeDto>("SET propertyTypeGroupId=NULL WHERE propertyTypeGroupId IN (@ids)", new { ids = tabsToDelete });
-                    Database.Delete<PropertyTypeGroupDto>("WHERE id IN (@ids)", new { ids = tabsToDelete });
+                    // if the tab contains properties, take care of them
+                    // - move them to 'generic properties' so they remain consistent
+                    // - keep track of them, later on we'll figure out what to do with them
+                    // see http://issues.umbraco.org/issue/U4-8663
+                    orphanPropertyTypeIds = Database.Fetch<PropertyTypeDto>("WHERE propertyTypeGroupId IN (@ids)", new { ids = groupsToDelete })
+                        .Select(x => x.Id).ToList();
+                    Database.Update<PropertyTypeDto>("SET propertyTypeGroupId=NULL WHERE propertyTypeGroupId IN (@ids)", new { ids = groupsToDelete });
+
+                    // now we can delete the tabs
+                    Database.Delete<PropertyTypeGroupDto>("WHERE id IN (@ids)", new { ids = groupsToDelete });
                }
            }
+
            var propertyGroupFactory = new PropertyGroupFactory(entity.Id);

-            //Run through all groups to insert or update entries
+            // insert or update groups, assign properties
            foreach (var propertyGroup in entity.PropertyGroups)
            {
-                var tabDto = propertyGroupFactory.BuildGroupDto(propertyGroup);
-                int groupPrimaryKey = propertyGroup.HasIdentity
-                                          ? Database.Update(tabDto)
-                                          : Convert.ToInt32(Database.Insert(tabDto));
+                // insert or update group
+                var groupDto = propertyGroupFactory.BuildGroupDto(propertyGroup);
+                var groupId = propertyGroup.HasIdentity
+                    ? Database.Update(groupDto)
+                    : Convert.ToInt32(Database.Insert(groupDto));
                if (propertyGroup.HasIdentity == false)
-                    propertyGroup.Id = groupPrimaryKey; //Set Id on new PropertyGroup
+                    propertyGroup.Id = groupId;
+                else
+                    groupId = propertyGroup.Id;

-                //Ensure that the PropertyGroup's Id is set on the PropertyTypes within a group
-                //unless the PropertyGroupId has already been changed.
+                // assign properties to the group
+                // (all of them, even those that have .IsPropertyDirty("PropertyGroupId") == true,
+                //  because it should have been set to this group anyways and better be safe)
                foreach (var propertyType in propertyGroup.PropertyTypes)
-                {
-                    if (propertyType.IsPropertyDirty("PropertyGroupId") == false)
-                    {
-                        var tempGroup = propertyGroup;
-                        propertyType.PropertyGroupId = new Lazy<int>(() => tempGroup.Id);
-                    }
-                }
+                    propertyType.PropertyGroupId = new Lazy<int>(() => groupId);
            }

-            //Run through all PropertyTypes to insert or update entries
+            // insert or update properties
+            // all of them, no-group and in groups
            foreach (var propertyType in entity.PropertyTypes)
            {
-                var tabId = propertyType.PropertyGroupId != null ? propertyType.PropertyGroupId.Value : default(int);
-                //If the Id of the DataType is not set, we resolve it from the db by its PropertyEditorAlias
-                if (propertyType.DataTypeDefinitionId == 0 || propertyType.DataTypeDefinitionId == default(int))
-                {
-                    AssignDataTypeFromPropertyEditor(propertyType);
-                }
+                var groupId = propertyType.PropertyGroupId != null ? propertyType.PropertyGroupId.Value : default(int);

-                //validate the alias!
+                // if the Id of the DataType is not set, we resolve it from the db by its PropertyEditorAlias
+                if (propertyType.DataTypeDefinitionId == 0 || propertyType.DataTypeDefinitionId == default(int))
+                    AssignDataTypeFromPropertyEditor(propertyType);
+
+                // validate the alias
                ValidateAlias(propertyType);

-                var propertyTypeDto = propertyGroupFactory.BuildPropertyTypeDto(tabId, propertyType);
-                int typePrimaryKey = propertyType.HasIdentity
-                                         ? Database.Update(propertyTypeDto)
-                                         : Convert.ToInt32(Database.Insert(propertyTypeDto));
+                // insert or update property
+                var propertyTypeDto = propertyGroupFactory.BuildPropertyTypeDto(groupId, propertyType);
+                var typeId = propertyType.HasIdentity
+                    ? Database.Update(propertyTypeDto)
+                    : Convert.ToInt32(Database.Insert(propertyTypeDto));
                if (propertyType.HasIdentity == false)
-                    propertyType.Id = typePrimaryKey; //Set Id on new PropertyType
+                    propertyType.Id = typeId;
+                else
+                    typeId = propertyType.Id;
+
+                // not an orphan anymore
+                if (orphanPropertyTypeIds != null)
+                    orphanPropertyTypeIds.Remove(typeId);
            }
+
+            // deal with orphan properties: those that were in a deleted tab,
+            // and have not been re-mapped to another tab or to 'generic properties'
+            if (orphanPropertyTypeIds != null)
+                foreach (var id in orphanPropertyTypeIds)
+                    DeletePropertyType(entity.Id, id);
+        }
+
+        private void DeletePropertyType(int contentTypeId, int propertyTypeId)
+        {
+            // first clear dependencies
+            Database.Delete<TagRelationshipDto>("WHERE propertyTypeId = @Id", new { Id = propertyTypeId });
+            Database.Delete<PropertyDataDto>("WHERE propertytypeid = @Id", new { Id = propertyTypeId });
+
+            // then delete the property type
+            Database.Delete<PropertyTypeDto>("WHERE contentTypeId = @Id AND id = @PropertyTypeId", new { Id = contentTypeId, PropertyTypeId = propertyTypeId });
        }

        protected IEnumerable<ContentTypeSort> GetAllowedContentTypeIds(int id)
@@ -649,7 +673,7 @@ AND umbracoNode.id <> @id",
                        var allParentContentTypes = contentTypes.Where(x => allParentIdsAsArray.Contains(x.Id)).ToArray();

                        foreach (var contentType in contentTypes)
-                        {                            
+                        {
                            var entityId = contentType.Id;

                            var parentContentTypes = allParentContentTypes.Where(x =>
@@ -714,10 +738,10 @@ AND umbracoNode.id <> @id",
                out IDictionary<int, List<int>> parentMediaTypeIds)
            {
                Mandate.ParameterNotNull(db, "db");
-                
+
                var sql = @"SELECT cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc,
                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
-                                AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,		                        
+                                AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,
                                ParentTypes.parentContentTypeId as chtParentId, ParentTypes.parentContentTypeKey as chtParentKey,
                                umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
 		                        umbracoNode.parentID as nParentId, umbracoNode." + sqlSyntax.GetQuotedColumnName("path") + @" as nPath, umbracoNode.sortOrder as nSortOrder, umbracoNode." + sqlSyntax.GetQuotedColumnName("text") + @" as nName, umbracoNode.trashed as nTrashed,
@@ -741,7 +765,7 @@ AND umbracoNode.id <> @id",
                        ON ParentTypes.childContentTypeId = cmsContentType.nodeId
                        WHERE (umbracoNode.nodeObjectType = @nodeObjectType)
                        ORDER BY ctId";
-                
+
                var result = db.Fetch<dynamic>(sql, new { nodeObjectType = new Guid(Constants.ObjectTypes.MediaType) });

                if (result.Any() == false)
@@ -848,16 +872,16 @@ AND umbracoNode.id <> @id",
                return mediaType;
            }

-            internal static IEnumerable<IContentType> MapContentTypes(Database db, ISqlSyntaxProvider sqlSyntax,                
+            internal static IEnumerable<IContentType> MapContentTypes(Database db, ISqlSyntaxProvider sqlSyntax,
                out IDictionary<int, List<AssociatedTemplate>> associatedTemplates,
                out IDictionary<int, List<int>> parentContentTypeIds)
            {
                Mandate.ParameterNotNull(db, "db");
-                
+
                var sql = @"SELECT cmsDocumentType.IsDefault as dtIsDefault, cmsDocumentType.templateNodeId as dtTemplateId,
                                cmsContentType.pk as ctPk, cmsContentType.alias as ctAlias, cmsContentType.allowAtRoot as ctAllowAtRoot, cmsContentType.description as ctDesc,
                                cmsContentType.icon as ctIcon, cmsContentType.isContainer as ctIsContainer, cmsContentType.nodeId as ctId, cmsContentType.thumbnail as ctThumb,
-                                AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,		                        
+                                AllowedTypes.AllowedId as ctaAllowedId, AllowedTypes.SortOrder as ctaSortOrder, AllowedTypes.alias as ctaAlias,
                                ParentTypes.parentContentTypeId as chtParentId,ParentTypes.parentContentTypeKey as chtParentKey,
                                umbracoNode.createDate as nCreateDate, umbracoNode." + sqlSyntax.GetQuotedColumnName("level") + @" as nLevel, umbracoNode.nodeObjectType as nObjectType, umbracoNode.nodeUser as nUser,
 		                        umbracoNode.parentID as nParentId, umbracoNode." + sqlSyntax.GetQuotedColumnName("path") + @" as nPath, umbracoNode.sortOrder as nSortOrder, umbracoNode." + sqlSyntax.GetQuotedColumnName("text") + @" as nName, umbracoNode.trashed as nTrashed,
@@ -890,7 +914,7 @@ AND umbracoNode.id <> @id",
                        ON ParentTypes.childContentTypeId = cmsContentType.nodeId
                        WHERE (umbracoNode.nodeObjectType = @nodeObjectType)
                        ORDER BY ctId";
-                
+
                var result = db.Fetch<dynamic>(sql, new { nodeObjectType = new Guid(Constants.ObjectTypes.DocumentType)});

                if (result.Any() == false)
@@ -911,7 +935,7 @@ AND umbracoNode.id <> @id",
                {
                    var ct = queue.Dequeue();

-                    //check for default templates                    
+                    //check for default templates
                    bool? isDefaultTemplate = Convert.ToBoolean(ct.dtIsDefault);
                    int? templateId = ct.dtTemplateId;
                    if (currDefaultTemplate == -1 && isDefaultTemplate.HasValue && isDefaultTemplate.Value && templateId.HasValue)
@@ -41,7 +41,7 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            var sql = GetBaseQuery(false).Where(GetBaseWhereClause(), new { id = id, NodeObjectType = NodeObjectTypeId });

-            var nodeDto = Database.Fetch<NodeDto>(sql).FirstOrDefault();
+            var nodeDto = Database.Fetch<NodeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
            return nodeDto == null ? null : CreateEntity(nodeDto);
        }

@@ -58,12 +58,12 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var macroDto = Database.Fetch<ExternalLoginDto>(sql).FirstOrDefault();
-            if (macroDto == null)
+            var dto = Database.Fetch<ExternalLoginDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
+            if (dto == null)
                return null;

            var factory = new ExternalLoginFactory();
-            var entity = factory.BuildEntity(macroDto);
+            var entity = factory.BuildEntity(dto);

            //on initial construction we don't want to have dirty properties tracked
            // http://issues.umbraco.org/issue/U4-1946
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq.Expressions;
+using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
@@ -11,6 +12,12 @@ namespace Umbraco.Core.Persistence.Repositories
 {
    public interface IContentRepository : IRepositoryVersionable<int, IContent>, IRecycleBinRepository<IContent>, IDeleteMediaFilesRepository
    {
+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        XmlDocument BuildXmlCache();
+
        /// <summary>
        /// Get the count of published items
        /// </summary>
@@ -7,7 +7,7 @@ namespace Umbraco.Core.Persistence.Repositories
    /// <summary>
    /// Defines the <see cref="IRedirectUrl"/> repository.
    /// </summary>
-    public interface IRedirectUrlRepository : IRepositoryQueryable<int, IRedirectUrl>
+    public interface IRedirectUrlRepository : IRepositoryQueryable<Guid, IRedirectUrl>
    {
        /// <summary>
        /// Gets a redirect url.
@@ -21,7 +21,7 @@ namespace Umbraco.Core.Persistence.Repositories
        /// Deletes a redirect url.
        /// </summary>
        /// <param name="id">The redirect url identifier.</param>
-        void Delete(int id);
+        void Delete(Guid id);

        /// <summary>
        /// Deletes all redirect urls.
@@ -66,5 +66,15 @@ namespace Umbraco.Core.Persistence.Repositories
        /// <param name="total">The total count of redirect urls.</param>
        /// <returns>The redirect urls.</returns>
        IEnumerable<IRedirectUrl> GetAllUrls(int rootContentId, long pageIndex, int pageSize, out long total);
+
+        /// <summary>
+        /// Searches for all redirect urls that contain a given search term in their URL property.
+        /// </summary>
+        /// <param name="searchTerm">The term to search for.</param>
+        /// <param name="pageIndex">The page index.</param>
+        /// <param name="pageSize">The page size.</param>
+        /// <param name="total">The total count of redirect urls.</param>
+        /// <returns>The redirect urls.</returns>
+        IEnumerable<IRedirectUrl> SearchUrls(string searchTerm, long pageIndex, int pageSize, out long total);
    }
 }
@@ -52,9 +52,9 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });
-            sql.OrderByDescending<ContentVersionDto>(x => x.VersionDate);
+            sql.OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);

-            var dto = Database.Fetch<ContentVersionDto, ContentDto, NodeDto>(sql).FirstOrDefault();
+            var dto = Database.Fetch<ContentVersionDto, ContentDto, NodeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();

            if (dto == null)
                return null;
@@ -413,6 +413,8 @@ namespace Umbraco.Core.Persistence.Repositories
            {
                foreach (var property in entity.Properties)
                {
+                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
+
                    property.Id = keyDictionary[property.PropertyTypeId];
                }
            }
@@ -453,8 +455,16 @@ namespace Umbraco.Core.Persistence.Repositories
            Func<Tuple<string, object[]>> filterCallback = null;
            if (filter.IsNullOrWhiteSpace() == false)
            {
-                sbWhere.Append("AND (umbracoNode." + SqlSyntax.GetQuotedColumnName("text") + " LIKE @" + args.Count + ")");
+                sbWhere
+                    .Append("AND (")
+                    .Append(SqlSyntax.GetQuotedTableName("umbracoNode"))
+                    .Append(".")
+                    .Append(SqlSyntax.GetQuotedColumnName("text"))
+                    .Append(" LIKE @")
+                    .Append(args.Count)
+                    .Append(")");
                args.Add("%" + filter + "%");
+
                filterCallback = () => new Tuple<string, object[]>(sbWhere.ToString().Trim(), args.ToArray());
            }

@@ -32,7 +32,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var dto = Database.Fetch<NodeDto>(sql).FirstOrDefault();
+            var dto = Database.Fetch<NodeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();

            return dto == null ? null : _modelFactory.BuildEntity(dto);
        }
@@ -52,9 +52,9 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });
-            sql.OrderByDescending<ContentVersionDto>(x => x.VersionDate);
+            sql.OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);

-            var dto = Database.Fetch<MemberDto, ContentVersionDto, ContentDto, NodeDto>(sql).FirstOrDefault();
+            var dto = Database.Fetch<MemberDto, ContentVersionDto, ContentDto, NodeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();

            if (dto == null)
                return null;
@@ -365,6 +365,8 @@ namespace Umbraco.Core.Persistence.Repositories
            {
                foreach (var property in ((Member)entity).Properties)
                {
+                    if (keyDictionary.ContainsKey(property.PropertyTypeId) == false) continue;
+
                    property.Id = keyDictionary[property.PropertyTypeId];
                }
            }
@@ -622,9 +624,32 @@ namespace Umbraco.Core.Persistence.Repositories
            Func<Tuple<string, object[]>> filterCallback = null;
            if (filter.IsNullOrWhiteSpace() == false)
            {
-                sbWhere.Append("AND ((umbracoNode. " + SqlSyntax.GetQuotedColumnName("text") + " LIKE @" + args.Count + ") " +
-                                "OR (cmsMember.LoginName LIKE @0" + args.Count + "))");
-                args.Add("%" + filter + "%");
+                //This will build up the where clause - even though the same 'filter' is being
+                //applied to both columns, the parameters values passed to PetaPoco need to be 
+                //duplicated, otherwise it gets confused :/ 
+                var columnFilters = new List<Tuple<string, string>>
+                {
+                    new Tuple<string, string>("umbracoNode", "text"),
+                    new Tuple<string, string>("cmsMember", "LoginName")
+                };
+                sbWhere.Append("AND (");
+                for (int i = 0; i < columnFilters.Count; i++)
+                {
+                    sbWhere
+                        .Append("(")
+                        .Append(SqlSyntax.GetQuotedTableName(columnFilters[i].Item1))
+                        .Append(".")
+                        .Append(SqlSyntax.GetQuotedColumnName(columnFilters[i].Item2))
+                        .Append(" LIKE @")
+                        .Append(args.Count)
+                        .Append(") ");
+                    args.Add(string.Format("%{0}%", filter));
+                    if (i < (columnFilters.Count - 1))
+                    {
+                        sbWhere.Append("OR ");
+                    }
+                }
+                sbWhere.Append(")");
                filterCallback = () => new Tuple<string, object[]>(sbWhere.ToString().Trim(), args.ToArray());
            }

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var dto = Database.First<MigrationDto>(sql);
+            var dto = Database.Fetch<MigrationDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
            if (dto == null)
                return null;

@@ -17,8 +17,7 @@ namespace Umbraco.Core.Persistence.Repositories
    {
        public PublicAccessRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
            : base(work, cache, logger, sqlSyntax)
-        {            
-        }
+        { }

        private FullDataSetRepositoryCachePolicyFactory<PublicAccessEntry, Guid> _cachePolicyFactory;
        protected override IRepositoryCachePolicyFactory<PublicAccessEntry, Guid> CachePolicyFactory
@@ -46,6 +45,8 @@ namespace Umbraco.Core.Persistence.Repositories
                sql.Where("umbracoAccess.id IN (@ids)", new { ids = ids });
            }

+            sql.OrderBy<AccessDto>(x => x.NodeId, SqlSyntax);
+
            var factory = new PublicAccessEntryFactory();
            var dtos = Database.Fetch<AccessDto, AccessRuleDto, AccessDto>(new AccessRulesRelator().Map, sql);
            return dtos.Select(factory.BuildEntity);
@@ -69,7 +70,7 @@ namespace Umbraco.Core.Persistence.Repositories
                .From<AccessDto>(SqlSyntax)
                .LeftJoin<AccessRuleDto>(SqlSyntax)
                .On<AccessDto, AccessRuleDto>(SqlSyntax, left => left.Id, right => right.AccessId);
-                
+
            return sql;
        }

@@ -162,7 +163,5 @@ namespace Umbraco.Core.Persistence.Repositories
        {
            return entity.Key;
        }
-
-    
    }
 }
@@ -49,6 +49,10 @@ namespace Umbraco.Core.Persistence.Repositories
                    INNER JOIN umbracoNode as TB2 ON TB1.nodeId = TB2.id 
                    WHERE TB2.trashed = '1' AND TB2.nodeObjectType = @NodeObjectType)",
                FormatDeleteStatement("umbracoAccess", "nodeId"),
+                @"DELETE FROM umbracoRedirectUrl WHERE umbracoRedirectUrl.id IN(
+                    SELECT TB1.id FROM umbracoRedirectUrl as TB1
+                    INNER JOIN umbracoNode as TB2 ON TB1.contentKey = TB2.uniqueId
+                    WHERE TB2.trashed = '1' AND TB2.nodeObjectType = @NodeObjectType)",
                FormatDeleteStatement("umbracoRelation", "parentId"),
                FormatDeleteStatement("umbracoRelation", "childId"),
                FormatDeleteStatement("cmsTagRelationship", "nodeId"),
@@ -12,9 +12,9 @@ using Umbraco.Core.Persistence.UnitOfWork;

 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal class RedirectUrlRepository : PetaPocoRepositoryBase<int, IRedirectUrl>, IRedirectUrlRepository
+    internal class RedirectUrlRepository : PetaPocoRepositoryBase<Guid, IRedirectUrl>, IRedirectUrlRepository
    {
-        public RedirectUrlRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax) 
+        public RedirectUrlRepository(IDatabaseUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
            : base(work, cache, logger, sqlSyntax)
        { }

@@ -23,19 +23,19 @@ namespace Umbraco.Core.Persistence.Repositories
            throw new NotSupportedException("This repository does not support this method.");
        }

-        protected override bool PerformExists(int id)
+        protected override bool PerformExists(Guid id)
        {
            return PerformGet(id) != null;
        }

-        protected override IRedirectUrl PerformGet(int id)
+        protected override IRedirectUrl PerformGet(Guid id)
        {
            var sql = GetBaseQuery(false).Where<RedirectUrlDto>(x => x.Id == id);
-            var dto = Database.Fetch<RedirectUrlDto>(sql).FirstOrDefault();
+            var dto = Database.Fetch<RedirectUrlDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
            return dto == null ? null : Map(dto);
        }

-        protected override IEnumerable<IRedirectUrl> PerformGetAll(params int[] ids)
+        protected override IEnumerable<IRedirectUrl> PerformGetAll(params Guid[] ids)
        {
            if (ids.Length > 2000)
                throw new NotSupportedException("This repository does not support more than 2000 ids.");
@@ -86,7 +86,7 @@ JOIN umbracoNode ON umbracoRedirectUrl.contentKey=umbracoNode.uniqueID");
        {
            var dto = Map(entity);
            Database.Insert(dto);
-            entity.Id = dto.Id;
+            entity.Id = entity.Key.GetHashCode();
        }

        protected override void PersistUpdatedItem(IRedirectUrl entity)
@@ -101,11 +101,11 @@ JOIN umbracoNode ON umbracoRedirectUrl.contentKey=umbracoNode.uniqueID");

            return new RedirectUrlDto
            {
-                Id = redirectUrl.Id,
+                Id = redirectUrl.Key,
                ContentKey = redirectUrl.ContentKey,
                CreateDateUtc = redirectUrl.CreateDateUtc,
                Url = redirectUrl.Url,
-                UrlHash = HashUrl(redirectUrl.Url)
+                UrlHash = redirectUrl.Url.ToSHA1()
            };
        }

@@ -117,7 +117,8 @@ JOIN umbracoNode ON umbracoRedirectUrl.contentKey=umbracoNode.uniqueID");
            try
            {
                url.DisableChangeTracking();
-                url.Id = dto.Id;
+                url.Key = dto.Id;
+                url.Id = dto.Id.GetHashCode();
                url.ContentId = dto.ContentId;
                url.ContentKey = dto.ContentKey;
                url.CreateDateUtc = dto.CreateDateUtc;
@@ -132,7 +133,7 @@ JOIN umbracoNode ON umbracoRedirectUrl.contentKey=umbracoNode.uniqueID");

        public IRedirectUrl Get(string url, Guid contentKey)
        {
-            var urlHash = HashUrl(url);
+            var urlHash = url.ToSHA1();
            var sql = GetBaseQuery(false).Where<RedirectUrlDto>(x => x.Url == url && x.UrlHash == urlHash && x.ContentKey == contentKey);
            var dto = Database.Fetch<RedirectUrlDto>(sql).FirstOrDefault();
            return dto == null ? null : Map(dto);
@@ -148,14 +149,14 @@ JOIN umbracoNode ON umbracoRedirectUrl.contentKey=umbracoNode.uniqueID");
            Database.Execute("DELETE FROM umbracoRedirectUrl WHERE contentKey=@contentKey", new { contentKey });
        }

-        public void Delete(int id)
+        public void Delete(Guid id)
        {
            Database.Delete<RedirectUrlDto>(id);
        }

        public IRedirectUrl GetMostRecentUrl(string url)
        {
-            var urlHash = HashUrl(url);
+            var urlHash = url.ToSHA1();
            var sql = GetBaseQuery(false)
                .Where<RedirectUrlDto>(x => x.Url == url && x.UrlHash == urlHash)
                .OrderByDescending<RedirectUrlDto>(x => x.CreateDateUtc, SqlSyntax);
@@ -185,7 +186,7 @@ JOIN umbracoNode ON umbracoRedirectUrl.contentKey=umbracoNode.uniqueID");
        public IEnumerable<IRedirectUrl> GetAllUrls(int rootContentId, long pageIndex, int pageSize, out long total)
        {
            var sql = GetBaseQuery(false)
-                .Where("umbracoNode.path LIKE @path", new { path = "%," + rootContentId + ",%" })
+                .Where(string.Format("{0}.{1} LIKE @path", SqlSyntax.GetQuotedTableName("umbracoNode"), SqlSyntax.GetQuotedColumnName("path")), new { path = "%," + rootContentId + ",%" })
                .OrderByDescending<RedirectUrlDto>(x => x.CreateDateUtc, SqlSyntax);
            var result = Database.Page<RedirectUrlDto>(pageIndex + 1, pageSize, sql);
            total = Convert.ToInt32(result.TotalItems);
@@ -194,12 +195,16 @@ JOIN umbracoNode ON umbracoRedirectUrl.contentKey=umbracoNode.uniqueID");
            return rules;
        }

-        private static string HashUrl(string url)
+        public IEnumerable<IRedirectUrl> SearchUrls(string searchTerm, long pageIndex, int pageSize, out long total)
        {
-            var crypto = new MD5CryptoServiceProvider();
-            var inputBytes = Encoding.UTF8.GetBytes(url);
-            var hashedBytes = crypto.ComputeHash(inputBytes);
-            return Encoding.UTF8.GetString(hashedBytes);
-        }
+            var sql = GetBaseQuery(false)
+                .Where(string.Format("{0}.{1} LIKE @url", SqlSyntax.GetQuotedTableName("umbracoRedirectUrl"), SqlSyntax.GetQuotedColumnName("Url")), new { url = "%" + searchTerm.Trim().ToLowerInvariant() + "%" })
+                .OrderByDescending<RedirectUrlDto>(x => x.CreateDateUtc, SqlSyntax);
+            var result = Database.Page<RedirectUrlDto>(pageIndex + 1, pageSize, sql);
+            total = Convert.ToInt32(result.TotalItems);
+
+            var rules = result.Items.Select(Map);
+            return rules;
+        }     
    }
 }
@@ -33,7 +33,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var dto = Database.FirstOrDefault<RelationDto>(sql);
+            var dto = Database.Fetch<RelationDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
            if (dto == null)
                return null;

@@ -31,7 +31,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var dto = Database.FirstOrDefault<RelationTypeDto>(sql);
+            var dto = Database.Fetch<RelationTypeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
            if (dto == null)
                return null;

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.EntityBase;
@@ -26,7 +25,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var tagDto = Database.Fetch<TagDto>(sql).FirstOrDefault();
+            var tagDto = Database.Fetch<TagDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
            if (tagDto == null)
                return null;

@@ -25,7 +25,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var taskDto = Database.Fetch<TaskDto, TaskTypeDto>(sql).FirstOrDefault();
+            var taskDto = Database.Fetch<TaskDto, TaskTypeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
            if (taskDto == null)
                return null;

@@ -23,7 +23,7 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);
            sql.Where(GetBaseWhereClause(), new { Id = id });

-            var taskDto = Database.Fetch<TaskTypeDto>(sql).FirstOrDefault();
+            var taskDto = Database.Fetch<TaskTypeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
            if (taskDto == null)
                return null;

@@ -236,7 +236,7 @@ namespace Umbraco.Core.Persistence.Repositories
        private Sql GetFilteredSqlForPagedResults(Sql sql, Func<Tuple<string, object[]>> defaultFilter = null)
        {
            Sql filteredSql;
-            
+
            // Apply filter
            if (defaultFilter != null)
            {
@@ -262,7 +262,7 @@ namespace Umbraco.Core.Persistence.Repositories
            return filteredSql;
        }

-        private Sql GetSortedSqlForPagedResults(Sql sql, Direction orderDirection, string orderBy, bool orderBySystemField)
+        private Sql GetSortedSqlForPagedResults(Sql sql, Direction orderDirection, string orderBy, bool orderBySystemField, Tuple<string, string> nodeIdSelect)
        {

            //copy to var so that the original isn't changed
@@ -286,44 +286,71 @@ namespace Umbraco.Core.Persistence.Repositories
            }
            else
            {
-                // Sorting by a custom field, so set-up sub-query for ORDER BY clause to pull through valie
+                // Sorting by a custom field, so set-up sub-query for ORDER BY clause to pull through value
                // from most recent content version for the given order by field
                var sortedInt = string.Format(SqlSyntax.ConvertIntegerToOrderableString, "dataInt");
                var sortedDate = string.Format(SqlSyntax.ConvertDateToOrderableString, "dataDate");
                var sortedString = string.Format("COALESCE({0},'')", "dataNvarchar");
                var sortedDecimal = string.Format(SqlSyntax.ConvertDecimalToOrderableString, "dataDecimal");

-                var innerJoinTempTable = string.Format(@"INNER JOIN (
-                 	                SELECT CASE
-                 		                WHEN dataInt Is Not Null THEN {0}
-                                        WHEN dataDecimal Is Not Null THEN {1}
-                                        WHEN dataDate Is Not Null THEN {2}
-                                        ELSE {3}
-                 	                END AS CustomPropVal,
-                                    cd.nodeId AS CustomPropValContentId
-                 	                FROM cmsDocument cd
-                                    INNER JOIN cmsPropertyData cpd ON cpd.contentNodeId = cd.nodeId AND cpd.versionId = cd.versionId                    
-                                    INNER JOIN cmsPropertyType cpt ON cpt.Id = cpd.propertytypeId
-                			        WHERE cpt.Alias = @{4} AND cd.newest = 1) AS CustomPropData
-                                    ON CustomPropData.CustomPropValContentId = umbracoNode.id
-                ", sortedInt, sortedDecimal, sortedDate, sortedString, sortedSql.Arguments.Length);
+                //these are defaults that will be used in the query - they can be overridden for non-versioned entities or document entities
+                var versionQuery = " AND cpd.versionId = cd.versionId";
+                var newestQuery = string.Empty;
+
+                //cmsDocument needs to filter by the 'newest' parameter in the query
+                if (nodeIdSelect.Item1 == "cmsDocument")
+                    newestQuery = " AND cd.newest = 1";
+
+                //members do not use versions so clear the versionQuery string
+                if (nodeIdSelect.Item1 == "cmsMember")
+                    versionQuery = string.Empty;
+
+                //needs to be an outer join since there's no guarantee that any of the nodes have values for this property
+                var outerJoinTempTable = string.Format(@"LEFT OUTER JOIN (
+                                SELECT CASE
+                                    WHEN dataInt Is Not Null THEN {0}
+                                    WHEN dataDecimal Is Not Null THEN {1}
+                                    WHEN dataDate Is Not Null THEN {2}
+                                    ELSE {3}
+                                END AS CustomPropVal,
+                                cd.{4} AS CustomPropValContentId
+                                FROM {5} cd
+                                INNER JOIN cmsPropertyData cpd ON cpd.contentNodeId = cd.{4}{6}
+                                INNER JOIN cmsPropertyType cpt ON cpt.Id = cpd.propertytypeId
+                                WHERE cpt.Alias = @{7}{8}) AS CustomPropData
+                                ON CustomPropData.CustomPropValContentId = umbracoNode.id
+                ", sortedInt, sortedDecimal, sortedDate, sortedString, nodeIdSelect.Item2, nodeIdSelect.Item1, versionQuery, sortedSql.Arguments.Length, newestQuery);
+
+                //insert this just above the first LEFT OUTER JOIN (for cmsDocument) or the last WHERE (everything else)
+                string newSql;
+                if (nodeIdSelect.Item1 == "cmsDocument")
+                    newSql = sortedSql.SQL.Insert(sortedSql.SQL.IndexOf("LEFT OUTER JOIN"), outerJoinTempTable);
+                else
+                    newSql = sortedSql.SQL.Insert(sortedSql.SQL.LastIndexOf("WHERE"), outerJoinTempTable);

-                //insert this just above the LEFT OUTER JOIN
-                var newSql = sortedSql.SQL.Insert(sortedSql.SQL.IndexOf("LEFT OUTER JOIN"), innerJoinTempTable);
                var newArgs = sortedSql.Arguments.ToList();
                newArgs.Add(orderBy);

                sortedSql = new Sql(newSql, newArgs.ToArray());

-                sortedSql.OrderBy("CustomPropData.CustomPropVal");
                if (orderDirection == Direction.Descending)
                {
-                    sortedSql.Append(" DESC");
-                }                
+                    sortedSql.OrderByDescending("CustomPropData.CustomPropVal");
+                }
+                else
+                {
+                    sortedSql.OrderBy("CustomPropData.CustomPropVal");
+                }
            }

+            //no matter what we always MUST order the result also by umbracoNode.id to ensure that all records being ordered by are unique.
+            // if we do not do this then we end up with issues where we are ordering by a field that has duplicate values (i.e. the 'text' column
+            // is empty for many nodes)
+            // see: http://issues.umbraco.org/issue/U4-8831
+            sortedSql.OrderBy("umbracoNode.id");
+
            return sortedSql;
-            
+
        }

        /// <summary>
@@ -371,7 +398,7 @@ namespace Umbraco.Core.Persistence.Repositories
            //get sorted and filtered sql
            var sqlNodeIdsWithSort = GetSortedSqlForPagedResults(
                GetFilteredSqlForPagedResults(sqlNodeIds, defaultFilter),
-                orderDirection, orderBy, orderBySystemField);
+                orderDirection, orderBy, orderBySystemField, nodeIdSelect);

            // Get page of results and total count
            IEnumerable<TEntity> result;
@@ -409,7 +436,7 @@ namespace Umbraco.Core.Persistence.Repositories
                //get sorted and filtered sql
                var fullQuery = GetSortedSqlForPagedResults(
                    GetFilteredSqlForPagedResults(withInnerJoinSql, defaultFilter),
-                    orderDirection, orderBy, orderBySystemField);
+                    orderDirection, orderBy, orderBySystemField, nodeIdSelect);
                return processQuery(fullQuery);
            }
            else
@@ -483,17 +510,6 @@ WHERE EXISTS(
                    var propertyFactory = new PropertyFactory(compositionProperties, def.Version, def.Id, def.CreateDate, def.VersionDate);
                    var properties = propertyFactory.BuildEntity(propertyDataDtos.ToArray()).ToArray();

-                    var newProperties = properties.Where(x => x.HasIdentity == false && x.PropertyType.HasIdentity);
-
-                    foreach (var property in newProperties)
-                    {
-                        var propertyDataDto = new PropertyDataDto { NodeId = def.Id, PropertyTypeId = property.PropertyTypeId, VersionId = def.Version };
-                        int primaryKey = Convert.ToInt32(Database.Insert(propertyDataDto));
-
-                        property.Version = def.Version;
-                        property.Id = primaryKey;
-                    }
-
                    foreach (var property in properties)
                    {
                        //NOTE: The benchmarks run with and without the following code show very little change so this is not a perf bottleneck
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
@@ -66,6 +67,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
        string Format(ForeignKeyDefinition foreignKey);
        string FormatColumnRename(string tableName, string oldName, string newName);
        string FormatTableRename(string oldName, string newName);
+        Sql SelectTop(Sql sql, int top);
        bool SupportsClustered();
        bool SupportsIdentityInsert();
        bool? SupportsCaseInsensitiveQueries(Database db);
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
    /// <summary>
    /// Represents an SqlSyntaxProvider for MySql
    /// </summary>
-    [SqlSyntaxProviderAttribute("MySql.Data.MySqlClient")]
+    [SqlSyntaxProvider(Constants.DatabaseProviders.MySql)]
    public class MySqlSyntaxProvider : SqlSyntaxProviderBase<MySqlSyntaxProvider>
    {
        private readonly ILogger _logger;
@@ -178,6 +178,11 @@ ORDER BY TABLE_NAME, INDEX_NAME",
            return result > 0;
        }

+        public override Sql SelectTop(Sql sql, int top)
+        {
+            return new Sql(string.Concat(sql.SQL, " LIMIT ", top), sql.Arguments);
+        }
+
        public override bool SupportsClustered()
        {
            return true;
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
    /// <summary>
    /// Represents an SqlSyntaxProvider for Sql Ce
    /// </summary>
-    [SqlSyntaxProviderAttribute("System.Data.SqlServerCe.4.0")]
+    [SqlSyntaxProviderAttribute(Constants.DatabaseProviders.SqlCe)]
    public class SqlCeSyntaxProvider : MicrosoftSqlSyntaxProviderBase<SqlCeSyntaxProvider>
    {
        public SqlCeSyntaxProvider()
@@ -18,6 +18,11 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            
        }

+        public override Sql SelectTop(Sql sql, int top)
+        {
+            return new Sql(sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments);
+        }
+
        public override bool SupportsClustered()
        {
            return false;
@@ -8,18 +8,63 @@ namespace Umbraco.Core.Persistence.SqlSyntax
    /// <summary>
    /// Represents an SqlSyntaxProvider for Sql Server
    /// </summary>
-    [SqlSyntaxProviderAttribute("System.Data.SqlClient")]
+    [SqlSyntaxProviderAttribute(Constants.DatabaseProviders.SqlServer)]
    public class SqlServerSyntaxProvider : MicrosoftSqlSyntaxProviderBase<SqlServerSyntaxProvider>
    {
        public SqlServerSyntaxProvider()
        {
            
-        }
+        }     

        /// <summary>
        /// Gets/sets the version of the current SQL server instance
        /// </summary>
-        internal Lazy<SqlServerVersionName> VersionName { get; set; }
+        internal SqlServerVersionName GetVersionName(Database database)
+        {
+            if (_versionName.HasValue)
+                return _versionName.Value;
+
+            try
+            {
+                var version = database.ExecuteScalar<string>("SELECT SERVERPROPERTY('productversion')");
+                var firstPart = version.Split('.')[0];
+                switch (firstPart)
+                {
+                    case "13":
+                        _versionName = SqlServerVersionName.V2014;
+                        break;
+                    case "12":
+                        _versionName = SqlServerVersionName.V2014;
+                        break;
+                    case "11":
+                        _versionName = SqlServerVersionName.V2012;
+                        break;
+                    case "10":
+                        _versionName = SqlServerVersionName.V2008;
+                        break;
+                    case "9":
+                        _versionName = SqlServerVersionName.V2005;
+                        break;
+                    case "8":
+                        _versionName = SqlServerVersionName.V2000;
+                        break;
+                    case "7":
+                        _versionName = SqlServerVersionName.V7;
+                        break;
+                    default:
+                        _versionName = SqlServerVersionName.Other;
+                        break;
+                }
+            }
+            catch (Exception)
+            {
+                _versionName = SqlServerVersionName.Invalid;
+            }
+
+            return _versionName.Value;
+        }
+
+        private SqlServerVersionName? _versionName;

        /// <summary>
        /// SQL Server stores default values assigned to columns as constraints, it also stores them with named values, this is the only
@@ -104,6 +149,11 @@ order by T.name, I.name");
            return column.IsIdentity ? GetIdentityString(column) : string.Empty;
        }

+        public override Sql SelectTop(Sql sql, int top)
+        {
+            return new Sql(sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments);
+        }
+
        private static string GetIdentityString(ColumnDefinition column)
        {
            return "IDENTITY(1,1)";
@@ -3,6 +3,9 @@
    /// <summary>
    /// Represents the version name of SQL server (i.e. the year 2008, 2005, etc...)
    /// </summary>
+    /// <remarks>
+    /// see: https://support.microsoft.com/en-us/kb/321185
+    /// </remarks>
    internal enum SqlServerVersionName
    {
        Invalid = -1,
@@ -11,6 +14,8 @@
        V2005 = 2,
        V2008 = 3,
        V2012 = 4,
-        Other = 5
+        V2014 = 5,
+        V2016 = 6,
+        Other = 100
    }
 }
@@ -503,6 +503,8 @@ namespace Umbraco.Core.Persistence.SqlSyntax

        protected abstract string FormatIdentity(ColumnDefinition column);

+        public abstract Sql SelectTop(Sql sql, int top);
+
        public virtual string DeleteDefaultConstraint
        {
            get
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using StackExchange.Profiling;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;

 namespace Umbraco.Core.Persistence
 {
@@ -154,5 +155,41 @@ namespace Umbraco.Core.Persistence
            }
            base.OnExecutedCommand(cmd);
        }
+
+        /// <summary>
+        /// We are overriding this in the case that we are using SQL Server 2012+ so we can make paging more efficient than the default PetaPoco paging
+        /// see: http://issues.umbraco.org/issue/U4-8837
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <param name="sqlSelectRemoved"></param>
+        /// <param name="sqlOrderBy"></param>
+        /// <param name="args"></param>
+        /// <param name="sqlPage"></param>
+        /// <param name="databaseType"></param>
+        /// <param name="skip"></param>
+        /// <param name="take"></param>
+        internal override void BuildSqlDbSpecificPagingQuery(DBType databaseType, long skip, long take, string sql, string sqlSelectRemoved, string sqlOrderBy, ref object[] args, out string sqlPage)
+        {
+            if (databaseType == DBType.SqlServer)
+            {
+                //we need to check it's version to see what kind of paging format we can use
+                //TODO: This is a hack, but we don't have access to the SqlSyntaxProvider here, we can in v8 but not now otherwise
+                // this would be a breaking change.
+                var sqlServerSyntax = SqlSyntaxContext.SqlSyntaxProvider as SqlServerSyntaxProvider;
+                if (sqlServerSyntax != null)
+                {
+                    if ((int) sqlServerSyntax.GetVersionName(this) >= (int) SqlServerVersionName.V2012)
+                    {
+                        //we can use the good paging! to do that we are going to change the databaseType to SQLCE since
+                        //it also uses the good paging syntax.
+                        base.BuildSqlDbSpecificPagingQuery(DBType.SqlServerCE, skip, take, sql, sqlSelectRemoved, sqlOrderBy, ref args, out sqlPage);
+                        return;
+                    }
+                }
+            }
+           
+            //use the defaults
+            base.BuildSqlDbSpecificPagingQuery(databaseType, skip, take, sql, sqlSelectRemoved, sqlOrderBy, ref args, out sqlPage);
+        }
    }
 }
@@ -28,7 +28,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
            //    </values>
            // </keyFeatureList>

-            var sourceString = source.ToString();
+            var sourceString = source != null ? source.ToString() : null;
            if (string.IsNullOrWhiteSpace(sourceString)) return Enumerable.Empty<string>();

            //SD: I have no idea why this logic is here, I'm pretty sure we've never saved the multiple txt string
@@ -17,8 +17,15 @@ namespace Umbraco.Core.Publishing
            _contentService = contentService;
        }

-        public void CheckPendingAndProcess()
+        /// <summary>
+        /// Processes scheduled operations
+        /// </summary>
+        /// <returns>
+        /// Returns the number of items successfully completed
+        /// </returns>
+        public int CheckPendingAndProcess()
        {
+            var counter = 0;
            foreach (var d in _contentService.GetContentForRelease())
            {
                try
@@ -32,10 +39,14 @@ namespace Umbraco.Core.Publishing
                            LogHelper.Error<ScheduledPublisher>("Could not published the document (" + d.Id + ") based on it's scheduled release, status result: " + result.Result.StatusType, result.Exception);
                        }
                        else
-                        {                            
+                        {
                            LogHelper.Warn<ScheduledPublisher>("Could not published the document (" + d.Id + ") based on it's scheduled release. Status result: " + result.Result.StatusType);
                        }
                    }
+                    else
+                    {
+                        counter++;
+                    }
                }
                catch (Exception ee)
                {
@@ -48,7 +59,11 @@ namespace Umbraco.Core.Publishing
                try
                {
                    d.ExpireDate = null;
-                    _contentService.UnPublish(d, (int)d.GetWriterProfile().Id);
+                    var result = _contentService.UnPublish(d, (int)d.GetWriterProfile().Id);
+                    if (result)
+                    {
+                        counter++;
+                    }
                }
                catch (Exception ee)
                {
@@ -56,6 +71,8 @@ namespace Umbraco.Core.Publishing
                    throw;
                }
            }
+
+            return counter;
        }
    }
 }
@@ -0,0 +1,31 @@
+using System.Configuration;
+using System.DirectoryServices.AccountManagement;
+using System.Threading.Tasks;
+using Umbraco.Core.Models.Identity;
+
+namespace Umbraco.Core.Security
+{
+    public class ActiveDirectoryBackOfficeUserPasswordChecker : IBackOfficeUserPasswordChecker
+    {
+        public virtual string ActiveDirectoryDomain {
+            get {
+                return ConfigurationManager.AppSettings["ActiveDirectoryDomain"];
+            }
+        }
+
+        public Task<BackOfficeUserPasswordCheckerResult> CheckPasswordAsync(BackOfficeIdentityUser user, string password)
+        {
+            bool isValid;
+            using (var pc = new PrincipalContext(ContextType.Domain, ActiveDirectoryDomain))
+            {
+                isValid = pc.ValidateCredentials(user.UserName, password);
+            }
+
+            var result = isValid
+                ? BackOfficeUserPasswordCheckerResult.ValidCredentials
+                : BackOfficeUserPasswordCheckerResult.InvalidCredentials;
+
+            return Task.FromResult(result);
+        }
+    }
+}
@@ -7,7 +7,8 @@ using Umbraco.Core.Models.Identity;

 namespace Umbraco.Core.Security
 {
-    public class BackOfficeClaimsIdentityFactory : ClaimsIdentityFactory<BackOfficeIdentityUser, int>
+    public class BackOfficeClaimsIdentityFactory<T> : ClaimsIdentityFactory<T, int>
+        where T: BackOfficeIdentityUser
    {
        public BackOfficeClaimsIdentityFactory()
        {
@@ -20,7 +21,7 @@ namespace Umbraco.Core.Security
        /// </summary>
        /// <param name="manager"/><param name="user"/><param name="authenticationType"/>
        /// <returns/>
-        public override async Task<ClaimsIdentity> CreateAsync(UserManager<BackOfficeIdentityUser, int> manager, BackOfficeIdentityUser user, string authenticationType)
+        public override async Task<ClaimsIdentity> CreateAsync(UserManager<T, int> manager, T user, string authenticationType)
        {
            var baseIdentity = await base.CreateAsync(manager, user, authenticationType);

@@ -42,4 +43,9 @@ namespace Umbraco.Core.Security
            return umbracoIdentity;
        }
    }
+
+    public class BackOfficeClaimsIdentityFactory : BackOfficeClaimsIdentityFactory<BackOfficeIdentityUser>
+    {       
+
+    }
 }
@@ -17,7 +17,7 @@ namespace Umbraco.Core.Security
        private readonly ILogger _logger;
        private readonly IOwinRequest _request;

-        public BackOfficeSignInManager(BackOfficeUserManager userManager, IAuthenticationManager authenticationManager, ILogger logger, IOwinRequest request)
+        public BackOfficeSignInManager(UserManager<BackOfficeIdentityUser, int> userManager, IAuthenticationManager authenticationManager, ILogger logger, IOwinRequest request)
            : base(userManager, authenticationManager)
        {
            if (logger == null) throw new ArgumentNullException("logger");
@@ -29,13 +29,13 @@ namespace Umbraco.Core.Security

        public override Task<ClaimsIdentity> CreateUserIdentityAsync(BackOfficeIdentityUser user)
        {
-            return user.GenerateUserIdentityAsync((BackOfficeUserManager)UserManager);
+            return user.GenerateUserIdentityAsync((BackOfficeUserManager<BackOfficeIdentityUser>)UserManager);
        }

        public static BackOfficeSignInManager Create(IdentityFactoryOptions<BackOfficeSignInManager> options, IOwinContext context, ILogger logger)
        {
            return new BackOfficeSignInManager(
-                context.GetUserManager<BackOfficeUserManager>(), 
+                context.GetBackOfficeUserManager(), 
                context.Authentication,
                logger,
                context.Request);
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using System.Web.Security;
 using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin.Security.DataProtection;
 using Umbraco.Core.Models.Identity;
 using Umbraco.Core.Services;

@@ -15,6 +16,8 @@ namespace Umbraco.Core.Security
    /// </summary>
    public class BackOfficeUserManager : BackOfficeUserManager<BackOfficeIdentityUser>
    {
+        public const string OwinMarkerKey = "Umbraco.Web.Security.Identity.BackOfficeUserManagerMarker";
+
        public BackOfficeUserManager(IUserStore<BackOfficeIdentityUser, int> store)
            : base(store)
        {
@@ -26,9 +29,8 @@ namespace Umbraco.Core.Security
            MembershipProviderBase membershipProvider)
            : base(store)
        {
-            if (options == null) throw new ArgumentNullException("options");
-            var manager = new BackOfficeUserManager(store);
-            InitUserManager(manager, membershipProvider, options);
+            if (options == null) throw new ArgumentNullException("options");;
+            InitUserManager(this, membershipProvider, options);
        }

        #region Static Create methods
@@ -69,7 +71,7 @@ namespace Umbraco.Core.Security
        {
            var manager = new BackOfficeUserManager(customUserStore, options, membershipProvider);
            return manager;
-        } 
+        }
        #endregion

        /// <summary>
@@ -79,65 +81,15 @@ namespace Umbraco.Core.Security
        /// <param name="membershipProvider"></param>
        /// <param name="options"></param>
        /// <returns></returns>
-        protected void InitUserManager(BackOfficeUserManager manager, MembershipProviderBase membershipProvider, IdentityFactoryOptions<BackOfficeUserManager> options)
+        protected void InitUserManager(
+            BackOfficeUserManager manager,
+            MembershipProviderBase membershipProvider,
+            IdentityFactoryOptions<BackOfficeUserManager> options)
        {
-            // Configure validation logic for usernames
-            manager.UserValidator = new UserValidator<BackOfficeIdentityUser, int>(manager)
-            {
-                AllowOnlyAlphanumericUserNames = false,
-                RequireUniqueEmail = true
-            };
-
-            // Configure validation logic for passwords
-            manager.PasswordValidator = new PasswordValidator
-            {
-                RequiredLength = membershipProvider.MinRequiredPasswordLength,
-                RequireNonLetterOrDigit = membershipProvider.MinRequiredNonAlphanumericCharacters > 0,
-                RequireDigit = false,
-                RequireLowercase = false,
-                RequireUppercase = false
-                //TODO: Do we support the old regex match thing that membership providers used?
-            };
-
-            //use a custom hasher based on our membership provider
-            manager.PasswordHasher = new MembershipPasswordHasher(membershipProvider);
-
-            var dataProtectionProvider = options.DataProtectionProvider;
-            if (dataProtectionProvider != null)
-            {
-                manager.UserTokenProvider = new DataProtectorTokenProvider<BackOfficeIdentityUser, int>(dataProtectionProvider.Create("ASP.NET Identity"));
-            }
-
-            manager.UserLockoutEnabledByDefault = true;
-            manager.MaxFailedAccessAttemptsBeforeLockout = membershipProvider.MaxInvalidPasswordAttempts;
-            //NOTE: This just needs to be in the future, we currently don't support a lockout timespan, it's either they are locked
-            // or they are not locked, but this determines what is set on the account lockout date which corresponds to whether they are
-            // locked out or not.
-            manager.DefaultAccountLockoutTimeSpan = TimeSpan.FromDays(30);
-
-            //custom identity factory for creating the identity object for which we auth against in the back office
-            manager.ClaimsIdentityFactory = new BackOfficeClaimsIdentityFactory();
-
-            manager.EmailService = new EmailService();
-            
-            //NOTE: Not implementing these, if people need custom 2 factor auth, they'll need to implement their own UserStore to suport it
-
-            //// Register two factor authentication providers. This application uses Phone and Emails as a step of receiving a code for verifying the user
-            //// You can write your own provider and plug in here.
-            //manager.RegisterTwoFactorProvider("PhoneCode", new PhoneNumberTokenProvider<ApplicationUser>
-            //{
-            //    MessageFormat = "Your security code is: {0}"
-            //});
-            //manager.RegisterTwoFactorProvider("EmailCode", new EmailTokenProvider<ApplicationUser>
-            //{
-            //    Subject = "Security Code",
-            //    BodyFormat = "Your security code is: {0}"
-            //});
-
-            //manager.SmsService = new SmsService();            
+            //NOTE: This method is mostly here for backwards compat
+            base.InitUserManager(manager, membershipProvider, options.DataProtectionProvider);
        }

-        
    }

    /// <summary>
@@ -180,6 +132,73 @@ namespace Umbraco.Core.Security
        }
        #endregion

+        /// <summary>
+        /// Initializes the user manager with the correct options
+        /// </summary>
+        /// <param name="manager"></param>
+        /// <param name="membershipProvider"></param>
+        /// <param name="dataProtectionProvider"></param>
+        /// <returns></returns>
+        protected void InitUserManager(
+            BackOfficeUserManager<T> manager, 
+            MembershipProviderBase membershipProvider, 
+            IDataProtectionProvider dataProtectionProvider)
+        {
+            // Configure validation logic for usernames
+            manager.UserValidator = new UserValidator<T, int>(manager)
+            {
+                AllowOnlyAlphanumericUserNames = false,
+                RequireUniqueEmail = true
+            };
+
+            // Configure validation logic for passwords
+            manager.PasswordValidator = new PasswordValidator
+            {
+                RequiredLength = membershipProvider.MinRequiredPasswordLength,
+                RequireNonLetterOrDigit = membershipProvider.MinRequiredNonAlphanumericCharacters > 0,
+                RequireDigit = false,
+                RequireLowercase = false,
+                RequireUppercase = false
+                //TODO: Do we support the old regex match thing that membership providers used?
+            };
+
+            //use a custom hasher based on our membership provider
+            manager.PasswordHasher = new MembershipPasswordHasher(membershipProvider);
+            
+            if (dataProtectionProvider != null)
+            {
+                manager.UserTokenProvider = new DataProtectorTokenProvider<T, int>(dataProtectionProvider.Create("ASP.NET Identity"));
+            }
+
+            manager.UserLockoutEnabledByDefault = true;
+            manager.MaxFailedAccessAttemptsBeforeLockout = membershipProvider.MaxInvalidPasswordAttempts;
+            //NOTE: This just needs to be in the future, we currently don't support a lockout timespan, it's either they are locked
+            // or they are not locked, but this determines what is set on the account lockout date which corresponds to whether they are
+            // locked out or not.
+            manager.DefaultAccountLockoutTimeSpan = TimeSpan.FromDays(30);
+
+            //custom identity factory for creating the identity object for which we auth against in the back office
+            manager.ClaimsIdentityFactory = new BackOfficeClaimsIdentityFactory<T>();
+
+            manager.EmailService = new EmailService();
+
+            //NOTE: Not implementing these, if people need custom 2 factor auth, they'll need to implement their own UserStore to suport it
+
+            //// Register two factor authentication providers. This application uses Phone and Emails as a step of receiving a code for verifying the user
+            //// You can write your own provider and plug in here.
+            //manager.RegisterTwoFactorProvider("PhoneCode", new PhoneNumberTokenProvider<ApplicationUser>
+            //{
+            //    MessageFormat = "Your security code is: {0}"
+            //});
+            //manager.RegisterTwoFactorProvider("EmailCode", new EmailTokenProvider<ApplicationUser>
+            //{
+            //    Subject = "Security Code",
+            //    BodyFormat = "Your security code is: {0}"
+            //});
+
+            //manager.SmsService = new SmsService();            
+        }
+
        /// <summary>
        /// Logic used to validate a username and password
        /// </summary>
@@ -0,0 +1,26 @@
+using System;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin;
+using Umbraco.Core.Models.Identity;
+
+namespace Umbraco.Core.Security
+{
+    /// <summary>
+    /// This class is only here due to the fact that IOwinContext Get / Set only work in generics, if they worked 
+    /// with regular 'object' then we wouldn't have to use this work around but because of that we have to use this 
+    /// class to resolve the 'real' type of the registered user manager
+    /// </summary>
+    /// <typeparam name="TManager"></typeparam>
+    /// <typeparam name="TUser"></typeparam>
+    internal class BackOfficeUserManagerMarker<TManager, TUser> : IBackOfficeUserManagerMarker
+        where TManager : BackOfficeUserManager<TUser>
+        where TUser : BackOfficeIdentityUser
+    {
+        public BackOfficeUserManager<BackOfficeIdentityUser> GetManager(IOwinContext owin)
+        {
+            var mgr = owin.Get<TManager>() as BackOfficeUserManager<BackOfficeIdentityUser>;
+            if (mgr == null) throw new InvalidOperationException("Could not cast the registered back office user of type " + typeof(TManager) + " to " + typeof(BackOfficeUserManager<BackOfficeIdentityUser>));
+            return mgr;
+        }
+    }
+}
@@ -0,0 +1,15 @@
+using Microsoft.Owin;
+using Umbraco.Core.Models.Identity;
+
+namespace Umbraco.Core.Security
+{
+    /// <summary>
+    /// This interface is only here due to the fact that IOwinContext Get / Set only work in generics, if they worked 
+    /// with regular 'object' then we wouldn't have to use this work around but because of that we have to use this 
+    /// class to resolve the 'real' type of the registered user manager
+    /// </summary>
+    internal interface IBackOfficeUserManagerMarker
+    {
+        BackOfficeUserManager<BackOfficeIdentityUser> GetManager(IOwinContext owin);
+    }
+}
@@ -0,0 +1,47 @@
+using System;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin;
+using Umbraco.Core.Models.Identity;
+
+namespace Umbraco.Core.Security
+{
+    public static class OwinExtensions
+    {
+        /// <summary>
+        /// Gets the back office sign in manager out of OWIN
+        /// </summary>
+        /// <param name="owinContext"></param>
+        /// <returns></returns>        
+        public static BackOfficeSignInManager GetBackOfficeSignInManager(this IOwinContext owinContext)
+        {
+            var mgr = owinContext.Get<BackOfficeSignInManager>();
+            if (mgr == null)
+            {
+                throw new NullReferenceException("Could not resolve an instance of " + typeof(BackOfficeSignInManager) + " from the " + typeof(IOwinContext));
+            }
+            return mgr;
+        }
+
+        /// <summary>
+        /// Gets the back office user manager out of OWIN
+        /// </summary>
+        /// <param name="owinContext"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// This is required because to extract the user manager we need to user a custom service since owin only deals in generics and 
+        /// developers could register their own user manager types
+        /// </remarks> 
+        public static BackOfficeUserManager<BackOfficeIdentityUser> GetBackOfficeUserManager(this IOwinContext owinContext)
+        {
+            var marker = owinContext.Get<IBackOfficeUserManagerMarker>(BackOfficeUserManager.OwinMarkerKey);
+            if (marker == null) throw new NullReferenceException("No " + typeof(IBackOfficeUserManagerMarker) + " has been registered with Owin which means that no Umbraco back office user manager has been registered");
+
+            var mgr = marker.GetManager(owinContext);
+            if (mgr == null)
+            {
+                throw new NullReferenceException("Could not resolve an instance of " + typeof(BackOfficeUserManager<BackOfficeIdentityUser>));
+            }
+            return mgr;
+        }
+    }
+}
@@ -4,6 +4,7 @@ using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
+using System.Xml;
 using System.Xml.Linq;
 using Umbraco.Core.Auditing;
 using Umbraco.Core.Configuration;
@@ -636,7 +637,7 @@ namespace Umbraco.Core.Services
                    query.Where(x => x.Path.SqlContains(string.Format(",{0},", id), TextColumnType.NVarchar));
                }
                var contents = repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
-                
+
                return contents;
            }
        }
@@ -1714,6 +1715,20 @@ namespace Umbraco.Core.Services
            return true;
        }

+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        public XmlDocument BuildXmlCache()
+        {
+            var uow = UowProvider.GetUnitOfWork();
+            using (var repository = RepositoryFactory.CreateContentRepository(uow))
+            {
+                var result = repository.BuildXmlCache();
+                return result;
+            }
+        }
+
        /// <summary>
        /// Rebuilds all xml content in the cmsContentXml table for all documents
        /// </summary>
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Xml;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
@@ -94,6 +95,12 @@ namespace Umbraco.Core.Services
    /// </summary>
    public interface IContentService : IService
    {
+        /// <summary>
+        /// This builds the Xml document used for the XML cache
+        /// </summary>
+        /// <returns></returns>
+        XmlDocument BuildXmlCache();
+
        /// <summary>
        /// Rebuilds all xml content in the cmsContentXml table for all documents
        /// </summary>
@@ -33,7 +33,7 @@ namespace Umbraco.Core.Services
        /// Deletes a redirect url.
        /// </summary>
        /// <param name="id">The redirect url identifier.</param>
-        void Delete(int id);
+        void Delete(Guid id);

        /// <summary>
        /// Deletes all redirect urls.
@@ -72,5 +72,15 @@ namespace Umbraco.Core.Services
        /// <param name="total">The total count of redirect urls.</param>
        /// <returns>The redirect urls.</returns>
        IEnumerable<IRedirectUrl> GetAllRedirectUrls(int rootContentId, long pageIndex, int pageSize, out long total);
+        
+        /// <summary>
+        /// Searches for all redirect urls that contain a given search term in their URL property.
+        /// </summary>
+        /// <param name="searchTerm">The term to search for.</param>
+        /// <param name="pageIndex">The page index.</param>
+        /// <param name="pageSize">The page size.</param>
+        /// <param name="total">The total count of redirect urls.</param>
+        /// <returns>The redirect urls.</returns>
+        IEnumerable<IRedirectUrl> SearchRedirectUrls(string searchTerm, long pageIndex, int pageSize, out long total);
    }
 }
@@ -23,7 +23,7 @@ namespace Umbraco.Core.Services
                if (redir != null)
                    redir.CreateDateUtc = DateTime.UtcNow;
                else
-                    redir = new RedirectUrl { Url = url, ContentKey = contentKey };
+                    redir = new RedirectUrl { Key = Guid.NewGuid(), Url = url, ContentKey = contentKey };
                repo.AddOrUpdate(redir);
                uow.Commit();
            }
@@ -39,7 +39,7 @@ namespace Umbraco.Core.Services
            }
        }

-        public void Delete(int id)
+        public void Delete(Guid id)
        {
            using (var uow = UowProvider.GetUnitOfWork())
            using (var repo = RepositoryFactory.CreateRedirectUrlRepository(uow))
@@ -75,7 +75,6 @@ namespace Umbraco.Core.Services
            using (var repo = RepositoryFactory.CreateRedirectUrlRepository(uow))
            {
                var rule = repo.GetMostRecentUrl(url);
-                uow.Commit();
                return rule;
            }
        }
@@ -86,7 +85,6 @@ namespace Umbraco.Core.Services
            using (var repo = RepositoryFactory.CreateRedirectUrlRepository(uow))
            {
                var rules = repo.GetContentUrls(contentKey);
-                uow.Commit();
                return rules;
            }
        }
@@ -97,7 +95,6 @@ namespace Umbraco.Core.Services
            using (var repo = RepositoryFactory.CreateRedirectUrlRepository(uow))
            {
                var rules = repo.GetAllUrls(pageIndex, pageSize, out total);
-                uow.Commit();
                return rules;
            }
        }
@@ -108,7 +105,15 @@ namespace Umbraco.Core.Services
            using (var repo = RepositoryFactory.CreateRedirectUrlRepository(uow))
            {
                var rules = repo.GetAllUrls(rootContentId, pageIndex, pageSize, out total);
-                uow.Commit();
+                return rules;
+            }
+        }
+        public IEnumerable<IRedirectUrl> SearchRedirectUrls(string searchTerm, long pageIndex, int pageSize, out long total)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            using (var repo = RepositoryFactory.CreateRedirectUrlRepository(uow))
+            {
+                var rules = repo.SearchUrls(searchTerm, pageIndex, pageSize, out total);
                return rules;
            }
        }
@@ -666,31 +666,12 @@ namespace Umbraco.Core
            return compare.Contains(compareTo, StringComparer.InvariantCultureIgnoreCase);
        }

-        /// <summary>
-        /// Determines if the string is a Guid
-        /// </summary>
-        /// <param name="str"></param>
-        /// <param name="withHyphens"></param>
-        /// <returns></returns>
+        [Obsolete("Use Guid.TryParse instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
        public static bool IsGuid(this string str, bool withHyphens)
        {
-            var isGuid = false;
-
-            if (!String.IsNullOrEmpty(str))
-            {
-                Regex guidRegEx;
-                if (withHyphens)
-                {
-                    guidRegEx = new Regex(@"^(\{{0,1}([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}\}{0,1})$");
-                }
-                else
-                {
-                    guidRegEx = new Regex(@"^(\{{0,1}([0-9a-fA-F]){8}([0-9a-fA-F]){4}([0-9a-fA-F]){4}([0-9a-fA-F]){4}([0-9a-fA-F]){12}\}{0,1})$");
-                }
-                isGuid = guidRegEx.IsMatch(str);
-            }
-
-            return isGuid;
+            Guid g;
+            return Guid.TryParse(str, out g);
        }

        /// <summary>
@@ -712,7 +693,7 @@ namespace Umbraco.Core
        /// <returns></returns>
        public static object ParseInto(this string val, Type type)
        {
-            if (!String.IsNullOrEmpty(val))
+            if (string.IsNullOrEmpty(val) == false)
            {
                TypeConverter tc = TypeDescriptor.GetConverter(type);
                return tc.ConvertFrom(val);
@@ -750,6 +731,36 @@ namespace Umbraco.Core
            return stringBuilder.ToString();
        }

+        /// <summary>
+        /// Converts the string to SHA1
+        /// </summary>
+        /// <param name="stringToConvert">referrs to itself</param>
+        /// <returns>the md5 hashed string</returns>
+        public static string ToSHA1(this string stringToConvert)
+        {
+            //create an instance of the SHA1CryptoServiceProvider
+            var md5Provider = new SHA1CryptoServiceProvider();
+
+            //convert our string into byte array
+            var byteArray = Encoding.UTF8.GetBytes(stringToConvert);
+
+            //get the hashed values created by our SHA1CryptoServiceProvider
+            var hashedByteArray = md5Provider.ComputeHash(byteArray);
+
+            //create a StringBuilder object
+            var stringBuilder = new StringBuilder();
+
+            //loop to each each byte
+            foreach (var b in hashedByteArray)
+            {
+                //append it to our StringBuilder
+                stringBuilder.Append(b.ToString("x2").ToLower());
+            }
+
+            //return the hashed value
+            return stringBuilder.ToString();
+        }
+

        /// <summary>
        /// Decodes a string that was encoded with UrlTokenEncode
@@ -26,5 +26,9 @@ namespace Umbraco.Core.Strings
        /// per content, in 1-to-1 multilingual configurations. Then there would be one
        /// url per culture.</remarks>
        string GetUrlSegment(IContentBase content, CultureInfo culture);
+
+        //TODO: For the 301 tracking, we need to add another extended interface to this so that 
+        // the RedirectTrackingEventHandler can ask the IUrlSegmentProvider if the URL is changing.
+        // Currently the way it works is very hacky, see notes in: RedirectTrackingEventHandler.ContentService_Publishing
    }
 }
@@ -52,8 +52,8 @@
    <Reference Include="ICSharpCode.SharpZipLib">
      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
    </Reference>
-    <Reference Include="ImageProcessor, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ImageProcessor.2.4.1.0\lib\net45\ImageProcessor.dll</HintPath>
+    <Reference Include="ImageProcessor, Version=2.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ImageProcessor.2.4.4.0\lib\net45\ImageProcessor.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
@@ -114,6 +114,7 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
    </Reference>
+    <Reference Include="System.DirectoryServices.AccountManagement" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Net.Http.WebRequest" />
@@ -427,9 +428,6 @@
    <Compile Include="Persistence\Mappers\MigrationEntryMapper.cs" />
    <Compile Include="Persistence\Migrations\LocalMigrationContext.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionFourOneZero\AddPreviewXmlTable.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable4.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable3.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable2.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\EnsureServersLockObject.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\AddRedirectUrlTable.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenFiveZero\RemoveStylesheetDataAndTablesAgain.cs" />
@@ -504,15 +502,19 @@
    <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
    <Compile Include="Publishing\UnPublishedStatusType.cs" />
    <Compile Include="Publishing\UnPublishStatus.cs" />
+    <Compile Include="Security\ActiveDirectoryBackOfficeUserPasswordChecker.cs" />
    <Compile Include="Security\BackOfficeClaimsIdentityFactory.cs" />
    <Compile Include="Security\BackOfficeCookieAuthenticationProvider.cs" />
    <Compile Include="Security\BackOfficeSignInManager.cs" />
    <Compile Include="Security\BackOfficeUserManager.cs" />
+    <Compile Include="Security\BackOfficeUserManagerMarker.cs" />
    <Compile Include="Security\BackOfficeUserPasswordCheckerResult.cs" />
    <Compile Include="Security\BackOfficeUserStore.cs" />
+    <Compile Include="Security\IBackOfficeUserManagerMarker.cs" />
    <Compile Include="Security\IBackOfficeUserPasswordChecker.cs" />
    <Compile Include="Security\MembershipPasswordHasher.cs" />
    <Compile Include="Security\EmailService.cs" />
+    <Compile Include="Security\OwinExtensions.cs" />
    <Compile Include="SemVersionExtensions.cs" />
    <Compile Include="Serialization\NoTypeConverterJsonConverter.cs" />
    <Compile Include="ServiceProviderExtensions.cs" />
@@ -1095,7 +1097,6 @@
    <Compile Include="Profiling\LogProfiler.cs" />
    <Compile Include="Profiling\ProfilerExtensions.cs" />
    <Compile Include="Profiling\ProfilerResolver.cs" />
-    <Compile Include="Profiling\WebProfiler.cs" />
    <Compile Include="PropertyEditors\DelimitedManifestValueValidator.cs" />
    <Compile Include="PropertyEditors\IntegerValidator.cs" />
    <Compile Include="PropertyEditors\ManifestPropertyValidator.cs" />
@@ -2,7 +2,7 @@
 <packages>
  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
  <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
-  <package id="ImageProcessor" version="2.4.1.0" targetFramework="net45" />
+  <package id="ImageProcessor" version="2.4.4.0" targetFramework="net45" />
  <package id="log4net-mediumtrust" version="2.0.0" targetFramework="net4" />
  <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
  <package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
@@ -28,5 +28,11 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
        {
            Assert.IsTrue(SettingsSection.WebRouting.DisableFindContentByIdPath == false);
        }
+
+        [Test]
+        public void DisableRedirectUrlTracking()
+        {
+            Assert.IsTrue(SettingsSection.WebRouting.DisableRedirectUrlTracking == false);
+        }
    }
 }
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using NUnit.Framework;
+using Umbraco.Core;
 using Umbraco.Web;

 namespace Umbraco.Tests.FrontEnd
@@ -48,5 +45,38 @@ namespace Umbraco.Tests.FrontEnd
            Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
        }

+        [Test]
+        public void Create_Encrypted_RouteString_From_Anonymous_Object()
+        {
+            var additionalRouteValues = new
+            {
+                key1 = "value1",
+                key2 = "value2",
+                Key3 = "Value3",
+                keY4 = "valuE4"
+        };
+            var encryptedRouteString = UmbracoHelper.CreateEncryptedRouteString("FormController", "FormAction", "", additionalRouteValues);
+            var result = encryptedRouteString.DecryptWithMachineKey();
+            var expectedResult = "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
+
+            Assert.AreEqual(expectedResult, result);
+        }
+
+        [Test]
+        public void Create_Encrypted_RouteString_From_Dictionary()
+        {
+            var additionalRouteValues = new Dictionary<string, object>()
+            {
+                {"key1", "value1"},
+                {"key2", "value2"},
+                {"Key3", "Value3"},
+                {"keY4", "valuE4"}
+            };
+            var encryptedRouteString = UmbracoHelper.CreateEncryptedRouteString("FormController", "FormAction", "", additionalRouteValues);
+            var result = encryptedRouteString.DecryptWithMachineKey();
+            var expectedResult = "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
+            
+            Assert.AreEqual(expectedResult, result);
+        }
    }
 }
@@ -119,13 +119,10 @@ namespace Umbraco.Tests.Migrations

                //pass in explicit migrations
                new DeleteRedirectUrlTable(SqlSyntax, logger),
-                new AddRedirectUrlTable(SqlSyntax, logger),
-                new AddRedirectUrlTable2(SqlSyntax, logger),
-                new AddRedirectUrlTable3(SqlSyntax, logger),
-                new AddRedirectUrlTable4(SqlSyntax, logger)
+                new AddRedirectUrlTable(SqlSyntax, logger)
            );

-            var db = new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Logger);
+            var db = new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Logger);

            var upgraded = migrationRunner.Execute(db, DatabaseProviders.SqlServerCE, true);
            Assert.IsTrue(upgraded);
@@ -100,7 +100,7 @@ namespace Umbraco.Tests.Migrations

        public UmbracoDatabase GetConfiguredDatabase()
        {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Mock.Of<ILogger>());
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Mock.Of<ILogger>());
        }


@@ -1,5 +1,6 @@
 using Moq;
 using NUnit.Framework;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -26,7 +27,7 @@ namespace Umbraco.Tests.Migrations.Upgrades

        public override UmbracoDatabase GetConfiguredDatabase()
        {
-            return new UmbracoDatabase("Server = 169.254.120.3; Database = upgradetest; Uid = umbraco; Pwd = umbraco", "MySql.Data.MySqlClient", Mock.Of<ILogger>());
+            return new UmbracoDatabase("Server = 169.254.120.3; Database = upgradetest; Uid = umbraco; Pwd = umbraco", Constants.DatabaseProviders.MySql, Mock.Of<ILogger>());
        }

        public override DatabaseProviders GetDatabaseProvider()
@@ -3,6 +3,7 @@ using Moq;
 using NUnit.Framework;
 using Semver;
 using SQLCE4Umbraco;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations;
@@ -64,7 +65,7 @@ namespace Umbraco.Tests.Migrations.Upgrades

        public override UmbracoDatabase GetConfiguredDatabase()
        {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Mock.Of<ILogger>());
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Mock.Of<ILogger>());
        }

        public override DatabaseProviders GetDatabaseProvider()
@@ -5,6 +5,7 @@ using System.IO;
 using Moq;
 using NUnit.Framework;
 using SQLCE4Umbraco;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -69,7 +70,7 @@ namespace Umbraco.Tests.Migrations.Upgrades

        public override UmbracoDatabase GetConfiguredDatabase()
        {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Mock.Of<ILogger>());
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Mock.Of<ILogger>());
        }

        public override DatabaseProviders GetDatabaseProvider()
@@ -1,5 +1,6 @@
 using Moq;
 using NUnit.Framework;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -24,7 +25,7 @@ namespace Umbraco.Tests.Migrations.Upgrades

        public override UmbracoDatabase GetConfiguredDatabase()
        {
-            return new UmbracoDatabase(@"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco", "System.Data.SqlClient", Mock.Of<ILogger>());
+            return new UmbracoDatabase(@"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco", Constants.DatabaseProviders.SqlServer, Mock.Of<ILogger>());
        }

        public override DatabaseProviders GetDatabaseProvider()
@@ -6,6 +6,7 @@ using System.Text.RegularExpressions;
 using Moq;
 using NUnit.Framework;
 using SQLCE4Umbraco;
+using Umbraco.Core;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
@@ -103,7 +104,7 @@ namespace Umbraco.Tests.Migrations.Upgrades

        public UmbracoDatabase GetConfiguredDatabase()
        {
-            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", "System.Data.SqlServerCe.4.0", Mock.Of<ILogger>());
+            return new UmbracoDatabase("Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;", Constants.DatabaseProviders.SqlCe, Mock.Of<ILogger>());
        }

        public string GetDatabaseSpecificSqlScript()
@@ -52,7 +52,7 @@ namespace Umbraco.Tests.Persistence

            var dbContext = new DatabaseContext(
                new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, _logger),
-                _logger, SqlSyntaxProvider, "System.Data.SqlServerCe.4.0");
+                _logger, SqlSyntaxProvider, Constants.DatabaseProviders.SqlCe);

            var repositoryFactory = new RepositoryFactory(cacheHelper, _logger, SqlSyntaxProvider, SettingsForTests.GenerateMockSettings());

@@ -25,7 +25,7 @@ namespace Umbraco.Tests.Persistence
 		{
            _dbContext = new DatabaseContext(
                new DefaultDatabaseFactory(Core.Configuration.GlobalSettings.UmbracoConnectionName, Mock.Of<ILogger>()),
-                Mock.Of<ILogger>(), new SqlCeSyntaxProvider(), "System.Data.SqlServerCe.4.0");
+                Mock.Of<ILogger>(), new SqlCeSyntaxProvider(), Constants.DatabaseProviders.SqlCe);

 			//unfortunately we have to set this up because the PetaPocoExtensions require singleton access
 			ApplicationContext.Current = new ApplicationContext(
@@ -87,7 +87,7 @@ namespace Umbraco.Tests.Persistence
                engine.CreateDatabase();
            }

-            var dbFactory = new DefaultDatabaseFactory(connString, "System.Data.SqlServerCe.4.0", Mock.Of<ILogger>());
+            var dbFactory = new DefaultDatabaseFactory(connString, Constants.DatabaseProviders.SqlCe, Mock.Of<ILogger>());
            //re-map the dbcontext to the new conn string
            _dbContext = new DatabaseContext(
                dbFactory,
@@ -1,6 +1,7 @@
 using System.Data.SqlClient;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence;

@@ -13,7 +14,7 @@ namespace Umbraco.Tests.Persistence.FaultHandling
        public void PetaPocoConnection_Cant_Connect_To_SqlDatabase_With_Invalid_User()
        {
            // Arrange
-            const string providerName = "System.Data.SqlClient";
+            const string providerName = Constants.DatabaseProviders.SqlServer;
            const string connectionString = @"server=.\SQLEXPRESS;database=EmptyForTest;user id=x;password=umbraco";
            var factory = new DefaultDatabaseFactory(connectionString, providerName, Mock.Of<ILogger>());
            var database = factory.CreateDatabase();
@@ -27,7 +28,7 @@ namespace Umbraco.Tests.Persistence.FaultHandling
        public void PetaPocoConnection_Cant_Connect_To_SqlDatabase_Because_Of_Network()
        {
            // Arrange
-            const string providerName = "System.Data.SqlClient";
+            const string providerName = Constants.DatabaseProviders.SqlServer;
            const string connectionString = @"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco";
            var factory = new DefaultDatabaseFactory(connectionString, providerName, Mock.Of<ILogger>());
            var database = factory.CreateDatabase();
@@ -32,7 +32,7 @@ namespace Umbraco.Tests.Persistence
            base.Initialize();

            _database = new Database("Server = 169.254.120.3; Database = testdb; Uid = umbraco; Pwd = umbraco",
-                                     "MySql.Data.MySqlClient");
+                                     Constants.DatabaseProviders.MySql);
        }

        [TearDown]
@@ -98,7 +98,7 @@ namespace Umbraco.Tests.Persistence.Querying
                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("c66ba18e-eaf3-4cff-8a22-41b16d66a972"))
                .Where("([umbracoNode].[id] = @0)", 1050)
                .Where("([cmsContentVersion].[VersionId] = @0)", new Guid("2b543516-a944-4ee6-88c6-8813da7aaa07"))
-                .OrderBy("[cmsContentVersion].[VersionDate] DESC");
+                .OrderBy("([cmsContentVersion].[VersionDate]) DESC");

            var sql = new Sql();
            sql.Select("*")
@@ -117,5 +117,20 @@ namespace Umbraco.Tests.Persistence.Querying
            Assert.AreEqual("mydomain\\myuser%", modelToSqlExpressionHelper.GetSqlParameters()[0]);
        }

+        [Test]
+        public void Sql_Replace_Mapped()
+        {
+            Expression<Func<IUser, bool>> predicate = user => user.Username.Replace("@world", "@test") == "hello@test.com";
+            var modelToSqlExpressionHelper = new ModelToSqlExpressionHelper<IUser>();
+            var result = modelToSqlExpressionHelper.Visit(predicate);
+
+            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+
+            Assert.AreEqual("(replace([umbracoUser].[userLogin], @1, @2) = @0)", result);
+            Assert.AreEqual("hello@test.com", modelToSqlExpressionHelper.GetSqlParameters()[0]);
+            Assert.AreEqual("@world", modelToSqlExpressionHelper.GetSqlParameters()[1]);
+            Assert.AreEqual("@test", modelToSqlExpressionHelper.GetSqlParameters()[2]);
+        }
+
    }
-}
+}
@@ -46,7 +46,7 @@ namespace Umbraco.Tests.Persistence
            }
            
            _database = new Database("Datasource=|DataDirectory|test.sdf;Flush Interval=1;",
-                                     "System.Data.SqlServerCe.4.0");
+                                     Constants.DatabaseProviders.SqlCe);
        }

        [TearDown]
@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Persistence
            base.Initialize();           

            _database = new Database(@"server=.\SQLEXPRESS;database=EmptyForTest;user id=umbraco;password=umbraco",
-                                     "System.Data.SqlClient");
+                                     Constants.DatabaseProviders.SqlServer);
        }

        [TearDown]
@@ -7,6 +7,7 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Configuration.UmbracoSettings;
+using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
@@ -15,6 +16,7 @@ using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
+using Umbraco.Core.Publishing;
 using Umbraco.Core.Services;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
@@ -877,6 +879,46 @@ namespace Umbraco.Tests.Services
            Assert.That(content.Published, Is.True);
        }

+        [Test]
+        public void Can_Publish_Content_WithEvents()
+        {
+            ContentService.Publishing += ContentServiceOnPublishing;
+
+            // tests that during 'publishing' event, what we get from the repo is the 'old' content,
+            // because 'publishing' fires before the 'saved' event ie before the content is actually
+            // saved
+
+            try
+            {
+                var contentService = ServiceContext.ContentService;
+                var content = contentService.GetById(NodeDto.NodeIdSeed + 1);
+                Assert.AreEqual("Home", content.Name);
+
+                content.Name = "foo";
+                var published = contentService.Publish(content, 0);
+
+                Assert.That(published, Is.True);
+                Assert.That(content.Published, Is.True);
+
+                var e = ServiceContext.ContentService.GetById(content.Id);
+                Assert.AreEqual("foo", e.Name);
+            }
+            finally
+            {
+                ContentService.Publishing -= ContentServiceOnPublishing;
+            }
+        }
+
+        private void ContentServiceOnPublishing(IPublishingStrategy sender, PublishEventArgs<IContent> args)
+        {
+            Assert.AreEqual(1, args.PublishedEntities.Count());
+            var entity = args.PublishedEntities.First();
+            Assert.AreEqual("foo", entity.Name);
+
+            var e = ServiceContext.ContentService.GetById(entity.Id);
+            Assert.AreEqual("Home", e.Name);
+        }
+
        [Test]
        public void Can_Publish_Only_Valid_Content()
        {
@@ -8,6 +8,7 @@ using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
@@ -33,6 +34,34 @@ namespace Umbraco.Tests.Services
            base.TearDown();
        }

+        [Test]
+        public void Can_Create_Member()
+        {
+            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
+            ServiceContext.MemberTypeService.Save(memberType);
+            IMember member = MockedMember.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+            ServiceContext.MemberService.Save(member);
+
+            Assert.AreNotEqual(0, member.Id);
+            var foundMember = ServiceContext.MemberService.GetById(member.Id);
+            Assert.IsNotNull(foundMember);
+            Assert.AreEqual("test@test.com", foundMember.Email);
+        }
+
+        [Test]
+        public void Can_Create_Member_With_Long_TLD_In_Email()
+        {
+            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
+            ServiceContext.MemberTypeService.Save(memberType);
+            IMember member = MockedMember.CreateSimpleMember(memberType, "test", "test@test.marketing", "pass", "test");
+            ServiceContext.MemberService.Save(member);
+
+            Assert.AreNotEqual(0, member.Id);
+            var foundMember = ServiceContext.MemberService.GetById(member.Id);
+            Assert.IsNotNull(foundMember);
+            Assert.AreEqual("test@test.marketing", foundMember.Email);
+        }
+
        [Test]
        public void Can_Create_Role()
        {
@@ -44,7 +44,7 @@ namespace Umbraco.Tests.Services

        protected override string GetDbProviderName()
        {
-            return "System.Data.SqlClient";
+            return Constants.DatabaseProviders.SqlServer;
        }


@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Services
 			//it is multi-threaded.
 			_dbFactory = new PerThreadDatabaseFactory(Logger);
 			//overwrite the local object
-            ApplicationContext.DatabaseContext = new DatabaseContext(_dbFactory, Logger, new SqlCeSyntaxProvider(), "System.Data.SqlServerCe.4.0");
+            ApplicationContext.DatabaseContext = new DatabaseContext(_dbFactory, Logger, new SqlCeSyntaxProvider(), Constants.DatabaseProviders.SqlCe);

            //disable cache
 		    var cacheHelper = CacheHelper.CreateDisabledCacheHelper();
@@ -60,7 +60,7 @@ namespace Umbraco.Tests.TestHelpers
            var syntaxProvider = new SqlCeSyntaxProvider();
            SqlSyntaxContext.SqlSyntaxProvider = syntaxProvider;

-            _database = new UmbracoDatabase(connectionString, "System.Data.SqlServerCe.4.0", Mock.Of<ILogger>());
+            _database = new UmbracoDatabase(connectionString, Constants.DatabaseProviders.SqlCe, Mock.Of<ILogger>());

            // First remove anything in the database
            var creation = new DatabaseSchemaCreation(_database, Mock.Of<ILogger>(), syntaxProvider);
--- a/Show More
+++ b/Show More