Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8

# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs

.gitignore

@@ -139,4 +139,5 @@ src/PrecompiledWeb/*
 
 build.out/
 build.tmp/
-build/Modules/*/temp/
+build/Modules/*/temp/
+/src/.idea/*

build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1

@@ -44,7 +44,7 @@ function Build-UmbracoDocs
   # change baseUrl
   $baseUrl = "https://our.umbraco.org/apidocs/ui/"
   $indexPath = "$src/Umbraco.Web.UI.Client/docs/api/index.html"
-  (Get-Content $indexPath).Replace("location.href.replace(rUrl, indexFile)", "'$baseUrl'") `
+  (Get-Content $indexPath).Replace("origin + location.href.substr(origin.length).replace(rUrl, indexFile)", "'$baseUrl'") `
     | Set-Content $indexPath
     
   # restore
@@ -100,8 +100,9 @@ function Get-DocFx($uenv, $buildTemp)
   $docFx = "$buildTemp\docfx"
   if (-not (test-path $docFx))
   {
-    Write-Host "Download DocFx..."
     $source = "https://github.com/dotnet/docfx/releases/download/v2.19.2/docfx.zip"
+    Write-Host "Download DocFx from $source"
+    
     Invoke-WebRequest $source -OutFile "$buildTemp\docfx.zip"
     
     &$uenv.Zip x "$buildTemp\docfx.zip" -o"$buildTemp\docfx" -aos > $nul

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -27,7 +27,6 @@
       <dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
       <dependency id="HtmlAgilityPack" version="[1.4.9.5, 2.0.0)" />
       <dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
-      <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
       <dependency id="MySql.Data" version="[6.9.9, 7.0.0)" />
       <dependency id="ClientDependency" version="[1.9.6, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />

build/NuSpecs/UmbracoCms.nuspec

@@ -32,6 +32,7 @@
     <file src="$BuildTmp$\WebApp\bin\amd64\**" target="UmbracoFiles\bin\amd64" />
     <file src="$BuildTmp$\WebApp\bin\x86\**" target="UmbracoFiles\bin\x86" />
     <file src="$BuildTmp$\WebApp\config\splashes\**" target="UmbracoFiles\Config\splashes" />
+    <file src="$BuildTmp$\WebApp\config\BackOfficeTours\**" target="Content\Config\BackOfficeTours" />
     <file src="$BuildTmp$\WebApp\umbraco\**" target="UmbracoFiles\umbraco" />
     <file src="$BuildTmp$\WebApp\umbraco_client\**" target="UmbracoFiles\umbraco_client" />
     <file src="$BuildTmp$\WebApp\Media\Web.config" target="Content\Media\Web.config" />

build/NuSpecs/tools/install.ps1

@@ -98,10 +98,51 @@ if ($project) {
 		$umbracoUIXMLDestination = Join-Path $projectPath "Umbraco\Config\Create\UI.xml"
 		Copy-Item $umbracoUIXMLSource $umbracoUIXMLDestination -Force
 	} else {
+		# This part only runs for upgrades
+	
 		$upgradeViewSource = Join-Path $umbracoFolderSource "Views\install\*"
 		$upgradeView = Join-Path $umbracoFolder "Views\install\"
 		Write-Host "Copying2 ${upgradeViewSource} to ${upgradeView}"
 		Copy-Item $upgradeViewSource $upgradeView -Force
+		
+		Try 
+		{
+			# Disable tours for upgrades, presumably Umbraco experience is already available
+			$umbracoSettingsConfigPath = Join-Path $configFolder "umbracoSettings.config"
+			$content = (Get-Content $umbracoSettingsConfigPath).Replace('<tours enable="true">','<tours enable="false">')
+			# Saves with UTF-8 encoding without BOM which makes sure Umbraco can still read it
+			# Reference: https://stackoverflow.com/a/32951824/5018
+			[IO.File]::WriteAllLines($umbracoSettingsConfigPath, $content)
+		} 
+		Catch 
+		{
+			# Not a big problem if this fails, let it go
+		}
+		
+		Try 
+		{
+			$uiXmlConfigPath = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+			$uiXmlFile = Join-Path $umbracoFolder -ChildPath "Config" | Join-Path -ChildPath "create" | Join-Path -ChildPath "UI.xml"
+
+			$uiXml = New-Object System.Xml.XmlDocument
+			$uiXml.PreserveWhitespace = $true
+
+			$uiXml.Load($uiXmlFile)
+			$createExists = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks/create")
+
+			if($createExists.Count -eq 0) 
+			{    
+				$macrosTasksNode = $uiXml.SelectNodes("//nodeType[@alias='macros']/tasks")
+
+				#Creating: <create assembly="umbraco" type="macroTasks" />
+				$createNode = $uiXml.CreateElement("create")
+				$createNode.SetAttribute("assembly", "umbraco")
+				$createNode.SetAttribute("type", "macroTasks")
+				$macrosTasksNode.AppendChild($createNode)
+				$uiXml.Save($uiXmlFile)
+			}
+		} 
+		Catch { }
 	}
 	
 	$installFolder = Join-Path $projectPath "Install"

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

@@ -79,14 +79,14 @@
   <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" 
+
+  <add initialize="true" sortOrder="2" alias="macros" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MacroTreeController, umbraco"
        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()" />
-  <add application="developer" alias="xslt" title="XSLT Files" type="umbraco.loadXslt, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="5" 
+  <add initialize="true" sortOrder="5" alias="xslt" application="developer" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.XsltTreeController, umbraco"
        xdt:Locator="Match(application,alias)" 
        xdt:Transform="SetAttributes()" />
   

src/SolutionInfo.cs

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

src/Umbraco.Core/ApplicationContext.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Configuration;
 using System.Threading;
+using Semver;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
@@ -354,6 +355,52 @@ namespace Umbraco.Core
 			}
 		}
 
+        /// <summary>
+        /// Gets the Current Version of the Umbraco Site before an upgrade
+        /// by using the last/most recent Umbraco Migration that has been run
+        /// </summary>
+        /// <returns>A SemVersion of the latest Umbraco DB Migration run</returns>
+        /// <remarks>
+        /// NOTE: This existed in the InstallHelper previously but should really be here so it can be re-used if necessary
+        /// </remarks>
+        internal SemVersion CurrentVersion()
+        {
+            //Set a default version of 0.0.0
+            var version = new SemVersion(0);
+
+            //If we have a db context available, if we don't then we are not installed anyways
+            if (DatabaseContext.IsDatabaseConfigured && DatabaseContext.CanConnect)
+                version = DatabaseContext.ValidateDatabaseSchema().DetermineInstalledVersionByMigrations(Services.MigrationEntryService);
+
+            if (version != new SemVersion(0))
+                return version;
+
+            // If we aren't able to get a result from the umbracoMigrations table then use the version in web.config, if it's available
+            if (string.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus))
+                return version;
+
+            var configuredVersion = GlobalSettings.ConfigurationStatus;
+
+            string currentComment = null;
+
+            var current = configuredVersion.Split('-');
+            if (current.Length > 1)
+                currentComment = current[1];
+
+            Version currentVersion;
+            if (Version.TryParse(current[0], out currentVersion))
+            {
+                version = new SemVersion(
+                    currentVersion.Major,
+                    currentVersion.Minor,
+                    currentVersion.Build,
+                    string.IsNullOrWhiteSpace(currentComment) ? null : currentComment,
+                    currentVersion.Revision > 0 ? currentVersion.Revision.ToString() : null);
+            }
+
+            return version;
+        }
+
         private void AssertIsNotReady()
         {
             if (this.IsReady)

src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs

@@ -146,7 +146,7 @@ namespace Umbraco.Core.Cache
         #region Insert
         #endregion
 
-        private class NoopLocker : DisposableObject
+        private class NoopLocker : DisposableObjectSlim
         {
             protected override void DisposeResources()
             { }

src/Umbraco.Core/Collections/TypeList.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Represents a list of types.
+    /// </summary>
+    /// <remarks>Types in the list are, or derive from, or implement, the base type.</remarks>
+    /// <typeparam name="TBase">The base type.</typeparam>
+    internal class TypeList<TBase>
+    {
+        private readonly List<Type> _list = new List<Type>();
+
+        /// <summary>
+        /// Adds a type to the list.
+        /// </summary>
+        /// <typeparam name="T">The type to add.</typeparam>
+        public void Add<T>()
+            where T : TBase
+        {
+            _list.Add(typeof(T));
+        }
+
+        /// <summary>
+        /// Determines whether a type is in the list.
+        /// </summary>
+        public bool Contains(Type type)
+        {
+            return _list.Contains(type);
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class BackOfficeElement : UmbracoConfigurationElement, IBackOfficeSection
+    {
+        [ConfigurationProperty("tours")]
+        internal TourConfigElement Tours
+        {
+            get { return (TourConfigElement)this["tours"]; }
+        }
+
+        ITourSection IBackOfficeSection.Tours
+        {
+            get { return Tours; }
+        }
+    }
+}

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

@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IBackOfficeSection
+    {
+        ITourSection Tours { get; }
+    }
+}

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

@@ -0,0 +1,7 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface ITourSection
+    {
+        bool EnableTours { get; }
+    }
+}

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

@@ -5,6 +5,8 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 {
     public interface IUmbracoSettingsSection : IUmbracoConfigurationSection
     {
+        IBackOfficeSection BackOffice { get; }
+
         IContentSection Content { get; }
 
         ISecuritySection Security { get; }

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

@@ -0,0 +1,17 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class TourConfigElement : UmbracoConfigurationElement, ITourSection
+    {
+        //disabled by default so that upgraders don't get it enabled by default
+        //TODO: we probably just want to disable the initial one from automatically loading ?
+        [ConfigurationProperty("enable", DefaultValue = false)]
+        public bool EnableTours
+        {
+            get { return (bool)this["enable"]; }
+        }
+
+        //TODO: We could have additional filters, etc... defined here
+    }
+}

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

@@ -8,6 +8,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
 
     public class UmbracoSettingsSection : ConfigurationSection, IUmbracoSettingsSection
     {
+        [ConfigurationProperty("backOffice")]
+        internal BackOfficeElement BackOffice
+        {
+            get { return (BackOfficeElement)this["backOffice"]; }
+        }
+
         [ConfigurationProperty("content")]
         internal ContentElement Content
         {
@@ -149,6 +155,11 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
             get { return Templates; }
         }
 
+        IBackOfficeSection IUmbracoSettingsSection.BackOffice
+        {
+            get { return BackOffice; }
+        }
+
         IDeveloperSection IUmbracoSettingsSection.Developer
         {
             get { return Developer; }

src/Umbraco.Core/Configuration/UmbracoVersion.cs

@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.7.10");
+        private static readonly Version Version = new Version("7.8.1");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/Constants-Applications.cs

@@ -73,6 +73,11 @@
             /// </summary>
             public const string Media = "media";
 
+            /// <summary>
+            /// alias for the macro tree.
+            /// </summary>
+            public const string Macros = "macros";
+            
             /// <summary>
             /// alias for the datatype tree.
             /// </summary>

src/Umbraco.Core/Constants-System.cs

@@ -11,17 +11,53 @@
             /// The integer identifier for global system root node.
             /// </summary>
             public const int Root = -1;
+
+            /// <summary>
+            /// The string identifier for global system root node.
+            /// </summary>
+            /// <remarks>Use this instead of re-creating the string everywhere.</remarks>
+            public const string RootString = "-1";
 
             /// <summary>
             /// The integer identifier for content's recycle bin.
             /// </summary>
             public const int RecycleBinContent = -20;
+
+            /// <summary>
+            /// The string identifier for content's recycle bin.
+            /// </summary>
+            /// <remarks>Use this instead of re-creating the string everywhere.</remarks>
+            public const string RecycleBinContentString = "-20";
+
+            /// <summary>
+            /// The string path prefix of the content's recycle bin.
+            /// </summary>
+            /// <remarks>
+            /// <para>Everything that is in the content recycle bin, has a path that starts with the prefix.</para>
+            /// <para>Use this instead of re-creating the string everywhere.</para>
+            /// </remarks>
+            public const string RecycleBinContentPathPrefix = "-1,-20,";
 
             /// <summary>
             /// The integer identifier for media's recycle bin.
             /// </summary>
             public const int RecycleBinMedia = -21;
 
+            /// <summary>
+            /// The string identifier for media's recycle bin.
+            /// </summary>
+            /// <remarks>Use this instead of re-creating the string everywhere.</remarks>
+            public const string RecycleBinMediaString = "-21";
+
+            /// <summary>
+            /// The string path prefix of the media's recycle bin.
+            /// </summary>
+            /// <remarks>
+            /// <para>Everything that is in the media recycle bin, has a path that starts with the prefix.</para>
+            /// <para>Use this instead of re-creating the string everywhere.</para>
+            /// </remarks>
+            public const string RecycleBinMediaPathPrefix = "-1,-21,";
+
             public const int DefaultContentListViewDataTypeId = -95;
             public const int DefaultMediaListViewDataTypeId = -96;
             public const int DefaultMembersListViewDataTypeId = -97;
@@ -29,6 +65,6 @@
             public const string UmbracoConnectionName = "umbracoDbDSN";
             public const string UmbracoMigrationName = "Umbraco";
         }
-        
+
     }
 }

src/Umbraco.Core/DisposableObject.cs

@@ -2,60 +2,60 @@ using System;
 using System.Threading;
 
 namespace Umbraco.Core
-{
-	/// <summary>
-	/// Abstract implementation of IDisposable.
-	/// </summary>
-	/// <remarks>
-	/// Can also be used as a pattern for when inheriting is not possible.
-	/// 
+{
+    /// <summary>
+    /// Abstract implementation of IDisposable.
+    /// </summary>
+    /// <remarks>
+    /// Can also be used as a pattern for when inheriting is not possible.
+    /// 
     /// See also: https://msdn.microsoft.com/en-us/library/b1yfkh5e%28v=vs.110%29.aspx
     /// See also: https://lostechies.com/chrispatterson/2012/11/29/idisposable-done-right/
     /// 
     /// Note: if an object's ctor throws, it will never be disposed, and so if that ctor
     /// has allocated disposable objects, it should take care of disposing them.
-	/// </remarks>
-	public abstract class DisposableObject : IDisposable
-	{
-		private bool _disposed;
-	    private readonly object _locko = new object();
-
-		// gets a value indicating whether this instance is disposed.
+    /// </remarks>
+    public abstract class DisposableObject : IDisposable
+    {
+        private bool _disposed;
+        private readonly object _locko = new object();
+
+        // gets a value indicating whether this instance is disposed.
         // for internal tests only (not thread safe)
         //TODO make this internal + rename "Disposed" when we can break compatibility
-		public bool IsDisposed { get { return _disposed; } }
-
-		// implements IDisposable
-		public void Dispose()
-		{
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-        // finalizer
-		~DisposableObject()
-		{
-			Dispose(false);
-		}
+        public bool IsDisposed { get { return _disposed; } }
+
+        // implements IDisposable
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        // finalizer
+        ~DisposableObject()
+        {
+            Dispose(false);
+        }
 
         //TODO make this private, non-virtual when we can break compatibility
-        protected virtual void Dispose(bool disposing)
-		{
-		    lock (_locko)
-		    {
-		        if (_disposed) return;
-		        _disposed = true;
-		    }
+        protected virtual void Dispose(bool disposing)
+        {
+            lock (_locko)
+            {
+                if (_disposed) return;
+                _disposed = true;
+            }
 
             DisposeUnmanagedResources();
 
             if (disposing)
-                DisposeResources();
-		}
-
-		protected abstract void DisposeResources();
-
-		protected virtual void DisposeUnmanagedResources()
-		{ }
-	}
+                DisposeResources();
+        }
+
+        protected abstract void DisposeResources();
+
+        protected virtual void DisposeUnmanagedResources()
+        { }
+    }
 }

src/Umbraco.Core/DisposableObjectSlim.cs

@@ -0,0 +1,38 @@
+using System;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// This should not be use if there are ubmanaged resources to be disposed, use DisposableObject instead
+    /// </summary>
+    public abstract class DisposableObjectSlim : IDisposable
+    {
+        private bool _disposed;
+        private readonly object _locko = new object();
+
+        // gets a value indicating whether this instance is disposed.
+        // for internal tests only (not thread safe)
+        internal bool Disposed { get { return _disposed; } }
+
+        // implements IDisposable
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            lock (_locko)
+            {
+                if (_disposed) return;
+                _disposed = true;
+            }
+
+            if (disposing)
+                DisposeResources();
+        }
+
+        protected abstract void DisposeResources();
+    }
+}

src/Umbraco.Core/DisposableTimer.cs

@@ -11,8 +11,8 @@ namespace Umbraco.Core
 	/// <summary>
 	/// Starts the timer and invokes a  callback upon disposal. Provides a simple way of timing an operation by wrapping it in a <code>using</code> (C#) statement.
 	/// </summary>
-	public class DisposableTimer : DisposableObject
-	{
+	public class DisposableTimer : DisposableObjectSlim
+    {
 	    private readonly ILogger _logger;
 	    private readonly LogType? _logType;
 	    private readonly IProfiler _profiler;
@@ -209,13 +209,13 @@ namespace Umbraco.Core
                 loggerType,
                 startMessage(),
                 completeMessage());
-        } 
+        }
         #endregion
-
-		/// <summary>
-		/// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
-		/// </summary>
-		protected override void DisposeResources()
+
+        /// <summary>
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
+        /// </summary>
+        protected override void DisposeResources()
 		{
             if (_profiler != null)
             {

src/Umbraco.Core/Events/EventMessages.cs

@@ -5,7 +5,7 @@ namespace Umbraco.Core.Events
     /// <summary>
     /// Event messages collection
     /// </summary>
-    public sealed class EventMessages : DisposableObject
+    public sealed class EventMessages : DisposableObjectSlim
     {
         private readonly List<EventMessage> _msgs = new List<EventMessage>();
 

src/Umbraco.Core/HashGenerator.cs

@@ -14,7 +14,7 @@ namespace Umbraco.Core
     /// This will use the crypto libs to generate the hash and will try to ensure that 
     /// strings, etc... are not re-allocated so it's not consuming much memory.
     /// </remarks>
-    internal class HashGenerator : DisposableObject
+    internal class HashGenerator : DisposableObjectSlim
     {
         public HashGenerator()
         {

src/Umbraco.Core/HttpContextExtensions.cs

@@ -26,13 +26,13 @@ namespace Umbraco.Core
                 var ipAddress = httpContext.Request.ServerVariables["HTTP_X_FORWARDED_FOR"];
 
                 if (string.IsNullOrEmpty(ipAddress))
-                    return httpContext.Request.ServerVariables["REMOTE_ADDR"];
+                    return httpContext.Request.UserHostAddress;
 
                 var addresses = ipAddress.Split(',');
                 if (addresses.Length != 0)
                     return addresses[0];
 
-                return httpContext.Request.ServerVariables["REMOTE_ADDR"];
+                return httpContext.Request.UserHostAddress;
             }
             catch (System.Exception ex)
             {

src/Umbraco.Core/IO/PhysicalFileSystem.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.IO
@@ -107,7 +108,7 @@ namespace Umbraco.Core.IO
 
             try
             {
-                Directory.Delete(fullPath, recursive);
+                WithRetry(() => Directory.Delete(fullPath, recursive));
             }
             catch (DirectoryNotFoundException ex)
             {
@@ -225,8 +226,8 @@ namespace Umbraco.Core.IO
                 return;
 
             try
-            {
-                File.Delete(fullPath);
+            {
+                WithRetry(() => File.Delete(fullPath));
             }
             catch (FileNotFoundException ex)
             {
@@ -378,7 +379,7 @@ namespace Umbraco.Core.IO
             {
                 if (overrideIfExists == false)
                     throw new InvalidOperationException(string.Format("A file at path '{0}' already exists", path));
-                File.Delete(fullPath);
+                WithRetry(() => File.Delete(fullPath));
             }
 
             var directory = Path.GetDirectoryName(fullPath);
@@ -386,9 +387,9 @@ namespace Umbraco.Core.IO
             Directory.CreateDirectory(directory); // ensure it exists
 
             if (copy)
-                File.Copy(physicalPath, fullPath);
+                WithRetry(() => File.Copy(physicalPath, fullPath));
             else
-                File.Move(physicalPath, fullPath);
+                WithRetry(() => File.Move(physicalPath, fullPath));
         }
 
         #region Helper Methods
@@ -417,6 +418,35 @@ namespace Umbraco.Core.IO
             return path;
         }
 
+        protected void WithRetry(Action action)
+        {
+            // 10 times 100ms is 1s
+            const int count = 10;
+            const int pausems = 100;
+
+            for (var i = 0;; i++)
+            {
+                try
+                {
+                    action();
+                    break; // done
+                }
+                catch (IOException e)
+                {
+                    // if it's not *exactly* IOException then it could be
+                    // some inherited exception such as FileNotFoundException,
+                    // and then we don't want to retry
+                    if (e.GetType() != typeof(IOException)) throw;
+
+                    // if we have tried enough, throw, else swallow
+                    // the exception and retry after a pause
+                    if (i == count) throw;
+                }
+
+                Thread.Sleep(pausems);
+            }
+        }
+
         #endregion
     }
 }

src/Umbraco.Core/Manifest/ManifestWatcher.cs

@@ -6,7 +6,7 @@ using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Manifest
 {
-    internal class ManifestWatcher : DisposableObject
+    internal class ManifestWatcher : DisposableObjectSlim
     {
         private readonly ILogger _logger;
         private readonly List<FileSystemWatcher> _fws = new List<FileSystemWatcher>();

src/Umbraco.Core/Models/AuditItem.cs

@@ -2,18 +2,30 @@
 
 namespace Umbraco.Core.Models
 {
-    public sealed class AuditItem : Entity, IAggregateRoot
+    public sealed class AuditItem : Entity, IAuditItem
     {
+        /// <summary>
+        /// Constructor for creating an item to be created
+        /// </summary>
+        /// <param name="objectId"></param>
+        /// <param name="comment"></param>
+        /// <param name="type"></param>
+        /// <param name="userId"></param>
         public AuditItem(int objectId, string comment, AuditType type, int userId)
         {
+            DisableChangeTracking();
+
             Id = objectId;
             Comment = comment;
             AuditType = type;
             UserId = userId;
+
+            EnableChangeTracking();
         }
 
         public string Comment { get; private set; }
         public AuditType AuditType { get; private set; }
         public int UserId { get; private set; }
+     
     }
 }

src/Umbraco.Core/Models/IAuditItem.cs

@@ -0,0 +1,12 @@
+using System;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+    public interface IAuditItem : IAggregateRoot
+    {
+        string Comment { get; }
+        AuditType AuditType { get; }
+        int UserId { get; }
+    }
+}

src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs

@@ -40,19 +40,6 @@ namespace Umbraco.Core.Models.Identity
                     identityUser.EnableChangeTracking();
                 });
             
-            config.CreateMap<BackOfficeIdentityUser, UserData>()
-                .ConstructUsing((BackOfficeIdentityUser user) => new UserData(Guid.NewGuid().ToString("N"))) //this is the 'session id'
-                .ForMember(detail => detail.Id, opt => opt.MapFrom(user => user.Id))
-                .ForMember(detail => detail.AllowedApplications, opt => opt.MapFrom(user => user.AllowedSections))
-                .ForMember(detail => detail.Roles, opt => opt.MapFrom(user => user.Roles.Select(x => x.RoleId).ToArray()))
-                .ForMember(detail => detail.RealName, opt => opt.MapFrom(user => user.Name))
-                //When mapping to UserData which is used in the authcookie we want ALL start nodes including ones defined on the groups
-                .ForMember(detail => detail.StartContentNodes, opt => opt.MapFrom(user => user.CalculatedContentStartNodeIds))
-                //When mapping to UserData which is used in the authcookie we want ALL start nodes including ones defined on the groups
-                .ForMember(detail => detail.StartMediaNodes, opt => opt.MapFrom(user => user.CalculatedMediaStartNodeIds))
-                .ForMember(detail => detail.Username, opt => opt.MapFrom(user => user.UserName))
-                .ForMember(detail => detail.Culture, opt => opt.MapFrom(user => user.Culture))
-                .ForMember(detail => detail.SessionId, opt => opt.MapFrom(user => user.SecurityStamp.IsNullOrWhiteSpace() ? Guid.NewGuid().ToString("N") : user.SecurityStamp));
         }
 
         private string GetPasswordHash(string storedPass)

src/Umbraco.Core/Models/Membership/IUser.cs

@@ -69,6 +69,11 @@ namespace Umbraco.Core.Models.Membership
         /// <summary>
         /// Will hold the media file system relative path of the users custom avatar if they uploaded one
         /// </summary>
-        string Avatar { get; set; }
+        string Avatar { get; set; }
+
+        /// <summary>
+        /// A Json blob stored for recording tour data for a user
+        /// </summary>
+        string TourData { get; set; }
     }
 }

src/Umbraco.Core/Models/Membership/User.cs

@@ -99,6 +99,7 @@ namespace Umbraco.Core.Models.Membership
         private string _name;
         private string _securityStamp;
         private string _avatar;
+        private string _tourData;
         private int _sessionTimeout;
         private int[] _startContentIds;
         private int[] _startMediaIds;
@@ -132,6 +133,7 @@ namespace Umbraco.Core.Models.Membership
 
             public readonly PropertyInfo SecurityStampSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.SecurityStamp);
             public readonly PropertyInfo AvatarSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Avatar);
+            public readonly PropertyInfo TourDataSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.TourData);
             public readonly PropertyInfo SessionTimeoutSelector = ExpressionHelper.GetPropertyInfo<User, int>(x => x.SessionTimeout);
             public readonly PropertyInfo StartContentIdSelector = ExpressionHelper.GetPropertyInfo<User, int[]>(x => x.StartContentIds);
             public readonly PropertyInfo StartMediaIdSelector = ExpressionHelper.GetPropertyInfo<User, int[]>(x => x.StartMediaIds);
@@ -464,8 +466,18 @@ namespace Umbraco.Core.Models.Membership
         {
             get { return _avatar; }
             set { SetPropertyValueAndDetectChanges(value, ref _avatar, Ps.Value.AvatarSelector); }
-        }        
+        }
 
+        /// <summary>
+        /// A Json blob stored for recording tour data for a user
+        /// </summary>
+        [DataMember]
+        public string TourData
+        {
+            get { return _tourData; }
+            set { SetPropertyValueAndDetectChanges(value, ref _tourData, Ps.Value.TourDataSelector); }
+        }
+
         /// <summary>
         /// Gets or sets the session timeout.
         /// </summary>

src/Umbraco.Core/Models/Rdbms/CacheInstructionDto.cs

@@ -27,5 +27,10 @@ namespace Umbraco.Core.Models.Rdbms
         [NullSetting(NullSetting = NullSettings.NotNull)]
         [Length(500)]
         public string OriginIdentity { get; set; }
+
+        [Column("instructionCount")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        [Constraint(Default = 1)]
+        public int InstructionCount { get; set; }
     }
 }

src/Umbraco.Core/Models/Rdbms/ContentDto.cs

@@ -24,4 +24,5 @@ namespace Umbraco.Core.Models.Rdbms
         [ResultColumn]
         public NodeDto NodeDto { get; set; }
     }
+    
 }

src/Umbraco.Core/Models/Rdbms/LogDto.cs

@@ -32,6 +32,6 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("logComment")]
         [NullSetting(NullSetting = NullSettings.Null)]
         [Length(4000)]
-        public string Comment { get; set; }
+        public string Comment { get; set; }        
     }
 }

src/Umbraco.Core/Models/Rdbms/MediaDto.cs

@@ -0,0 +1,29 @@
+using System;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
+
+namespace Umbraco.Core.Models.Rdbms
+{
+    [TableName("cmsMedia")]
+    [PrimaryKey("versionId", autoIncrement = false)]
+    [ExplicitColumns]
+    internal class MediaDto
+    {
+        [Column("nodeId")]
+        [ForeignKey(typeof(ContentDto), Column = "nodeId")]
+        [ForeignKey(typeof(NodeDto))]
+        [Index(IndexTypes.UniqueNonClustered, Name = "IX_cmsMedia", ForColumns = "nodeId, versionId, mediaPath")]
+        public int NodeId { get; set; }        
+
+        [Column("versionId")]
+        [PrimaryKeyColumn(AutoIncrement = false)]
+        public Guid VersionId { get; set; }
+        
+        [Column("mediaPath")]
+        [NullSetting(NullSetting = NullSettings.Null)]
+        public string MediaPath { get; set; }
+
+        [ResultColumn]
+        public ContentVersionDto ContentVersionDto { get; set; }
+    }
+}

src/Umbraco.Core/Models/Rdbms/PropertyTypeDto.cs

@@ -27,6 +27,7 @@ namespace Umbraco.Core.Models.Rdbms
         [ForeignKey(typeof(PropertyTypeGroupDto))]
         public int? PropertyTypeGroupId { get; set; }
 
+        [Index(IndexTypes.NonClustered, Name = "IX_cmsPropertyTypeAlias")]
         [Column("Alias")]
         public string Alias { get; set; }
 

src/Umbraco.Core/Models/Rdbms/UserDto.cs

@@ -15,7 +15,7 @@ namespace Umbraco.Core.Models.Rdbms
         {
             UserGroupDtos = new List<UserGroupDto>();
             UserStartNodeDtos = new HashSet<UserStartNodeDto>();
-        }
+        }
 
         [Column("id")]
         [PrimaryKeyColumn(Name = "PK_user")]
@@ -40,7 +40,7 @@ namespace Umbraco.Core.Models.Rdbms
         [Column("userPassword")]
         [Length(500)]
         public string Password { get; set; }
-
+
         /// <summary>
         /// This will represent a JSON structure of how the password has been created (i.e hash algorithm, iterations)
         /// </summary>
@@ -95,7 +95,7 @@ namespace Umbraco.Core.Models.Rdbms
         [NullSetting(NullSetting = NullSettings.NotNull)]
         [Constraint(Default = SystemMethods.CurrentDateTime)]
         public DateTime UpdateDate { get; set; }
-
+
         /// <summary>
         /// Will hold the media file system relative path of the users custom avatar if they uploaded one
         /// </summary>
@@ -103,6 +103,14 @@ namespace Umbraco.Core.Models.Rdbms
         [NullSetting(NullSetting = NullSettings.Null)]
         [Length(500)]
         public string Avatar { get; set; }
+
+        /// <summary>
+        /// A Json blob stored for recording tour data for a user
+        /// </summary>
+        [Column("tourData")]
+        [NullSetting(NullSetting = NullSettings.Null)]
+        [SpecialDbType(SpecialDbTypes.NTEXT)]
+        public string TourData { get; set; }
 
         [ResultColumn]
         public List<UserGroupDto> UserGroupDtos { get; set; }

src/Umbraco.Core/Models/Rdbms/UserLoginDto.cs

@@ -0,0 +1,52 @@
+using System;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
+
+namespace Umbraco.Core.Models.Rdbms
+{
+    [TableName("umbracoUserLogin")]
+    [PrimaryKey("sessionId", autoIncrement = false)]
+    [ExplicitColumns]
+    internal class UserLoginDto
+    {
+        [Column("sessionId")]
+        [PrimaryKeyColumn(AutoIncrement = false)]
+        public Guid SessionId { get; set; }
+
+        [Column("userId")]
+        [ForeignKey(typeof(UserDto), Name = "FK_umbracoUserLogin_umbracoUser_id")]
+        public int UserId { get; set; }
+
+        /// <summary>
+        /// Tracks when the session is created
+        /// </summary>
+        [Column("loggedInUtc")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public DateTime LoggedInUtc { get; set; }
+
+        /// <summary>
+        /// Updated every time a user's session is validated
+        /// </summary>
+        /// <remarks>
+        /// This allows us to guess if a session is timed out if a user doesn't actively log out
+        /// and also allows us to trim the data in the table
+        /// </remarks>
+        [Column("lastValidatedUtc")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
+        public DateTime LastValidatedUtc { get; set; }
+
+        /// <summary>
+        /// Tracks when the session is removed when the user's account is logged out
+        /// </summary>
+        [Column("loggedOutUtc")]
+        [NullSetting(NullSetting = NullSettings.Null)]
+        public DateTime? LoggedOutUtc { get; set; }
+
+        /// <summary>
+        /// Logs the IP address of the session if available
+        /// </summary>
+        [Column("ipAddress")]
+        [NullSetting(NullSetting = NullSettings.Null)]
+        public string IpAddress { get; set; }
+    }
+}

src/Umbraco.Core/Models/Rdbms/UserTypeDto.cs

@@ -4,7 +4,7 @@ using Umbraco.Core.Persistence.DatabaseAnnotations;
 
 namespace Umbraco.Core.Models.Rdbms
 {
-    [Obsolete("Table no longer exists as of 7.6 - retained only to support migrations from previous versions")]
+    [Obsolete("Table no longer exists as of 7.7 - retained only to support migrations from previous versions")]
     [TableName("umbracoUserType")]
     [PrimaryKey("id")]
     [ExplicitColumns]

src/Umbraco.Core/Models/UmbracoObjectTypes.cs

@@ -192,7 +192,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         [UmbracoObjectType(Constants.ObjectTypes.DocumentBlueprint, typeof(IContent))]
         [FriendlyName("DocumentBlueprint")]
-        [UmbracoUdiType(Constants.UdiEntityType.DocumentBluePrint)]
+        [UmbracoUdiType(Constants.UdiEntityType.DocumentBlueprint)]
         DocumentBlueprint,
         
         /// <summary>

src/Umbraco.Core/Models/UserExtensions.cs

@@ -30,12 +30,11 @@ namespace Umbraco.Core.Models
         /// Tries to lookup the user's gravatar to see if the endpoint can be reached, if so it returns the valid URL
         /// </summary>
         /// <param name="user"></param>
-        /// <param name="userService"></param>
         /// <param name="staticCache"></param>
         /// <returns>
         /// A list of 5 different sized avatar URLs
         /// </returns>
-        internal static string[] GetCurrentUserAvatarUrls(this IUser user, IUserService userService, ICacheProvider staticCache)
+        internal static string[] GetUserAvatarUrls(this IUser user, ICacheProvider staticCache)
         {
             //check if the user has explicitly removed all avatars including a gravatar, this will be possible and the value will be "none"
             if (user.Avatar == "none")

src/Umbraco.Core/ObjectExtensions.cs

@@ -143,6 +143,7 @@ namespace Umbraco.Core
                         var inputString = input as string;
                         if (inputString != null)
                         {
+                            //TODO: Why the check against only bool/date when a string is null/empty? In what scenario can we convert to another type when the string is null or empty other than just being null?
                             if (string.IsNullOrEmpty(inputString) && (underlying == typeof(DateTime) || underlying == typeof(bool)))
                             {
                                 return Attempt<object>.Succeed(null);
@@ -208,6 +209,14 @@ namespace Umbraco.Core
                     return Attempt.Succeed(outputConverter.ConvertFrom(input));
                 }
 
+                if (target.IsGenericType && GetCachedGenericNullableType(target) != null)
+                {
+                    // cannot Convert.ChangeType as that does not work with nullable
+                    // input has already been converted to the underlying type - just
+                    // return input, there's an implicit conversion from T to T? anyways
+                    return Attempt.Succeed(input);
+                }
+
                 // Re-check convertables since we altered the input through recursion
                 var convertible2 = input as IConvertible;
                 if (convertible2 != null)
@@ -745,9 +754,9 @@ namespace Umbraco.Core
             if (AssignableTypeCache.TryGetValue(key, out canConvert))
             {
                 return canConvert;
-            }
-
-            // "object is" is faster than "Type.IsAssignableFrom.
+            }
+
+            // "object is" is faster than "Type.IsAssignableFrom.
             // We can use it to very quickly determine whether true/false
             if (input is IConvertible && target.IsAssignableFrom(source))
             {

src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs

@@ -394,7 +394,7 @@ namespace Umbraco.Core.ObjectResolution
         /// WARNING! Do not use this unless you know what you are doing, clear all types registered and instances
         /// created. Typically only used if a resolver is no longer used in an application and memory is to be GC'd
         /// </summary>
-        internal void ResetCollections()
+        internal virtual void ResetCollections()
         {
             using (new WriteLock(_lock))
             {

src/Umbraco.Core/Packaging/PackageExtraction.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using ICSharpCode.SharpZipLib.Zip;
+using System.IO.Compression;
 
 namespace Umbraco.Core.Packaging
 {
@@ -14,17 +14,17 @@ namespace Umbraco.Core.Packaging
             bool fileFound = false;
             string foundDir = null;
 
-            ReadZipfileEntries(packageFilePath, (entry, stream) =>
+            ReadZipfileEntries(packageFilePath, entry =>
             {
                 string fileName = Path.GetFileName(entry.Name);
 
-                if (string.IsNullOrEmpty(fileName) == false &&
-                    fileName.Equals(fileToRead, StringComparison.CurrentCultureIgnoreCase))
+                if (string.IsNullOrEmpty(fileName) == false && fileName.Equals(fileToRead, StringComparison.CurrentCultureIgnoreCase))
                 {
 
                     foundDir = entry.Name.Substring(0, entry.Name.Length - fileName.Length);
                     fileFound = true;
-                    using (var reader = new StreamReader(stream))
+                    using (var entryStream = entry.Open())
+                    using (var reader = new StreamReader(entryStream))
                     {
                         retVal = reader.ReadToEnd();
                         return false;
@@ -77,7 +77,7 @@ namespace Umbraco.Core.Packaging
             var d = sourceDestination.ToDictionary(k => k.Key.ToLower(), v => v.Value);
 
 
-            ReadZipfileEntries(packageFilePath, (entry, stream) =>
+            ReadZipfileEntries(packageFilePath, entry =>
             {
                 string fileName = (Path.GetFileName(entry.Name) ?? string.Empty).ToLower();
                 if (fileName == string.Empty) { return true; }
@@ -86,8 +86,9 @@ namespace Umbraco.Core.Packaging
                 if (string.IsNullOrEmpty(fileName) == false && d.TryGetValue(fileName, out destination))
                 {
                     using (var streamWriter = File.Open(destination, FileMode.Create))
+                    using (var entryStream = entry.Open())
                     {
-                        stream.CopyTo(streamWriter);
+                        entryStream.CopyTo(streamWriter);
                     }
 
                     d.Remove(fileName);
@@ -106,7 +107,7 @@ namespace Umbraco.Core.Packaging
         {
             var retVal = expectedFiles.ToList();
 
-            ReadZipfileEntries(packageFilePath, (zipEntry, stream) =>
+            ReadZipfileEntries(packageFilePath, zipEntry =>
             {
                 string fileName = Path.GetFileName(zipEntry.Name);
 
@@ -125,7 +126,7 @@ namespace Umbraco.Core.Packaging
             var dictionary = new Dictionary<string, List<string>>();
 
 
-            ReadZipfileEntries(packageFilePath, (entry, stream) =>
+            ReadZipfileEntries(packageFilePath, entry =>
             {
                 string fileName = (Path.GetFileName(entry.Name) ?? string.Empty).ToLower();
 
@@ -148,53 +149,42 @@ namespace Umbraco.Core.Packaging
         {
             CheckPackageExists(packageFilePath);
 
-            var files = new HashSet<string>(filesToGet.Select(f => f.ToLower()));
+            var files = new HashSet<string>(filesToGet.Select(f => f.ToLowerInvariant()));
 
-            using (var fs = File.OpenRead(packageFilePath))
+            using (var fs = File.OpenRead(packageFilePath))
+            using (var zipArchive = new ZipArchive(fs))
             {
-                using (var zipInputStream = new ZipInputStream(fs))
+                foreach (var zipEntry in zipArchive.Entries)
                 {
-                    ZipEntry zipEntry;
-                    while ((zipEntry = zipInputStream.GetNextEntry()) != null)
-                    {
-                        
-                        if (zipEntry.IsDirectory) continue;
+                    if (zipEntry.Name.IsNullOrWhiteSpace() && zipEntry.FullName.EndsWith("/")) continue;
 
-                        if (files.Contains(zipEntry.Name))
+                    if (files.Contains(zipEntry.Name.ToLowerInvariant()))
+                    {
+                        using (var memStream = new MemoryStream())
+                        using (var entryStream = zipEntry.Open())
                         {
-                            using (var memStream = new MemoryStream())
-                            {
-                                zipInputStream.CopyTo(memStream);
-                                yield return memStream.ToArray();
-                                memStream.Close();
-                            }
+                            entryStream.CopyTo(memStream);
+                            memStream.Close();
+                            yield return memStream.ToArray();
                         }
                     }
-
-                    zipInputStream.Close();
                 }
-                fs.Close();
             }
         }
 
-        private void ReadZipfileEntries(string packageFilePath, Func<ZipEntry, ZipInputStream, bool> entryFunc, bool skipsDirectories = true)
+        private void ReadZipfileEntries(string packageFilePath, Func<ZipArchiveEntry, bool> entryFunc, bool skipsDirectories = true)
         {
             CheckPackageExists(packageFilePath);
 
             using (var fs = File.OpenRead(packageFilePath))
+            using (var zipArchive = new ZipArchive(fs))
             {
-                using (var zipInputStream = new ZipInputStream(fs))
+                foreach (var zipEntry in zipArchive.Entries)
                 {
-                    ZipEntry zipEntry;
-                    while ((zipEntry = zipInputStream.GetNextEntry()) != null)
-                    {
-                        if (zipEntry.IsDirectory && skipsDirectories) continue;
-                        if (entryFunc(zipEntry, zipInputStream) == false) break;
-                    }
-
-                    zipInputStream.Close();
+                    if (zipEntry.Name.IsNullOrWhiteSpace() && zipEntry.FullName.EndsWith("/") && skipsDirectories)
+                        continue;
+                    if (entryFunc(zipEntry) == false) break;
                 }
-                fs.Close();
             }
         }
     }

src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Persistence
 	/// it will create one per context, otherwise it will be a global singleton object which is NOT thread safe
 	/// since we need (at least) a new instance of the database object per thread.
 	/// </remarks>
-	internal class DefaultDatabaseFactory : DisposableObject, IDatabaseFactory2
+	internal class DefaultDatabaseFactory : DisposableObjectSlim, IDatabaseFactory2
 	{
 	    private readonly string _connectionStringName;
 	    private readonly ILogger _logger;

src/Umbraco.Core/Persistence/Factories/ContentFactory.cs

@@ -98,18 +98,18 @@ namespace Umbraco.Core.Persistence.Factories
         {
             //NOTE Currently doesn't add Alias (legacy that eventually will go away)
             var documentDto = new DocumentDto
-                                  {
-                                      Newest = true,
-                                      NodeId = entity.Id,
-                                      Published = entity.Published,
-                                      Text = entity.Name,
-                                      UpdateDate = entity.UpdateDate,
-                                      WriterUserId = entity.WriterId,
-                                      VersionId = entity.Version,
-                                      ExpiresDate = null,
-                                      ReleaseDate = null,
-                                      ContentVersionDto = BuildContentVersionDto(entity)
-                                  };
+            {
+                Newest = true,
+                NodeId = entity.Id,
+                Published = entity.Published,
+                Text = entity.Name,
+                UpdateDate = entity.UpdateDate,
+                WriterUserId = entity.WriterId,
+                VersionId = entity.Version,
+                ExpiresDate = null,
+                ReleaseDate = null,
+                ContentVersionDto = BuildContentVersionDto(entity)
+            };
 
             if (entity.Template != null && entity.Template.Id > 0)
                 documentDto.TemplateId = entity.Template.Id;

src/Umbraco.Core/Persistence/Factories/MacroFactory.cs

@@ -5,6 +5,7 @@ using Umbraco.Core.Models.Rdbms;
 
 namespace Umbraco.Core.Persistence.Factories
 {
+    
     internal class MacroFactory 
     {
         public IMacro BuildEntity(MacroDto dto)

src/Umbraco.Core/Persistence/Factories/MediaFactory.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using System.Text.RegularExpressions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 
@@ -9,20 +10,17 @@ namespace Umbraco.Core.Persistence.Factories
     {
         private readonly IMediaType _contentType;
         private readonly Guid _nodeObjectTypeId;
-        private readonly int _id;
         private int _primaryKey;
 
-        public MediaFactory(IMediaType contentType, Guid nodeObjectTypeId, int id)
+        public MediaFactory(IMediaType contentType, Guid nodeObjectTypeId)
         {
             _contentType = contentType;
             _nodeObjectTypeId = nodeObjectTypeId;
-            _id = id;
         }
 
-        public MediaFactory(Guid nodeObjectTypeId, int id)
+        public MediaFactory(Guid nodeObjectTypeId)
         {
             _nodeObjectTypeId = nodeObjectTypeId;
-            _id = id;
         }
 
         #region Implementation of IEntityFactory<IMedia,ContentVersionDto>
@@ -64,15 +62,27 @@ namespace Umbraco.Core.Persistence.Factories
             return BuildEntity(dto, _contentType);
         }
 
-        public ContentVersionDto BuildDto(IMedia entity)
+        public MediaDto BuildDto(IMedia entity)
         {
-            var dto = new ContentVersionDto
-                                        {
-                                            NodeId = entity.Id,
-                                            VersionDate = entity.UpdateDate,
-                                            VersionId = entity.Version,
-                                            ContentDto = BuildContentDto(entity)
-                                        };
+            var versionDto = new ContentVersionDto
+            {
+                NodeId = entity.Id,
+                VersionDate = entity.UpdateDate,
+                VersionId = entity.Version,
+                ContentDto = BuildContentDto(entity)
+            };
+
+            //Extract the media path for storage
+            string mediaPath;
+            TryMatch(entity.GetValue<string>("umbracoFile"), out mediaPath);
+
+            var dto = new MediaDto()
+            {
+                NodeId = entity.Id,
+                ContentVersionDto = versionDto,
+                MediaPath = mediaPath,
+                VersionId = entity.Version
+            };
             return dto;
         }
 
@@ -119,5 +129,30 @@ namespace Umbraco.Core.Persistence.Factories
 
             return nodeDto;
         }
+
+        private static readonly Regex MediaPathPattern = new Regex(@"(/media/.+?)(?:['""]|$)", RegexOptions.Compiled);
+
+        /// <summary>
+        /// Try getting a media path out of the string being stored for media
+        /// </summary>
+        /// <param name="text"></param>
+        /// <param name="mediaPath"></param>
+        /// <returns></returns>
+        internal static bool TryMatch(string text, out string mediaPath)
+        {
+            mediaPath = null;
+
+            if (string.IsNullOrWhiteSpace(text))
+                return false;
+
+            var match = MediaPathPattern.Match(text);
+            if (match.Success == false || match.Groups.Count != 2)
+                return false;
+
+            
+            var url = match.Groups[1].Value;
+            mediaPath = url;
+            return true;
+        }
     }
 }

src/Umbraco.Core/Persistence/Factories/UserFactory.cs

@@ -36,6 +36,7 @@ namespace Umbraco.Core.Persistence.Factories
                 user.Avatar = dto.Avatar;
                 user.EmailConfirmedDate = dto.EmailConfirmedDate;
                 user.InvitedDate = dto.InvitedDate;
+                user.TourData = dto.TourData;
 
                 //on initial construction we don't want to have dirty properties tracked
                 // http://issues.umbraco.org/issue/U4-1946
@@ -69,7 +70,8 @@ namespace Umbraco.Core.Persistence.Factories
                 UpdateDate = entity.UpdateDate,
                 Avatar = entity.Avatar,
                 EmailConfirmedDate = entity.EmailConfirmedDate,
-                InvitedDate = entity.InvitedDate
+                InvitedDate = entity.InvitedDate,
+                TourData = entity.TourData
             };
 
             foreach (var startNodeId in entity.StartContentIds)

src/Umbraco.Core/Persistence/Mappers/AuditMapper.cs

@@ -0,0 +1,47 @@
+using System.Collections.Concurrent;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Mappers
+{
+    [MapperFor(typeof(AuditItem))]
+    [MapperFor(typeof(IAuditItem))]
+    public sealed class AuditMapper : BaseMapper
+    {
+        private static readonly ConcurrentDictionary<string, DtoMapModel> PropertyInfoCacheInstance = new ConcurrentDictionary<string, DtoMapModel>();
+
+        public AuditMapper(ISqlSyntaxProvider sqlSyntax) : base(sqlSyntax)
+        {
+
+        }
+
+        //NOTE: its an internal class but the ctor must be public since we're using Activator.CreateInstance to create it
+        // otherwise that would fail because there is no public constructor.
+        public AuditMapper()
+        {
+            BuildMap();
+        }
+
+        #region Overrides of BaseMapper
+
+        internal override ConcurrentDictionary<string, DtoMapModel> PropertyInfoCache
+        {
+            get { return PropertyInfoCacheInstance; }
+        }
+
+        internal override void BuildMap()
+        {
+            if (PropertyInfoCache.IsEmpty)
+            {
+                CacheMap<AuditItem, LogDto>(src => src.Id, dto => dto.NodeId);
+                CacheMap<AuditItem, LogDto>(src => src.CreateDate, dto => dto.Datestamp);
+                CacheMap<AuditItem, LogDto>(src => src.UserId, dto => dto.UserId);
+                CacheMap<AuditItem, LogDto>(src => src.AuditType, dto => dto.Header);                
+                CacheMap<AuditItem, LogDto>(src => src.Comment, dto => dto.Comment);
+            }
+        }
+
+        #endregion
+    }
+}

src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs

@@ -43,27 +43,28 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
                                                                               {3, typeof (ContentDto)},
                                                                               {4, typeof (ContentVersionDto)},
                                                                               {5, typeof (DocumentDto)},
+                                                                              {6, typeof (MediaDto)},
                                                                               
-                                                                              {6, typeof (ContentTypeTemplateDto)},
-                                                                              {7, typeof (DataTypeDto)},
-                                                                              {8, typeof (DataTypePreValueDto)},
-                                                                              {9, typeof (DictionaryDto)},
-                                                                              {10, typeof (LanguageDto)},
-                                                                              {11, typeof (LanguageTextDto)},
-                                                                              {12, typeof (DomainDto)},
-                                                                              {13, typeof (LogDto)},
-                                                                              {14, typeof (MacroDto)},
-                                                                              {15, typeof (MacroPropertyDto)},
-                                                                              {16, typeof (MemberTypeDto)},
-                                                                              {17, typeof (MemberDto)},
-                                                                              {18, typeof (Member2MemberGroupDto)},
-                                                                              {19, typeof (ContentXmlDto)},
-                                                                              {20, typeof (PreviewXmlDto)},
-                                                                              {21, typeof (PropertyTypeGroupDto)},
-                                                                              {22, typeof (PropertyTypeDto)},
-                                                                              {23, typeof (PropertyDataDto)},
-                                                                              {24, typeof (RelationTypeDto)},
-                                                                              {25, typeof (RelationDto)},
+                                                                              {7, typeof (ContentTypeTemplateDto)},
+                                                                              {8, typeof (DataTypeDto)},
+                                                                              {9, typeof (DataTypePreValueDto)},
+                                                                              {10, typeof (DictionaryDto)},
+                                                                              {11, typeof (LanguageDto)},
+                                                                              {12, typeof (LanguageTextDto)},
+                                                                              {13, typeof (DomainDto)},
+                                                                              {14, typeof (LogDto)},
+                                                                              {15, typeof (MacroDto)},
+                                                                              {16, typeof (MacroPropertyDto)},
+                                                                              {17, typeof (MemberTypeDto)},
+                                                                              {18, typeof (MemberDto)},
+                                                                              {19, typeof (Member2MemberGroupDto)},
+                                                                              {20, typeof (ContentXmlDto)},
+                                                                              {21, typeof (PreviewXmlDto)},
+                                                                              {22, typeof (PropertyTypeGroupDto)},
+                                                                              {23, typeof (PropertyTypeDto)},
+                                                                              {24, typeof (PropertyDataDto)},
+                                                                              {25, typeof (RelationTypeDto)},
+                                                                              {26, typeof (RelationDto)},
                                                                               
                                                                               {28, typeof (TagDto)},
                                                                               {29, typeof (TagRelationshipDto)},
@@ -91,6 +92,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
                                                                               {52, typeof (UserGroup2NodePermissionDto) },
                                                                               {53, typeof (UserGroup2AppDto) },
                                                                               {54, typeof (UserStartNodeDto) },
+                                                                              {55, typeof (UserLoginDto)}
                                                                           };
         #endregion
         

src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs

@@ -148,6 +148,12 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
                 return new Version(7, 6, 0);
             }
 
+            //if the error is for cmsMedia it must be the previous version to 7.8 since that is when it is added
+            if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("cmsMedia"))))
+            {
+                return new Version(7, 7, 0);
+            }
+
             return UmbracoVersion.Current;
         }
 

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddCmsMediaTable.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.Factories;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZero
+{
+    [Migration("7.8.0", 1, Constants.System.UmbracoMigrationName)]
+    public class AddCmsMediaTable : MigrationBase
+    {
+        public AddCmsMediaTable(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            var tables = SqlSyntax.GetTablesInSchema(Context.Database).ToArray();
+
+            if (tables.InvariantContains("cmsMedia") == false)
+            {
+                Create.Table<MediaDto>();
+
+                MigrateMediaPaths();                
+            }
+        }
+
+        private void MigrateMediaPaths()
+        {
+            Execute.Code(database =>
+            {
+                //Due to how much data there can be and that this query will result in executing an Index Scan on the cmsPropertyData PK
+                //which will literally iterate over every row in there (assume there's 1,000,000 and you can see why this will perform
+                //horribly) ultimately we need to fix this: http://issues.umbraco.org/issue/U4-10286
+                //so in the meantime I've found an ugly query to work around this Index Scan issue which is to use a sub-query of Ids. 
+                //Doing this results in the same Index Scan taking place but it only visits the explicit rows that are provided, not every row
+                //in the cmsPropertyData table. This results in a tremendously faster query when there is tons of data.
+
+                //The will return any media property in nvarchar or ntext that is an umbracoFile that is not null.                
+                //This will give us the least amount of data returned to work with.
+                var sql = @"SELECT cmsPropertyData.dataNvarchar, cmsPropertyData.dataNtext, umbracoNode.id, cmsContentVersion.VersionId
+                            FROM cmsPropertyData
+                            INNER JOIN cmsPropertyType ON cmsPropertyType.id = cmsPropertyData.propertytypeid
+                            INNER JOIN umbracoNode ON umbracoNode.id = cmsPropertyData.contentNodeId
+                            INNER JOIN cmsContentVersion ON cmsContentVersion.ContentId = umbracoNode.id
+                            WHERE cmsPropertyType.Alias = (@alias)
+                                AND umbracoNode.id IN (SELECT umbracoNode.id
+                                    FROM umbracoNode 
+		                            INNER JOIN cmsContent ON cmsContent.nodeId = umbracoNode.id
+		                            INNER JOIN cmsContentType ON cmsContentType.nodeId = cmsContent.contentType
+		                            INNER JOIN cmsPropertyType ON cmsPropertyType.contentTypeId = cmsContentType.nodeId
+		                            WHERE cmsPropertyType.Alias = (@alias) AND umbracoNode.nodeObjectType = (@nodeObjectType))
+                                AND (cmsPropertyData.dataNvarchar IS NOT NULL OR cmsPropertyData.dataNtext IS NOT NULL)";
+
+                var paths = new List<MediaDto>();
+
+                //using QUERY = a db cursor, we won't load this all into memory first, just row by row
+                foreach (var row in database.Query<dynamic>(sql, new {alias = "umbracoFile", nodeObjectType = Constants.ObjectTypes.Media}))
+                {
+                    var id = (int) row.id;
+                    var versionId = (Guid)row.VersionId;
+
+                    string mediaPath = null;
+
+                    //if there's values in dataNvarchar then ensure there's a media path match and extract it
+                    if (row.dataNvarchar != null && MediaFactory.TryMatch((string) row.dataNvarchar, out mediaPath))
+                    {
+                        paths.Add(new MediaDto
+                        {
+                            MediaPath = mediaPath,
+                            NodeId = id,
+                            VersionId = versionId
+                        });
+                    }
+                    //if there's values in dataNtext then ensure there's a media path match and extract it
+                    else if (row.dataNtext != null && MediaFactory.TryMatch((string) row.dataNtext, out mediaPath))
+                    {
+                        paths.Add(new MediaDto
+                        {
+                            MediaPath = mediaPath,
+                            NodeId = id,
+                            VersionId = versionId
+                        });
+                    }
+                }
+
+                //now we need to insert paths for each item
+                database.BulkInsertRecords(paths, SqlSyntax);
+
+                return null;
+            });
+
+        }
+
+        public override void Down()
+        {
+        }
+    }
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddIndexToPropertyTypeAliasColumn.cs

@@ -0,0 +1,48 @@
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZero
+{
+    [Migration("7.8.0", 0, Constants.System.UmbracoMigrationName)]
+    public class AddIndexToPropertyTypeAliasColumn : MigrationBase
+    {
+        public AddIndexToPropertyTypeAliasColumn(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        { }
+
+        public override void Up()
+        {
+            Execute.Code(database =>
+            {                
+                var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(Context.Database);
+
+                //make sure it doesn't already exist
+                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsPropertyTypeAlias")) == false)
+                {
+                    var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
+
+                    //we can apply the index
+                    localContext.Create.Index("IX_cmsPropertyTypeAlias").OnTable("cmsPropertyType")
+                        .OnColumn("Alias")
+                        .Ascending()
+                        .WithOptions()
+                        .NonClustered();
+
+                    return localContext.GetSql();
+                }
+
+                return null;
+
+            });
+
+
+        }
+
+        public override void Down()
+        {
+            Delete.Index("IX_cmsPropertyTypeAlias").OnTable("cmsPropertyType");
+        }
+
+    }
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddInstructionCountColumn.cs

@@ -0,0 +1,32 @@
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZero
+{
+    [Migration("7.8.0", 2, Constants.System.UmbracoMigrationName)]
+    public class AddInstructionCountColumn : MigrationBase
+    {
+        public AddInstructionCountColumn(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            //Don't exeucte if the column is already there
+            var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();
+
+            if (columns.Any(x => x.TableName.InvariantEquals("umbracoCacheInstruction") && x.ColumnName.InvariantEquals("instructionCount")) == false)
+                Create.Column("instructionCount")
+                    .OnTable("umbracoCacheInstruction")
+                    .AsInt32()
+                    .WithDefaultValue(1)
+                    .NotNullable();
+        }
+
+        public override void Down()
+        {
+        }
+    }
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddTourDataUserColumn.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZero
+{
+    [Migration("7.8.0", 1, Constants.System.UmbracoMigrationName)]
+    public class AddTourDataUserColumn : MigrationBase
+    {
+        public AddTourDataUserColumn(ISqlSyntaxProvider sqlSyntax, ILogger logger)
+            : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            //Don't exeucte if the column is already there
+            var columns = SqlSyntax.GetColumnsInSchema(Context.Database).ToArray();
+
+            if (columns.Any(x => x.TableName.InvariantEquals("umbracoUser") && x.ColumnName.InvariantEquals("tourData")) == false)
+            {
+                var textType = SqlSyntax.GetSpecialDbType(SpecialDbTypes.NTEXT);
+                Create.Column("tourData").OnTable("umbracoUser").AsCustom(textType).Nullable();
+            }
+                
+        }
+
+        public override void Down()
+        {
+        }
+    }
+    
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddUserLoginTable.cs

@@ -0,0 +1,29 @@
+using System.Linq;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZero
+{
+    [Migration("7.8.0", 4, Constants.System.UmbracoMigrationName)]
+    public class AddUserLoginTable : MigrationBase
+    {
+        public AddUserLoginTable(ISqlSyntaxProvider sqlSyntax, ILogger logger) : base(sqlSyntax, logger)
+        {
+        }
+
+        public override void Up()
+        {
+            var tables = SqlSyntax.GetTablesInSchema(Context.Database).ToArray();
+
+            if (tables.InvariantContains("umbracoUserLogin") == false)
+            {
+                Create.Table<UserLoginDto>();
+            }
+        }
+        
+        public override void Down()
+        {
+        }
+    }
+}

src/Umbraco.Core/Persistence/PetaPocoCommandExtensions.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Data;
-using System.Data.SqlClient;
 using Umbraco.Core.Persistence.FaultHandling;
 
 namespace Umbraco.Core.Persistence

src/Umbraco.Core/Persistence/PetaPocoExtensions.cs

@@ -1,16 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.Common;
 using System.Data.SqlClient;
 using System.Data.SqlServerCe;
 using System.Linq;
 using System.Text.RegularExpressions;
-using MySql.Data.MySqlClient;
 using StackExchange.Profiling.Data;
 using Umbraco.Core.Logging;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Persistence

src/Umbraco.Core/Persistence/PocoDataDataReader.cs

@@ -38,8 +38,12 @@ namespace Umbraco.Core.Persistence
 
             _tableDefinition = DefinitionFactory.GetTableDefinition(sqlSyntaxProvider, pd.type);
             if (_tableDefinition == null) throw new InvalidOperationException("No table definition found for type " + pd.type);
-            
-            _readerColumns = pd.Columns.Select(x => x.Value).ToArray();
+
+            //Only return real columns, do not include columns that are result columns
+            _readerColumns = pd.Columns
+                .Where(x => x.Value.ResultColumn == false)
+                .Select(x => x.Value)
+                .ToArray();
             _sqlSyntaxProvider = sqlSyntaxProvider;
             _enumerator = dataSource.GetEnumerator();
             _columnDefinitions = _tableDefinition.Columns.ToArray();

src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs

@@ -1,29 +1,113 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal class AuditRepository : PetaPocoRepositoryBase<int, AuditItem>, IAuditRepository
+    internal class AuditRepository : PetaPocoRepositoryBase<int, IAuditItem>, IAuditRepository
     {
         public AuditRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
             : base(work, cache, logger, sqlSyntax)
         {
         }
 
-        protected override void PersistNewItem(AuditItem entity)
+        /// <summary>
+        /// Return the audit items as paged result
+        /// </summary>
+        /// <param name="query">
+        /// The query coming from the service
+        /// </param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="auditTypeFilter">
+        /// Since we currently do not have enum support with our expression parser, we cannot query on AuditType in the query or the custom filter
+        /// so we need to do that here
+        /// </param>
+        /// <param name="customFilter">
+        /// A user supplied custom filter
+        /// </param>
+        /// <returns></returns>
+        public IEnumerable<IAuditItem> GetPagedResultsByQuery(IQuery<IAuditItem> query, long pageIndex, int pageSize,
+            out long totalRecords, Direction orderDirection,
+            AuditType[] auditTypeFilter,
+            IQuery<IAuditItem> customFilter)
         {
-            throw new NotImplementedException();
+            if (auditTypeFilter == null) auditTypeFilter = new AuditType[0];
+
+            var sql = GetBaseQuery(false);
+
+            if (query == null) query = new Query<IAuditItem>();
+            var translatorIds = new SqlTranslator<IAuditItem>(sql, query);
+            var translatedQuery = translatorIds.Translate();
+
+            var customFilterWheres = customFilter != null ? customFilter.GetWhereClauses().ToArray() : null;
+            var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
+            if (hasCustomFilter)
+            {
+                var filterSql = new Sql();
+                var first = true;
+                foreach (var filterClaus in customFilterWheres)
+                {
+                    if (first == false)
+                    {
+                        filterSql.Append(" AND ");
+                    }
+                    filterSql.Append(string.Format("({0})", filterClaus.Item1), filterClaus.Item2);
+                    first = false;
+                }
+
+                translatedQuery = GetFilteredSqlForPagedResults(translatedQuery, filterSql);
+            }
+
+            if (auditTypeFilter.Length > 0)
+            {
+                var filterSql = new Sql();
+                var first = true;
+                foreach (var filterClaus in auditTypeFilter)
+                {
+                    if (first == false || hasCustomFilter)
+                    {
+                        filterSql.Append(" AND ");
+                    }
+                    filterSql.Append("(logHeader = @logHeader)", new {logHeader = filterClaus.ToString() });
+                    first = false;
+                }
+
+                translatedQuery = GetFilteredSqlForPagedResults(translatedQuery, filterSql);
+            }
+
+            if (orderDirection == Direction.Descending)
+                translatedQuery.OrderByDescending("Datestamp");
+            else
+                translatedQuery.OrderBy("Datestamp");            
+
+            // Get page of results and total count
+            var pagedResult = Database.Page<LogDto>(pageIndex + 1, pageSize, translatedQuery);
+            totalRecords = pagedResult.TotalItems;
+
+            var pages = pagedResult.Items.Select(
+                dto => new AuditItem(dto.Id, dto.Comment, Enum<AuditType>.Parse(dto.Header), dto.UserId)).ToArray();
+
+            //Mapping the DateStamp
+            for (int i = 0; i < pages.Length; i++)
+            {
+                pages[i].CreateDate = pagedResult.Items[i].Datestamp;
+            }
+
+            return pages;
         }
 
-        #region Not Implemented - not needed
-
-        protected override void PersistUpdatedItem(AuditItem entity)
+        protected override void PersistUpdatedItem(IAuditItem entity)
         {
             Database.Insert(new LogDto
             {
@@ -35,26 +119,40 @@ namespace Umbraco.Core.Persistence.Repositories
             });
         }
 
-        protected override AuditItem PerformGet(int id)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override IEnumerable<AuditItem> PerformGetAll(params int[] ids)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override IEnumerable<AuditItem> PerformGetByQuery(IQuery<AuditItem> query)
-        {
-            throw new NotImplementedException();
-        }
-
         protected override Sql GetBaseQuery(bool isCount)
+        {
+            var sql = new Sql()
+                .Select(isCount ? "COUNT(*)" : "umbracoLog.id, umbracoLog.userId, umbracoLog.NodeId, umbracoLog.Datestamp, umbracoLog.logHeader, umbracoLog.logComment, umbracoUser.userName, umbracoUser.avatar as userAvatar")
+                .From<LogDto>(SqlSyntax);
+            if (isCount == false)
+            {
+                sql = sql.LeftJoin<UserDto>(SqlSyntax).On<UserDto, LogDto>(SqlSyntax, dto => dto.Id, dto => dto.UserId);
+            }
+            return sql;
+        }
+
+        #region Not Implemented - not needed currently
+
+        protected override void PersistNewItem(IAuditItem entity)
         {
             throw new NotImplementedException();
         }
 
+        protected override IAuditItem PerformGet(int id)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override IEnumerable<IAuditItem> PerformGetAll(params int[] ids)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override IEnumerable<IAuditItem> PerformGetByQuery(IQuery<IAuditItem> query)
+        {
+            throw new NotImplementedException();
+        }        
+
         protected override string GetBaseWhereClause()
         {
             throw new NotImplementedException();
@@ -71,6 +169,33 @@ namespace Umbraco.Core.Persistence.Repositories
         }
         #endregion
 
+        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql)
+        {
+            Sql filteredSql;
 
+            // Apply filter
+            if (filterSql != null)
+            {
+                var sqlFilter = " WHERE " + filterSql.SQL.TrimStart("AND ");
+
+                //NOTE: this is certainly strange - NPoco handles this much better but we need to re-create the sql
+                // instance a couple of times to get the parameter order correct, for some reason the first
+                // time the arguments don't show up correctly but the SQL argument parameter names are actually updated
+                // accordingly - so we re-create it again. In v8 we don't need to do this and it's already taken care of.
+
+                filteredSql = new Sql(sql.SQL, sql.Arguments);
+                var args = filteredSql.Arguments.Concat(filterSql.Arguments).ToArray();
+                filteredSql = new Sql(
+                    string.Format("{0} {1}", filteredSql.SQL, sqlFilter),
+                    args);
+                filteredSql = new Sql(filteredSql.SQL, args);
+            }
+            else
+            {
+                //copy to var so that the original isn't changed
+                filteredSql = new Sql(sql.SQL, sql.Arguments);
+            }
+            return filteredSql;
+        }
     }
 }

src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs

@@ -901,7 +901,7 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
         public void AddOrUpdatePermissions(ContentPermissionSet permission)
         {
             _permissionRepository.AddOrUpdate(permission);
-        }
+        }
 
         /// <summary>
         /// Used to remove the content xml for a content item
@@ -1075,8 +1075,8 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
             }
             #endregion
         }
-        #endregion
-
+        #endregion
+
         protected override string GetDatabaseFieldNameForOrderBy(string orderBy)
         {
             //Some custom ones

src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs

@@ -18,7 +18,7 @@ namespace Umbraco.Core.Persistence.Repositories
     /// <remarks>
     /// This is limited to objects that are based in the umbracoNode-table.
     /// </remarks>
-    internal class EntityRepository : DisposableObject, IEntityRepository
+    internal class EntityRepository : DisposableObjectSlim, IEntityRepository
     {
         private readonly IDatabaseUnitOfWork _work;
 

src/Umbraco.Core/Persistence/Repositories/FileRepository.cs

@@ -9,7 +9,7 @@ using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal abstract class FileRepository<TId, TEntity> : DisposableObject, IUnitOfWorkRepository, IRepository<TId, TEntity> 
+    internal abstract class FileRepository<TId, TEntity> : DisposableObjectSlim, IUnitOfWorkRepository, IRepository<TId, TEntity> 
         where TEntity : IFile
     {
         private IUnitOfWork _work;

src/Umbraco.Core/Persistence/Repositories/Interfaces/IAuditRepository.cs

@@ -1,11 +1,37 @@
 using System.Collections;
+using System.Collections.Generic;
 using Umbraco.Core.Auditing;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    public interface IAuditRepository : IRepository<int, AuditItem>
+    public interface IAuditRepository : IRepository<int, IAuditItem>
     {
-        
+        /// <summary>
+        /// Return the audit items as paged result
+        /// </summary>
+        /// <param name="query">
+        /// The query coming from the service
+        /// </param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderDirection"></param>
+        /// <param name="auditTypeFilter">
+        /// Since we currently do not have enum support with our expression parser, we cannot query on AuditType in the query or the custom filter
+        /// so we need to do that here
+        /// </param>
+        /// <param name="customFilter">
+        /// A user supplied custom filter
+        /// </param>
+        /// <returns></returns>
+        IEnumerable<IAuditItem> GetPagedResultsByQuery(
+            IQuery<IAuditItem> query,
+            long pageIndex, int pageSize, out long totalRecords, 
+            Direction orderDirection,
+            AuditType[] auditTypeFilter,
+            IQuery<IAuditItem> customFilter);
     }
 }

src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs

@@ -9,6 +9,8 @@ namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IMediaRepository : IRepositoryVersionable<int, IMedia>, IRecycleBinRepository<IMedia>, IReadRepository<Guid, IMedia>, IDeleteMediaFilesRepository
     {
+        IMedia GetMediaByPath(string mediaPath);
+
         /// <summary>
         /// Used to add/update published xml for the media item
         /// </summary>

src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs

@@ -91,7 +91,12 @@ namespace Umbraco.Core.Persistence.Repositories
 
         IProfile GetProfile(string username);
         IProfile GetProfile(int id);
-        IDictionary<UserState, int> GetUserStates();
-        
+        IDictionary<UserState, int> GetUserStates();
+
+        Guid CreateLoginSession(int userId, string requestingIpAddress, bool cleanStaleSessions = true);
+        bool ValidateLoginSession(int userId, Guid sessionId);
+        int ClearLoginSessions(int userId);
+        int ClearLoginSessions(TimeSpan timespan);
+        void ClearLoginSession(Guid sessionId);
     }
 }

src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text;
+using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
@@ -87,7 +87,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
         #region Overrides of PetaPocoRepositoryBase<int,IMedia>
 
-        protected override Sql GetBaseQuery(BaseQueryType queryType)
+        private Sql GetBaseQuery(BaseQueryType queryType, bool includeFilePaths)
         {
             var sql = new Sql();
             sql.Select(queryType == BaseQueryType.Count ? "COUNT(*)" : (queryType == BaseQueryType.Ids ? "cmsContentVersion.contentId" : "*"))
@@ -95,14 +95,26 @@ namespace Umbraco.Core.Persistence.Repositories
                 .InnerJoin<ContentDto>(SqlSyntax)
                 .On<ContentVersionDto, ContentDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                 .InnerJoin<NodeDto>(SqlSyntax)
-                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId, SqlSyntax)
-                //TODO: IF we want to enable querying on content type information this will need to be joined
-                //.InnerJoin<ContentTypeDto>(SqlSyntax)
-                //.On<ContentDto, ContentTypeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId, SqlSyntax);
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId, SqlSyntax);
+                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId);
+
+            if (includeFilePaths)
+            {
+                sql.InnerJoin<MediaDto>(SqlSyntax)
+                    .On<MediaDto, ContentVersionDto>(SqlSyntax, left => left.VersionId, right => right.VersionId);
+            }
+            
+            //TODO: IF we want to enable querying on content type information this will need to be joined
+            //.InnerJoin<ContentTypeDto>(SqlSyntax)
+            //.On<ContentDto, ContentTypeDto>(SqlSyntax, left => left.ContentTypeId, right => right.NodeId, SqlSyntax);
+            sql.Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId, SqlSyntax);
             return sql;
         }
 
+        protected override Sql GetBaseQuery(BaseQueryType queryType)
+        {
+            return GetBaseQuery(queryType, false);
+        }
+
         protected override Sql GetBaseQuery(bool isCount)
         {
             return GetBaseQuery(isCount ? BaseQueryType.Count : BaseQueryType.FullSingle);
@@ -128,6 +140,7 @@ namespace Umbraco.Core.Persistence.Repositories
                                "DELETE FROM cmsDocument WHERE nodeId = @Id",
                                "DELETE FROM cmsPropertyData WHERE contentNodeId = @Id",
                                "DELETE FROM cmsPreviewXml WHERE nodeId = @Id",
+                               "DELETE FROM cmsMedia WHERE nodeId = @Id",
                                "DELETE FROM cmsContentVersion WHERE ContentId = @Id",
                                "DELETE FROM cmsContentXml WHERE nodeId = @Id",
                                "DELETE FROM cmsContent WHERE nodeId = @Id",
@@ -367,7 +380,7 @@ namespace Umbraco.Core.Persistence.Repositories
             //Ensure that strings don't contain characters that are invalid in XML
             entity.SanitizeEntityPropertiesForXmlStorage();
 
-            var factory = new MediaFactory(NodeObjectTypeId, entity.Id);
+            var factory = new MediaFactory(NodeObjectTypeId);
             var dto = factory.BuildDto(entity);
 
             //NOTE Should the logic below have some kind of fallback for empty parent ids ?
@@ -380,7 +393,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var sortOrder = maxSortOrder + 1;
 
             //Create the (base) node data - umbracoNode
-            var nodeDto = dto.ContentDto.NodeDto;
+            var nodeDto = dto.ContentVersionDto.ContentDto.NodeDto;
             nodeDto.Path = parent.Path;
             nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
             nodeDto.SortOrder = sortOrder;
@@ -415,15 +428,21 @@ namespace Umbraco.Core.Persistence.Repositories
             entity.Level = level;
 
             //Create the Content specific data - cmsContent
-            var contentDto = dto.ContentDto;
+            var contentDto = dto.ContentVersionDto.ContentDto;
             contentDto.NodeId = nodeDto.NodeId;
             Database.Insert(contentDto);
 
             //Create the first version - cmsContentVersion
             //Assumes a new Version guid and Version date (modified date) has been set
+            var contentVersionDto = dto.ContentVersionDto;
+            contentVersionDto.NodeId = nodeDto.NodeId;
+            Database.Insert(contentVersionDto);
+
+            //Create the Media specific data for this version - cmsMedia
+            //Assumes a new Version guid has been generated
             dto.NodeId = nodeDto.NodeId;
             Database.Insert(dto);
-
+            
             //Create the PropertyData for this version - cmsPropertyData
             var propertyFactory = new PropertyFactory(entity.ContentType.CompositionPropertyTypes.ToArray(), entity.Version, entity.Id);
             var propertyDataDtos = propertyFactory.BuildDto(entity.Properties);
@@ -471,14 +490,14 @@ namespace Umbraco.Core.Persistence.Repositories
                 entity.SortOrder = maxSortOrder + 1;
             }
 
-            var factory = new MediaFactory(NodeObjectTypeId, entity.Id);
+            var factory = new MediaFactory(NodeObjectTypeId);
             //Look up Content entry to get Primary for updating the DTO
-            var contentDto = Database.SingleOrDefault<ContentDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+            var contentDto = Database.First<ContentDto>("WHERE nodeId = @Id", new { Id = entity.Id });
             factory.SetPrimaryKey(contentDto.PrimaryKey);
             var dto = factory.BuildDto(entity);
 
             //Updates the (base) node data - umbracoNode
-            var nodeDto = dto.ContentDto.NodeDto;
+            var nodeDto = dto.ContentVersionDto.ContentDto.NodeDto;
             nodeDto.ValidatePathWithException();
             var o = Database.Update(nodeDto);
 
@@ -486,15 +505,18 @@ namespace Umbraco.Core.Persistence.Repositories
             if (contentDto.ContentTypeId != entity.ContentTypeId)
             {
                 //Create the Content specific data - cmsContent
-                var newContentDto = dto.ContentDto;
+                var newContentDto = dto.ContentVersionDto.ContentDto;
                 Database.Update(newContentDto);
             }
 
             //In order to update the ContentVersion we need to retrieve its primary key id
-            var contentVerDto = Database.SingleOrDefault<ContentVersionDto>("WHERE VersionId = @Version", new { Version = entity.Version });
-            dto.Id = contentVerDto.Id;
+            var contentVerDto = Database.First<ContentVersionDto>("WHERE VersionId = @Version", new { Version = entity.Version });
+            dto.ContentVersionDto.Id = contentVerDto.Id;
             //Updates the current version - cmsContentVersion
             //Assumes a Version guid exists and Version date (modified date) has been set/updated
+            Database.Update(dto.ContentVersionDto);
+
+            //now update the media entry
             Database.Update(dto);
 
             //Create the PropertyData for this version - cmsPropertyData
@@ -639,7 +661,39 @@ namespace Umbraco.Core.Persistence.Repositories
             }
             #endregion
         }
-        #endregion
+        #endregion
+
+        /// <summary>
+        /// Gets an <see cref="IMedia"/> object from the path stored in the for the media item.
+        /// </summary>
+        /// <param name="mediaPath">Path of the media item to retrieve (for example: /media/1024/koala_403x328.jpg)</param>
+        /// <returns><see cref="IMedia"/></returns>
+        public IMedia GetMediaByPath(string mediaPath)
+        {
+            var umbracoFileValue = mediaPath;
+
+            const string pattern = ".*[_][0-9]+[x][0-9]+[.].*";
+            var isResized = Regex.IsMatch(mediaPath, pattern);
+
+            // If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" url.
+            if (isResized)
+            {
+                var underscoreIndex = mediaPath.LastIndexOf('_');
+                var dotIndex = mediaPath.LastIndexOf('.');
+                umbracoFileValue = string.Concat(mediaPath.Substring(0, underscoreIndex), mediaPath.Substring(dotIndex));
+            }
+
+            var sql = GetBaseQuery(BaseQueryType.FullSingle, true);
+            sql.Where<MediaDto>(mediaDto => mediaDto.MediaPath == umbracoFileValue, SqlSyntax);
+            sql.OrderByDescending<ContentVersionDto>(x => x.VersionDate, SqlSyntax);
+            var dto = Database.Fetch<ContentVersionDto, ContentDto, NodeDto>(SqlSyntax.SelectTop(sql, 1)).FirstOrDefault();
+            if (dto == null)
+                return null;
+
+            var content = CreateMediaFromDto(dto, sql);
+
+            return content;
+        }
 
         /// <summary>
         /// Gets paged media results
@@ -703,8 +757,8 @@ namespace Umbraco.Core.Persistence.Repositories
             if (EnsureUniqueNaming == false)
                 return nodeName;
 
-            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId",
-                new { objectType = NodeObjectTypeId, parentId });
+            var names = Database.Fetch<SimilarNodeName>("SELECT id, text AS name FROM umbracoNode WHERE nodeObjectType=@objectType AND parentId=@parentId",
+                new { objectType = NodeObjectTypeId, parentId });
 
             return SimilarNodeName.GetUniqueName(names, id, nodeName);
         }

src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs

@@ -132,7 +132,7 @@ namespace Umbraco.Core.Persistence.Repositories
         public IMemberGroup GetByName(string name)
         {
             return IsolatedCache.GetCacheItem<IMemberGroup>(
-                string.Format("{0}.{1}", typeof(IMemberGroup).FullName, name),
+                string.Format("{0}.{1}", typeof (IMemberGroup).FullName, name),
                 () =>
                 {
                     var qry = new Query<IMemberGroup>().Where(group => group.Name.Equals(name));
@@ -140,7 +140,7 @@ namespace Umbraco.Core.Persistence.Repositories
                     return result.FirstOrDefault();
                 },
                 //cache for 5 mins since that is the default in the RuntimeCacheProvider
-                TimeSpan.FromMinutes(5),
+                TimeSpan.FromMinutes(5), 
                 //sliding is true
                 true);
         }
@@ -337,4 +337,4 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         internal static event TypedEventHandler<IMemberGroupRepository, SaveEventArgs<IMemberGroup>> SavedMemberGroup;
     }
-}
+}

src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs

@@ -1,14 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
-using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Rdbms;
-
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Persistence.UnitOfWork;
@@ -53,15 +48,16 @@ namespace Umbraco.Core.Persistence.Repositories
                 @"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)",
+                    WHERE TB2.trashed = '1' AND TB2.nodeObjectType = @NodeObjectType)",
                 FormatDeleteStatement("umbracoUserStartNode", "startNode"),
                 FormatUpdateStatement("umbracoUserGroup", "startContentId"),
-                FormatUpdateStatement("umbracoUserGroup", "startMediaId"),
+                FormatUpdateStatement("umbracoUserGroup", "startMediaId"),
                 FormatDeleteStatement("umbracoRelation", "parentId"),
                 FormatDeleteStatement("umbracoRelation", "childId"),
                 FormatDeleteStatement("cmsTagRelationship", "nodeId"),
                 FormatDeleteStatement("umbracoDomains", "domainRootStructureID"),
                 FormatDeleteStatement("cmsDocument", "nodeId"),
+                FormatDeleteStatement("cmsMedia", "nodeId"),
                 FormatDeleteStatement("cmsPropertyData", "contentNodeId"),
                 FormatDeleteStatement("cmsPreviewXml", "nodeId"),
                 FormatDeleteStatement("cmsContentVersion", "ContentId"),

src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs

@@ -4,14 +4,13 @@ using System.Linq;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.EntityBase;
-
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
-    internal abstract class RepositoryBase : DisposableObject
+    internal abstract class RepositoryBase : DisposableObjectSlim
     {
         private readonly IScopeUnitOfWork _work;
         private readonly CacheHelper _globalCache;

src/Umbraco.Core/Persistence/Repositories/UserRepository.cs

@@ -6,6 +6,7 @@ using System.Linq.Expressions;
 using System.Text;
 using System.Web.Security;
 using Newtonsoft.Json;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.EntityBase;
 using Umbraco.Core.Models.Membership;
@@ -187,8 +188,8 @@ UNION
 SELECT '5CountOfInvited' AS colName, COUNT(id) AS num FROM umbracoUser WHERE lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL
 ORDER BY colName";
 
-            var result = Database.Fetch<dynamic>(sql);
-
+            var result = Database.Fetch<dynamic>(sql);
+
             return new Dictionary<UserState, int>
             {
                 {UserState.All, (int)result[0].num},
@@ -199,6 +200,83 @@ ORDER BY colName";
             };
         }
 
+        public Guid CreateLoginSession(int userId, string requestingIpAddress, bool cleanStaleSessions = true)
+        {
+            //TODO: I know this doesn't follow the normal repository conventions which would require us to crete a UserSessionRepository
+            //and also business logic models for these objects but that's just so overkill for what we are doing
+            //and now that everything is properly in a transaction (Scope) there doesn't seem to be much reason for using that anymore
+            var now = DateTime.UtcNow;
+            var dto = new UserLoginDto
+            {
+                UserId = userId,
+                IpAddress = requestingIpAddress,
+                LoggedInUtc = now,
+                LastValidatedUtc = now,
+                LoggedOutUtc = null,
+                SessionId = Guid.NewGuid()
+            };
+            Database.Insert(dto);
+
+            if (cleanStaleSessions)
+            {
+                ClearLoginSessions(TimeSpan.FromDays(15));
+            }
+
+            return dto.SessionId;
+        }
+
+        public bool ValidateLoginSession(int userId, Guid sessionId)
+        {
+            var found = Database.FirstOrDefault<UserLoginDto>("WHERE sessionId=@sessionId", new {sessionId = sessionId});
+            if (found == null || found.UserId != userId || found.LoggedOutUtc.HasValue)
+                return false;
+
+            //now detect if there's been a timeout
+            if (DateTime.UtcNow - found.LastValidatedUtc > TimeSpan.FromMinutes(GlobalSettings.TimeOutInMinutes))
+            {
+                //timeout detected, update the record
+                ClearLoginSession(sessionId);
+                return false;
+            }
+
+            //update the validate date
+            found.LastValidatedUtc = DateTime.UtcNow;
+            Database.Update(found);
+            return true;
+        }
+
+        public int ClearLoginSessions(int userId)
+        {
+            //TODO: I know this doesn't follow the normal repository conventions which would require us to crete a UserSessionRepository
+            //and also business logic models for these objects but that's just so overkill for what we are doing
+            //and now that everything is properly in a transaction (Scope) there doesn't seem to be much reason for using that anymore
+            var count = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoUserLogin WHERE userId=@userId", new { userId = userId });
+            Database.Execute("DELETE FROM umbracoUserLogin WHERE userId=@userId", new {userId = userId});
+            return count;
+        }
+
+        public int ClearLoginSessions(TimeSpan timespan)
+        {
+            //TODO: I know this doesn't follow the normal repository conventions which would require us to crete a UserSessionRepository
+            //and also business logic models for these objects but that's just so overkill for what we are doing
+            //and now that everything is properly in a transaction (Scope) there doesn't seem to be much reason for using that anymore
+
+            var fromDate = DateTime.UtcNow - timespan;
+
+            var count = Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoUserLogin WHERE lastValidatedUtc=@fromDate", new { fromDate = fromDate });
+            Database.Execute("DELETE FROM umbracoUserLogin WHERE lastValidatedUtc=@fromDate", new { fromDate = fromDate });
+            return count;
+        }
+
+        public void ClearLoginSession(Guid sessionId)
+        {
+            //TODO: I know this doesn't follow the normal repository conventions which would require us to crete a UserSessionRepository
+            //and also business logic models for these objects but that's just so overkill for what we are doing
+            //and now that everything is properly in a transaction (Scope) there doesn't seem to be much reason for using that anymore
+            Database.Execute("UPDATE umbracoUserLogin SET loggedOutUtc=@now WHERE sessionId=@sessionId",
+                new { now = DateTime.UtcNow, sessionId = sessionId });
+        }
+
         protected override IEnumerable<IUser> PerformGetAll(params int[] ids)
         {
             var sql = GetQueryWithGroups();
@@ -401,7 +479,8 @@ ORDER BY colName";
                 {"updateDate", "UpdateDate"},
                 {"avatar", "Avatar"},
                 {"emailConfirmedDate", "EmailConfirmedDate"},
-                {"invitedDate", "InvitedDate"}
+                {"invitedDate", "InvitedDate"},
+                {"tourData", "TourData"}
             };
 
             //create list of properties that have changed
@@ -834,14 +913,6 @@ ORDER BY colName";
         {
             return dtos.Select(UserFactory.BuildEntity);
         }
-
-        //private IEnumerable<IUserGroup> ConvertFromDtos(IEnumerable<UserGroupDto> dtos)
-        //{
-        //    return dtos.Select(dto =>
-        //    {
-        //        var userGroupFactory = new UserGroupFactory();
-        //        return userGroupFactory.BuildEntity(dto);
-        //    });
-        //}
+        
     }
 }

src/Umbraco.Core/Persistence/UnitOfWork/ScopeUnitOfWork.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork
 	/// <summary>
 	/// Represents a scoped unit of work.
 	/// </summary>
-	internal class ScopeUnitOfWork : DisposableObject, IScopeUnitOfWork
+	internal class ScopeUnitOfWork : DisposableObjectSlim, IScopeUnitOfWork
     {
         private readonly Queue<Operation> _operations = new Queue<Operation>();
 	    private readonly IsolationLevel _isolationLevel;

src/Umbraco.Core/Properties/AssemblyInfo.cs

@@ -1,10 +1,8 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Security;
-using System.Security.Permissions;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Umbraco.Core")]
@@ -12,8 +10,8 @@ using System.Security.Permissions;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Umbraco CMS")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -50,6 +48,8 @@ using System.Security.Permissions;
 [assembly: InternalsVisibleTo("Umbraco.Forms.Core.Providers")]
 [assembly: InternalsVisibleTo("Umbraco.Forms.Web")]
 
+[assembly: InternalsVisibleTo("Umbraco.Headless")]
+
 //allow this to be mocked in our unit tests
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
 

src/Umbraco.Core/PropertyEditors/PropertyValueEditor.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Xml.Linq;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Manifest;
 using Umbraco.Core.Models;
@@ -176,6 +176,12 @@ namespace Umbraco.Core.PropertyEditors
         /// <returns></returns>
         internal Attempt<object> TryConvertValueToCrlType(object value)
         {
+            var jv = value as JValue;
+            if (jv != null)
+            {
+                value = value.ToString();
+            }
+
             //this is a custom check to avoid any errors, if it's a string and it's empty just make it null
             var s = value as string;
             if (s != null)
@@ -391,4 +397,4 @@ namespace Umbraco.Core.PropertyEditors
             }
         }
     }
-}
+}

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

@@ -40,13 +40,12 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
 
                     //TODO: Change all singleton access to use ctor injection in v8!!!
                     //TODO: That would mean that property value converters would need to be request lifespan, hrm....
-                    bool isDebug = HttpContext.Current != null && HttpContext.Current.IsDebuggingEnabled;
                     var gridConfig = UmbracoConfig.For.GridConfig(
                         ApplicationContext.Current.ProfilingLogger.Logger,
                         ApplicationContext.Current.ApplicationCache.RuntimeCache,
                         new DirectoryInfo(IOHelper.MapPath(SystemDirectories.AppPlugins)),
                         new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Config)),
-                        isDebug);
+                        HttpContext.Current.IsDebuggingEnabled);
                     
                     var sections = GetArray(obj, "sections");
                     foreach (var section in sections.Cast<JObject>())
@@ -113,4 +112,4 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
         }
 
     }
-}
+}

src/Umbraco.Core/Publishing/PublishingStrategy.cs

@@ -401,9 +401,10 @@ namespace Umbraco.Core.Publishing
                                   content.Name, content.Id));
             }
 
-            // if newest is published, unpublish
-            if (content.Published)
-                content.ChangePublishedState(PublishedState.Unpublished);
+            // make sure we dirty .Published and always unpublish
+            // the version we have here could be the newest, !Published
+            content.ChangePublishedState(PublishedState.Published);
+            content.ChangePublishedState(PublishedState.Unpublished);
 
             _logger.Info<PublishingStrategy>(
                 string.Format("Content '{0}' with Id '{1}' has been unpublished.",

src/Umbraco.Core/Security/AuthenticationExtensions.cs

@@ -11,12 +11,14 @@ using System.Security.Principal;
 using System.Threading;
 using System.Web;
 using System.Web.Security;
+using Microsoft.AspNet.Identity;
 using AutoMapper;
 using Microsoft.Owin;
 using Newtonsoft.Json;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Models.Membership;
 using Umbraco.Core.Logging;
+using IUser = Umbraco.Core.Models.Membership.IUser;
 
 namespace Umbraco.Core.Security
 {
@@ -241,8 +243,11 @@ namespace Umbraco.Core.Security
         /// <param name="userdata"></param>
         public static FormsAuthenticationTicket CreateUmbracoAuthTicket(this HttpContextBase http, UserData userdata)
         {
+            //ONLY used by BasePage.doLogin!
+
             if (http == null) throw new ArgumentNullException("http");
-            if (userdata == null) throw new ArgumentNullException("userdata");
+            if (userdata == null) throw new ArgumentNullException("userdata");
+            
             var userDataString = JsonConvert.SerializeObject(userdata);
             return CreateAuthTicketAndCookie(
                 http, 
@@ -254,14 +259,7 @@ namespace Umbraco.Core.Security
                 1440, 
                 UmbracoConfig.For.UmbracoSettings().Security.AuthCookieName,
                 UmbracoConfig.For.UmbracoSettings().Security.AuthCookieDomain);
-        }
-
-        internal static FormsAuthenticationTicket CreateUmbracoAuthTicket(this HttpContext http, UserData userdata)
-        {
-            if (http == null) throw new ArgumentNullException("http");
-            if (userdata == null) throw new ArgumentNullException("userdata");
-            return new HttpContextWrapper(http).CreateUmbracoAuthTicket(userdata);
-        }
+        }        
 
         /// <summary>
         /// returns the number of seconds the user has until their auth session times out
@@ -331,7 +329,23 @@ namespace Umbraco.Core.Security
         /// <param name="http"></param>
         /// <param name="cookieName"></param>
         private static void Logout(this HttpContextBase http, string cookieName)
-        {
+        {
+            //We need to clear the sessionId from the database. This is legacy code to do any logging out and shouldn't really be used at all but in any case
+            //we need to make sure the session is cleared. Due to the legacy nature of this it means we need to use singletons
+            if (http.User != null)
+            {
+                var claimsIdentity = http.User.Identity as ClaimsIdentity;
+                if (claimsIdentity != null)
+                {
+                    var sessionId = claimsIdentity.FindFirstValue(Constants.Security.SessionIdClaimType);
+                    Guid guidSession;
+                    if (sessionId.IsNullOrWhiteSpace() == false && Guid.TryParse(sessionId, out guidSession))
+                    {
+                        ApplicationContext.Current.Services.UserService.ClearLoginSession(guidSession);
+                    }
+                }
+            }
+
             if (http == null) throw new ArgumentNullException("http");
             //clear the preview cookie and external login
             var cookies = new[] { cookieName, Constants.Web.PreviewCookieName, Constants.Security.BackOfficeExternalCookieName };

src/Umbraco.Core/Security/BackOfficeClaimsIdentityFactory.cs

@@ -2,16 +2,29 @@
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using System.Web;
 using Microsoft.AspNet.Identity;
 using Umbraco.Core.Models.Identity;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Security
 {
     public class BackOfficeClaimsIdentityFactory<T> : ClaimsIdentityFactory<T, int>
         where T: BackOfficeIdentityUser
     {
+        private readonly ApplicationContext _appCtx;
+
+        [Obsolete("Use the overload specifying all dependencies instead")]
         public BackOfficeClaimsIdentityFactory()
+            :this(ApplicationContext.Current)
         {
+        }
+
+        public BackOfficeClaimsIdentityFactory(ApplicationContext appCtx)
+        {
+            if (appCtx == null) throw new ArgumentNullException("appCtx");
+            _appCtx = appCtx;
+
             SecurityStampClaimType = Constants.Security.SessionIdClaimType;
             UserNameClaimType = ClaimTypes.Name;
         }
@@ -24,9 +37,9 @@ namespace Umbraco.Core.Security
         public override async Task<ClaimsIdentity> CreateAsync(UserManager<T, int> manager, T user, string authenticationType)
         {
             var baseIdentity = await base.CreateAsync(manager, user, authenticationType);
-
+            
             var umbracoIdentity = new UmbracoBackOfficeIdentity(baseIdentity,
-                //set a new session id
+                //NOTE - there is no session id assigned here, this is just creating the identity, a session id will be generated when the cookie is written
                 new UserData
                 {
                     Id = user.Id,
@@ -37,15 +50,22 @@ namespace Umbraco.Core.Security
                     Roles = user.Roles.Select(x => x.RoleId).ToArray(),
                     StartContentNodes = user.CalculatedContentStartNodeIds,
                     StartMediaNodes = user.CalculatedMediaStartNodeIds,
-                    SessionId = user.SecurityStamp
+                    SecurityStamp = user.SecurityStamp
                 });
 
             return umbracoIdentity;
-        }
+        }        
     }
 
     public class BackOfficeClaimsIdentityFactory : BackOfficeClaimsIdentityFactory<BackOfficeIdentityUser>
-    {       
+    {
+        [Obsolete("Use the overload specifying all dependencies instead")]
+        public BackOfficeClaimsIdentityFactory()
+        {
+        }
 
+        public BackOfficeClaimsIdentityFactory(ApplicationContext appCtx) : base(appCtx)
+        {
+        }
     }
 }

src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs

@@ -1,21 +1,83 @@
 using System;
+using System.Collections.Concurrent;
+using System.ComponentModel;
 using System.Globalization;
 using System.Net.Http.Headers;
+using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.Identity;
 using Microsoft.Owin;
 using Microsoft.Owin.Security.Cookies;
+using Semver;
 using Umbraco.Core.Configuration;
+using Umbraco.Core.Models.Identity;
 
 namespace Umbraco.Core.Security
 {
     public class BackOfficeCookieAuthenticationProvider : CookieAuthenticationProvider
     {
+        private readonly ApplicationContext _appCtx;
+
+        [Obsolete("Use the ctor specifying all dependencies")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public BackOfficeCookieAuthenticationProvider()
+            : this(ApplicationContext.Current)
+        {
+        }
+
+        public BackOfficeCookieAuthenticationProvider(ApplicationContext appCtx)
+        {
+            if (appCtx == null) throw new ArgumentNullException("appCtx");
+            _appCtx = appCtx;
+        }
+
+        private static readonly SemVersion MinUmbracoVersionSupportingLoginSessions = new SemVersion(7, 8);
+
+        public override void ResponseSignIn(CookieResponseSignInContext context)
+        {
+            var backOfficeIdentity = context.Identity as UmbracoBackOfficeIdentity;
+            if (backOfficeIdentity != null)
+            {
+                //generate a session id and assign it
+                //create a session token - if we are configured and not in an upgrade state then use the db, otherwise just generate one
+
+                //NOTE - special check because when we are upgrading to 7.8 we cannot create a session since the db isn't ready and we'll get exceptions
+                var canAcquireSession = _appCtx.IsUpgrading == false || _appCtx.CurrentVersion() >= MinUmbracoVersionSupportingLoginSessions;
+
+                var session = canAcquireSession
+                    ? _appCtx.Services.UserService.CreateLoginSession((int)backOfficeIdentity.Id, context.OwinContext.GetCurrentRequestIpAddress())
+                    : Guid.NewGuid();
+
+                backOfficeIdentity.UserData.SessionId = session.ToString();
+            }            
+
+            base.ResponseSignIn(context);
+        }
+
         public override void ResponseSignOut(CookieResponseSignOutContext context)
         {
+            //Clear the user's session on sign out
+            if (context != null && context.OwinContext != null && context.OwinContext.Authentication != null
+                && context.OwinContext.Authentication.User != null && context.OwinContext.Authentication.User.Identity != null)
+            {
+                var claimsIdentity = context.OwinContext.Authentication.User.Identity as ClaimsIdentity;
+                var sessionId = claimsIdentity.FindFirstValue(Constants.Security.SessionIdClaimType);
+                Guid guidSession;
+                if (sessionId.IsNullOrWhiteSpace() == false && Guid.TryParse(sessionId, out guidSession))
+                {
+                    _appCtx.Services.UserService.ClearLoginSession(guidSession);
+                }
+            }
+
             base.ResponseSignOut(context);
 
             //Make sure the definitely all of these cookies are cleared when signing out with cookies
+            context.Response.Cookies.Append(SessionIdValidator.CookieName, "", new CookieOptions
+            {
+                Expires = DateTime.Now.AddYears(-1),
+                Path = "/"
+            });
             context.Response.Cookies.Append(UmbracoConfig.For.UmbracoSettings().Security.AuthCookieName, "", new CookieOptions
             {
                 Expires = DateTime.Now.AddYears(-1),
@@ -34,21 +96,45 @@ namespace Umbraco.Core.Security
         }
 
         /// <summary>
-        /// Ensures that the culture is set correctly for the current back office user
+        /// Ensures that the culture is set correctly for the current back office user and that the user's session token is valid
         /// </summary>
         /// <param name="context"/>
         /// <returns/>
-        public override Task ValidateIdentity(CookieValidateIdentityContext context)
+        public override async Task ValidateIdentity(CookieValidateIdentityContext context)
+        {
+            EnsureCulture(context);
+
+            await EnsureValidSessionId(context);
+
+            await base.ValidateIdentity(context);
+        }        
+
+        /// <summary>
+        /// Ensures that the user has a valid session id
+        /// </summary>
+        /// <remarks>
+        /// So that we are not overloading the database this throttles it's check to every minute
+        /// </remarks>
+        protected  virtual async Task EnsureValidSessionId(CookieValidateIdentityContext context)
+        {
+            if (_appCtx.IsConfigured && _appCtx.IsUpgrading == false)
+                await SessionIdValidator.ValidateSessionAsync(TimeSpan.FromMinutes(1), context);
+        }
+
+        private void EnsureCulture(CookieValidateIdentityContext context)
         {
             var umbIdentity = context.Identity as UmbracoBackOfficeIdentity;
             if (umbIdentity != null && umbIdentity.IsAuthenticated)
             {
                 Thread.CurrentThread.CurrentCulture =
                     Thread.CurrentThread.CurrentUICulture =
-                        new CultureInfo(umbIdentity.Culture);
+                        UserCultures.GetOrAdd(umbIdentity.Culture, s => new CultureInfo(s));
             }
-
-            return base.ValidateIdentity(context);
         }
+
+        /// <summary>
+        /// Used so that we aren't creating a new CultureInfo object for every single request
+        /// </summary>
+        private static readonly ConcurrentDictionary<string, CultureInfo> UserCultures = new ConcurrentDictionary<string, CultureInfo>();
     }
 }

src/Umbraco.Core/Security/BackOfficeSignInManager.cs

@@ -223,6 +223,9 @@ namespace Umbraco.Core.Security
                 user.AccessFailedCount = 0;
             await UserManager.UpdateAsync(user);
 
+            //set the current request's principal to the identity just signed in!
+            _request.User = new ClaimsPrincipal(userIdentity);
+
             _logger.WriteCore(TraceEventType.Information, 0,
                 string.Format(
                     "Login attempt succeeded for username {0} from IP address {1}",

src/Umbraco.Core/Security/BackOfficeUserManager.cs

@@ -152,7 +152,6 @@ namespace Umbraco.Core.Security
             //NOTE: This method is mostly here for backwards compat
             base.InitUserManager(manager, membershipProvider, options.DataProtectionProvider, contentSectionConfig);
         }
-       
     }
 
     /// <summary>
@@ -169,7 +168,7 @@ namespace Umbraco.Core.Security
 
         #region What we support do not currently
 
-        //NOTE: Not sure if we really want/need to ever support this 
+        //TODO: We could support this - but a user claims will mostly just be what is in the auth cookie
         public override bool SupportsUserClaim
         {
             get { return false; }
@@ -271,6 +270,22 @@ namespace Umbraco.Core.Security
             //manager.SmsService = new SmsService();            
         }
 
+        /// <summary>
+        /// Used to validate a user's session
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="sessionId"></param>
+        /// <returns></returns>
+        public virtual async Task<bool> ValidateSessionIdAsync(int userId, string sessionId)
+        {
+            var userSessionStore = Store as IUserSessionStore<BackOfficeIdentityUser, int>;
+            //if this is not set, for backwards compat (which would be super rare), we'll just approve it
+            if (userSessionStore == null)
+                return true;
+
+            return await userSessionStore.ValidateSessionIdAsync(userId, sessionId);
+        }
+
         /// <summary>
         /// This will determine which password hasher to use based on what is defined in config
         /// </summary>
@@ -674,4 +689,5 @@ namespace Umbraco.Core.Security
             return httpContext.GetCurrentRequestIpAddress();
         }
     }
+
 }

src/Umbraco.Core/Security/BackOfficeUserStore.cs

@@ -18,7 +18,7 @@ using Task = System.Threading.Tasks.Task;
 
 namespace Umbraco.Core.Security
 {
-    public class BackOfficeUserStore : DisposableObject, 
+    public class BackOfficeUserStore : DisposableObjectSlim, 
         IUserStore<BackOfficeIdentityUser, int>, 
         IUserPasswordStore<BackOfficeIdentityUser, int>, 
         IUserEmailStore<BackOfficeIdentityUser, int>, 
@@ -26,12 +26,13 @@ namespace Umbraco.Core.Security
         IUserRoleStore<BackOfficeIdentityUser, int>,
         IUserSecurityStampStore<BackOfficeIdentityUser, int>,
         IUserLockoutStore<BackOfficeIdentityUser, int>,
-        IUserTwoFactorStore<BackOfficeIdentityUser, int>
+        IUserTwoFactorStore<BackOfficeIdentityUser, int>,
+        IUserSessionStore<BackOfficeIdentityUser, int>
 
-        //TODO: This would require additional columns/tables for now people will need to implement this on their own
-        //IUserPhoneNumberStore<BackOfficeIdentityUser, int>,
-        //TODO: To do this we need to implement IQueryable -  we'll have an IQuerable implementation soon with the UmbracoLinqPadDriver implementation
-        //IQueryableUserStore<BackOfficeIdentityUser, int>
+    //TODO: This would require additional columns/tables for now people will need to implement this on their own
+    //IUserPhoneNumberStore<BackOfficeIdentityUser, int>,
+    //TODO: To do this we need to implement IQueryable -  we'll have an IQuerable implementation soon with the UmbracoLinqPadDriver implementation
+    //IQueryableUserStore<BackOfficeIdentityUser, int>
     {
         private readonly IUserService _userService;
         private readonly IEntityService _entityService;
@@ -57,7 +58,7 @@ namespace Umbraco.Core.Security
         }
 
         /// <summary>
-        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObject"/> which handles common required locking logic.
+        /// Handles the disposal of resources. Derived from abstract class <see cref="DisposableObjectSlim"/> which handles common required locking logic.
         /// </summary>
         protected override void DisposeResources()
         {
@@ -753,6 +754,15 @@ namespace Umbraco.Core.Security
             if (_disposed)
                 throw new ObjectDisposedException(GetType().Name);
         }
-        
+
+        public Task<bool> ValidateSessionIdAsync(int userId, string sessionId)
+        {
+            Guid guidSessionId;
+            if (Guid.TryParse(sessionId, out guidSessionId))
+            {
+                return Task.FromResult(_userService.ValidateLoginSession(userId, guidSessionId));
+            }
+            return Task.FromResult(false);
+        }
     }
 }

src/Umbraco.Core/Security/IUserSessionStore.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNet.Identity;
+
+namespace Umbraco.Core.Security
+{
+    /// <summary>
+    /// An IUserStore interface part to implement if the store supports validating user session Ids
+    /// </summary>
+    /// <typeparam name="TUser"></typeparam>
+    /// <typeparam name="TKey"></typeparam>
+    public interface IUserSessionStore<TUser, in TKey> : IUserStore<TUser, TKey>, IDisposable
+        where TUser : class, IUser<TKey>
+    {
+        Task<bool> ValidateSessionIdAsync(int userId, string sessionId);
+    }
+}

src/Umbraco.Core/Security/OwinExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Web;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin;
 using Umbraco.Core.Models.Identity;
@@ -7,6 +8,37 @@ namespace Umbraco.Core.Security
 {
     public static class OwinExtensions
     {
+        public static string GetCurrentRequestIpAddress(this IOwinContext owinContext)
+        {
+            if (owinContext == null)
+            {
+                return "Unknown, owinContext is null";
+            }
+            if (owinContext.Request == null)
+            {
+                return "Unknown, owinContext.Request is null";
+            }
+
+            var httpContext = owinContext.TryGetHttpContext();
+            if (httpContext == false)
+            {
+                return "Unknown, cannot resolve HttpContext from owinContext";
+            }
+
+            return httpContext.Result.GetCurrentRequestIpAddress();
+        }
+
+        /// <summary>
+        /// Nasty little hack to get httpcontextbase from an owin context
+        /// </summary>
+        /// <param name="owinContext"></param>
+        /// <returns></returns>
+        internal static Attempt<HttpContextBase> TryGetHttpContext(this IOwinContext owinContext)
+        {
+            var ctx = owinContext.Get<HttpContextBase>(typeof(HttpContextBase).FullName);
+            return ctx == null ? Attempt<HttpContextBase>.Fail() : Attempt.Succeed(ctx);
+        }
+
         /// <summary>
         /// Gets the back office sign in manager out of OWIN
         /// </summary>

src/Umbraco.Core/Security/SessionIdValidator.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Concurrent;
+using System.Security.Claims;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web;
+using Microsoft.AspNet.Identity;
+using Microsoft.AspNet.Identity.Owin;
+using Microsoft.Owin;
+using Microsoft.Owin.Infrastructure;
+using Microsoft.Owin.Security.Cookies;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Models.Identity;
+
+namespace Umbraco.Core.Security
+{
+    /// <summary>
+    /// Static helper class used to configure a CookieAuthenticationProvider to validate a cookie against a user's session id
+    /// </summary>
+    /// <remarks>
+    /// This uses another cookie to track the last checked time which is done for a few reasons:    
+    /// * We can't use the user's auth ticket to do thsi because we'd be re-issuing the auth ticket all of the time and it would never expire
+    ///     plus the auth ticket size is much larger than this small value
+    /// * This will execute quite often (every minute per user) and in some cases there might be several requests that end up re-issuing the cookie so the cookie value should be small
+    /// * We want to avoid the user lookup if it's not required so that will only happen when the time diff is great enough in the cookie
+    /// </remarks>
+    internal static class SessionIdValidator
+    {
+        public const string CookieName = "UMB_UCONTEXT_C";
+        
+        public static async Task ValidateSessionAsync(TimeSpan validateInterval, CookieValidateIdentityContext context)
+        {
+            if (context.Request.Uri.IsBackOfficeRequest(HttpRuntime.AppDomainAppVirtualPath) == false)
+                return;
+            
+            var valid = await ValidateSessionAsync(validateInterval, context.OwinContext, context.Options.CookieManager, context.Options.SystemClock, context.Properties.IssuedUtc, context.Identity);
+
+            if (valid == false)
+            {
+                context.RejectIdentity();
+                context.OwinContext.Authentication.SignOut(context.Options.AuthenticationType);
+            }
+        }
+
+        public static async Task<bool> ValidateSessionAsync(
+            TimeSpan validateInterval,
+            IOwinContext owinCtx,
+            ICookieManager cookieManager,
+            ISystemClock systemClock,
+            DateTimeOffset? authTicketIssueDate,
+            ClaimsIdentity currentIdentity)
+        {
+            if (owinCtx == null) throw new ArgumentNullException("owinCtx");
+            if (cookieManager == null) throw new ArgumentNullException("cookieManager");
+            if (systemClock == null) throw new ArgumentNullException("systemClock");
+
+            DateTimeOffset? issuedUtc = null;
+            var currentUtc = systemClock.UtcNow;
+
+            //read the last checked time from a custom cookie
+            var lastCheckedCookie = cookieManager.GetRequestCookie(owinCtx, CookieName);
+
+            if (lastCheckedCookie.IsNullOrWhiteSpace() == false)
+            {
+                DateTimeOffset parsed;
+                if (DateTimeOffset.TryParse(lastCheckedCookie, out parsed))
+                {                    
+                    issuedUtc = parsed;
+                }
+            }
+
+            //no cookie, use the issue time of the auth ticket
+            if (issuedUtc.HasValue == false)
+            {
+                issuedUtc = authTicketIssueDate;
+            }
+
+            // Only validate if enough time has elapsed
+            var validate = issuedUtc.HasValue == false;
+            if (issuedUtc.HasValue)
+            {
+                var timeElapsed = currentUtc.Subtract(issuedUtc.Value);
+                validate = timeElapsed > validateInterval;
+            }
+
+            if (validate == false)
+                return true;
+
+            var manager = owinCtx.GetUserManager<BackOfficeUserManager>();            
+            if (manager == null)
+                return false;
+
+            var userId = currentIdentity.GetUserId<int>();
+            var user = await manager.FindByIdAsync(userId);
+            if (user == null)
+                return false;
+
+            var sessionId = currentIdentity.FindFirstValue(Constants.Security.SessionIdClaimType);
+            if (await manager.ValidateSessionIdAsync(userId, sessionId) == false)
+                return false;
+
+            //we will re-issue the cookie last checked cookie
+            cookieManager.AppendResponseCookie(
+                owinCtx,
+                CookieName,
+                DateTimeOffset.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffffffzzz"),
+                new CookieOptions
+                {
+                    HttpOnly = true,
+                    Secure = GlobalSettings.UseSSL || owinCtx.Request.IsSecure,
+                    Path = "/"
+                });
+
+            return true;
+        }
+        
+    }
+}

src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs

@@ -36,6 +36,7 @@ namespace Umbraco.Core.Security
 
             var username = identity.GetUserName();
             var session = identity.FindFirstValue(Constants.Security.SessionIdClaimType);
+            var securityStamp = identity.FindFirstValue(Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType);
             var startContentId = identity.FindFirstValue(Constants.Security.StartContentNodeIdClaimType);            
             var startMediaId = identity.FindFirstValue(Constants.Security.StartMediaNodeIdClaimType);
 
@@ -66,8 +67,9 @@ namespace Umbraco.Core.Security
             var roles = identity.FindAll(x => x.Type == DefaultRoleClaimType).Select(role => role.Value).ToList();
             var allowedApps = identity.FindAll(x => x.Type == Constants.Security.AllowedApplicationsClaimType).Select(app => app.Value).ToList();
 
-            var userData = new UserData(session)
-            {
+            var userData = new UserData
+            {
+                SecurityStamp = securityStamp,
                 SessionId = session,
                 AllowedApplications = allowedApps.ToArray(),
                 Culture = culture,
@@ -189,7 +191,8 @@ namespace Umbraco.Core.Security
                     Constants.Security.StartContentNodeIdClaimType,
                     Constants.Security.StartMediaNodeIdClaimType, 
                     ClaimTypes.Locality, 
-                    Constants.Security.SessionIdClaimType
+                    Constants.Security.SessionIdClaimType,
+                    Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType
                 };
             }
         } 
@@ -226,7 +229,7 @@ namespace Umbraco.Core.Security
                 // by the SecurityStampValidator, see: https://katanaproject.codeplex.com/workitem/444
                 if (HasClaim(x => x.Type == Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType) == false)
                 {
-                    AddClaim(new Claim(Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType, SessionId, ClaimValueTypes.String, Issuer, Issuer, this));
+                    AddClaim(new Claim(Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType, SecurityStamp, ClaimValueTypes.String, Issuer, Issuer, this));
                 }
             }
 
@@ -307,6 +310,11 @@ namespace Umbraco.Core.Security
             get { return UserData.SessionId; }
         }
 
+        public string SecurityStamp
+        {
+            get { return UserData.SecurityStamp; }
+        }
+
         public string[] Roles
         {
             get { return UserData.Roles; }

src/Umbraco.Core/Security/UserData.cs

@@ -20,7 +20,7 @@ namespace Umbraco.Core.Security
         /// Use this constructor to create/assign new UserData to the ticket
         /// </summary>
         /// <param name="sessionId">
-        /// The security stamp for the user
+        /// The current sessionId for the user
         /// </param>
         public UserData(string sessionId)
         {
@@ -30,11 +30,17 @@ namespace Umbraco.Core.Security
         }
 
         /// <summary>
-        /// This is the 'security stamp' for validation
+        /// This is the 'sessionId' for validation
         /// </summary>        
         [DataMember(Name = "sessionId")]
-        public string SessionId { get; set; } 
+        public string SessionId { get; set; }
 
+        /// <summary>
+        /// This is the 'security stamp' for validation
+        /// </summary>        
+        [DataMember(Name = "securityStamp")]
+        public string SecurityStamp { get; set; }
+
         [DataMember(Name = "id")]
         public object Id { get; set; }
         

src/Umbraco.Core/Services/AuditService.cs

@@ -1,8 +1,12 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Services
@@ -22,5 +26,86 @@ namespace Umbraco.Core.Services
                 uow.Commit();
             }
         }
+
+        /// <summary>
+        /// Returns paged items in the audit trail for a given entity
+        /// </summary>
+        /// <param name="entityId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderDirection">
+        /// By default this will always be ordered descending (newest first)
+        /// </param>
+        /// <param name="auditTypeFilter">
+        /// Since we currently do not have enum support with our expression parser, we cannot query on AuditType in the query or the custom filter
+        /// so we need to do that here
+        /// </param>
+        /// <param name="customFilter">
+        /// Optional filter to be applied
+        /// </param>
+        /// <returns></returns>
+        public IEnumerable<IAuditItem> GetPagedItemsByEntity(int entityId, long pageIndex, int pageSize, out long totalRecords,
+            Direction orderDirection = Direction.Descending,
+            AuditType[] auditTypeFilter = null,
+            IQuery<IAuditItem> customFilter = null)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            if (entityId == Constants.System.Root || entityId <= 0)
+            {
+                totalRecords = 0;
+                return Enumerable.Empty<IAuditItem>();
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateAuditRepository(uow);
+
+                var query = Query<IAuditItem>.Builder.Where(x => x.Id == entityId);
+
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, orderDirection, auditTypeFilter, customFilter);
+            }
+        }
+
+        /// <summary>
+        /// Returns paged items in the audit trail for a given user
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderDirection">
+        /// By default this will always be ordered descending (newest first)
+        /// </param>
+        /// <param name="auditTypeFilter">
+        /// Since we currently do not have enum support with our expression parser, we cannot query on AuditType in the query or the custom filter
+        /// so we need to do that here
+        /// </param>
+        /// <param name="customFilter">
+        /// Optional filter to be applied
+        /// </param>
+        /// <returns></returns>
+        public IEnumerable<IAuditItem> GetPagedItemsByUser(int userId, long pageIndex, int pageSize, out long totalRecords, Direction orderDirection = Direction.Descending, AuditType[] auditTypeFilter = null, IQuery<IAuditItem> customFilter = null)
+        {
+            Mandate.ParameterCondition(pageIndex >= 0, "pageIndex");
+            Mandate.ParameterCondition(pageSize > 0, "pageSize");
+
+            if (userId < 0)
+            {
+                totalRecords = 0;
+                return Enumerable.Empty<IAuditItem>();
+            }
+
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateAuditRepository(uow);
+
+                var query = Query<IAuditItem>.Builder.Where(x => x.UserId == userId);
+
+                return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalRecords, orderDirection, auditTypeFilter, customFilter);
+            }
+        }
     }
 }

src/Umbraco.Core/Services/ContentService.cs

@@ -692,7 +692,7 @@ namespace Umbraco.Core.Services
                         totalChildren = 0;
                         return Enumerable.Empty<IContent>();
                     }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0]), TextColumnType.NVarchar));
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
                 }
                     
 
@@ -737,7 +737,7 @@ namespace Umbraco.Core.Services
                         totalChildren = 0;
                         return Enumerable.Empty<IContent>();
                     }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0]), TextColumnType.NVarchar));
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", contentPath[0].Path), TextColumnType.NVarchar));
                 }
 
                 return repository.GetPagedResultsByQuery(query, pageIndex, pageSize, out totalChildren, orderBy, orderDirection, orderBySystemField, filter);
@@ -884,8 +884,8 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Published && x.ExpireDate <= DateTime.Now);
-                return repository.GetByQuery(query);
+                var query = Query<IContent>.Builder.Where(x => x.ExpireDate <= DateTime.Now);
+                return repository.GetByQuery(query).Where(x => x.HasPublishedVersion);
             }
         }
 
@@ -912,13 +912,11 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateContentRepository(uow);
-                var query = Query<IContent>.Builder.Where(x => x.Path.Contains(Constants.System.RecycleBinContent.ToInvariantString()));
+                var query = Query<IContent>.Builder.Where(x => x.Path.StartsWith(Constants.System.RecycleBinContentPathPrefix));
                 return repository.GetByQuery(query);
             }
         }
 
-
-
         /// <summary>
         /// Checks whether an <see cref="IContent"/> item has any children
         /// </summary>
@@ -2576,7 +2574,6 @@ namespace Umbraco.Core.Services
 
                     Audit(uow, AuditType.Publish, "Save and Publish performed by user", userId, content.Id);
                     uow.Commit();
-
                     return Attempt.If(publishStatus.StatusType == PublishStatusType.Success, publishStatus);
                 }
             }

src/Umbraco.Core/Services/IAuditService.cs

@@ -1,9 +1,58 @@
+using System.Collections.Generic;
 using Umbraco.Core.Models;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Persistence.Querying;
 
 namespace Umbraco.Core.Services
 {
     public interface IAuditService : IService
     {
         void Add(AuditType type, string comment, int userId, int objectId);
+
+        /// <summary>
+        /// Returns paged items in the audit trail for a given entity
+        /// </summary>
+        /// <param name="entityId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderDirection">
+        /// By default this will always be ordered descending (newest first)
+        /// </param>
+        /// <param name="auditTypeFilter">
+        /// Since we currently do not have enum support with our expression parser, we cannot query on AuditType in the query or the custom filter
+        /// so we need to do that here
+        /// </param>
+        /// <param name="customFilter">
+        /// Optional filter to be applied
+        /// </param>
+        /// <returns></returns>
+        IEnumerable<IAuditItem> GetPagedItemsByEntity(int entityId, long pageIndex, int pageSize, out long totalRecords,
+            Direction orderDirection = Direction.Descending,
+            AuditType[] auditTypeFilter = null,
+            IQuery<IAuditItem> customFilter = null);
+
+        /// <summary>
+        /// Returns paged items in the audit trail for a given user
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="orderDirection">
+        /// By default this will always be ordered descending (newest first)
+        /// </param>
+        /// <param name="auditTypeFilter">
+        /// Since we currently do not have enum support with our expression parser, we cannot query on AuditType in the query or the custom filter
+        /// so we need to do that here
+        /// </param>
+        /// <param name="customFilter">
+        /// Optional filter to be applied
+        /// </param>
+        /// <returns></returns>
+        IEnumerable<IAuditItem> GetPagedItemsByUser(int userId, long pageIndex, int pageSize, out long totalRecords,
+            Direction orderDirection = Direction.Descending,
+            AuditType[] auditTypeFilter = null,
+            IQuery<IAuditItem> customFilter = null);
     }
 }

src/Umbraco.Core/Services/IUserService.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models;
@@ -11,7 +12,35 @@ namespace Umbraco.Core.Services
     /// Defines the UserService, which is an easy access to operations involving <see cref="IProfile"/> and eventually Users.
     /// </summary>
     public interface IUserService : IMembershipUserService
-    {
+    {
+        /// <summary>
+        /// Creates a database entry for starting a new login session for a user
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="requestingIpAddress"></param>
+        /// <returns></returns>
+        Guid CreateLoginSession(int userId, string requestingIpAddress);
+
+        /// <summary>
+        /// Validates that a user login session is valid/current and hasn't been closed
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="sessionId"></param>
+        /// <returns></returns>
+        bool ValidateLoginSession(int userId, Guid sessionId);
+
+        /// <summary>
+        /// Removes the session's validity
+        /// </summary>
+        /// <param name="sessionId"></param>
+        void ClearLoginSession(Guid sessionId);
+
+        /// <summary>
+        /// Removes all valid sessions for the user
+        /// </summary>
+        /// <param name="userId"></param>
+        int ClearLoginSessions(int userId);
+
         /// <summary>
         /// This is basically facets of UserStates key = state, value = count
         /// </summary>

src/Umbraco.Core/Services/IdkMap.cs

@@ -39,8 +39,16 @@ namespace Umbraco.Core.Services
             int? val;
             using (var uow = _uowProvider.GetUnitOfWork())
             {
-                val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
-                    new { id = key, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
+                //if it's unknown don't include the nodeObjectType in the query
+                if (umbracoObjectType == UmbracoObjectTypes.Unknown)
+                {
+                    val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id", new { id = key});
+                }
+                else
+                {
+                    val = uow.Database.ExecuteScalar<int?>("SELECT id FROM umbracoNode WHERE uniqueId=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
+                        new { id = key, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
+                }
                 uow.Commit();
             }
 
@@ -92,8 +100,16 @@ namespace Umbraco.Core.Services
             Guid? val;
             using (var uow = _uowProvider.GetUnitOfWork())
             {
-                val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
-                    new { id, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
+                //if it's unknown don't include the nodeObjectType in the query
+                if (umbracoObjectType == UmbracoObjectTypes.Unknown)
+                {
+                    val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id", new { id });
+                }
+                else
+                {
+                    val = uow.Database.ExecuteScalar<Guid?>("SELECT uniqueId FROM umbracoNode WHERE id=@id AND (nodeObjectType=@type OR nodeObjectType=@reservation)",
+                        new { id, type = GetNodeObjectTypeGuid(umbracoObjectType), reservation = Constants.ObjectTypes.IdReservationGuid });
+                }
                 uow.Commit();
             }
 

src/Umbraco.Core/Services/MediaService.cs

@@ -4,7 +4,6 @@ using System.ComponentModel;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Xml.Linq;
 using Umbraco.Core.Configuration;
@@ -12,7 +11,6 @@ using Umbraco.Core.Events;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
@@ -43,7 +41,7 @@ namespace Umbraco.Core.Services
             if (userService == null) throw new ArgumentNullException("userService");
             _dataTypeService = dataTypeService;
             _userService = userService;
-        }
+        }
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -63,7 +61,7 @@ namespace Umbraco.Core.Services
         {
             var parent = GetById(parentId);
             return CreateMedia(name, parent, mediaTypeAlias, userId);
-        }
+        }
 
         /// <summary>
         /// Creates an <see cref="IMedia"/> object using the alias of the <see cref="IMediaType"/>
@@ -391,7 +389,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateMediaRepository(uow);
-                var query = Query<IMedia>.Builder.Where(x => x.Level == level && x.Path.StartsWith("-21") == false);
+                var query = Query<IMedia>.Builder.Where(x => x.Level == level && x.Path.StartsWith(Constants.System.RecycleBinMediaPathPrefix) == false);
                 return repository.GetByQuery(query);
             }
         }
@@ -442,7 +440,7 @@ namespace Umbraco.Core.Services
         /// <returns>An Enumerable list of <see cref="IMedia"/> objects</returns>
         public IEnumerable<IMedia> GetAncestors(IMedia media)
         {
-            var ids = media.Path.Split(',').Where(x => x != "-1" && x != media.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
+            var ids = media.Path.Split(',').Where(x => x != Constants.System.RootString && x != media.Id.ToString(CultureInfo.InvariantCulture)).Select(int.Parse).ToArray();
             if (ids.Any() == false)
                 return new List<IMedia>();
 
@@ -611,7 +609,7 @@ namespace Umbraco.Core.Services
                         totalChildren = 0;
                         return Enumerable.Empty<IMedia>();
                     }
-                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", mediaPath[0]), TextColumnType.NVarchar));
+                    query.Where(x => x.Path.SqlStartsWith(string.Format("{0},", mediaPath[0].Path), TextColumnType.NVarchar));
                 }
                 IQuery<IMedia> filterQuery = null;
                 if (filter.IsNullOrWhiteSpace() == false)
@@ -675,7 +673,7 @@ namespace Umbraco.Core.Services
         /// <returns>Parent <see cref="IMedia"/> object</returns>
         public IMedia GetParent(IMedia media)
         {
-            if (media.ParentId == -1 || media.ParentId == -21)
+            if (media.ParentId == Constants.System.Root || media.ParentId == Constants.System.RecycleBinMedia)
                 return null;
 
             return GetById(media.ParentId);
@@ -705,7 +703,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateMediaRepository(uow);
-                var query = Query<IMedia>.Builder.Where(x => x.ParentId == -1);
+                var query = Query<IMedia>.Builder.Where(x => x.ParentId == Constants.System.Root);
                 return repository.GetByQuery(query);
             }
         }
@@ -719,7 +717,7 @@ namespace Umbraco.Core.Services
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
                 var repository = RepositoryFactory.CreateMediaRepository(uow);
-                var query = Query<IMedia>.Builder.Where(x => x.Path.Contains("-21"));
+                var query = Query<IMedia>.Builder.Where(x => x.Path.StartsWith(Constants.System.RecycleBinMediaPathPrefix));
                 return repository.GetByQuery(query);
             }
         }
@@ -731,65 +729,10 @@ namespace Umbraco.Core.Services
         /// <returns><see cref="IMedia"/></returns>
         public IMedia GetMediaByPath(string mediaPath)
         {
-            var umbracoFileValue = mediaPath;
-
-            const string Pattern = ".*[_][0-9]+[x][0-9]+[.].*";
-            var isResized = Regex.IsMatch(mediaPath, Pattern);
-
-            // If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" url.
-            if (isResized)
-            {
-                var underscoreIndex = mediaPath.LastIndexOf('_');
-                var dotIndex = mediaPath.LastIndexOf('.');
-                umbracoFileValue = string.Concat(mediaPath.Substring(0, underscoreIndex), mediaPath.Substring(dotIndex));
-            }
-
-            Func<string, Sql> createSql = url => new Sql().Select("*")
-                .From<PropertyDataDto>()
-                .InnerJoin<PropertyTypeDto>()
-                .On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
-                .Where<PropertyDataDto>(x => x.VarChar == url);
-
-            var sql = createSql(umbracoFileValue);
-
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
             {
-                var propertyDataDto = uow.Database.Fetch<PropertyDataDto, PropertyTypeDto>(sql).FirstOrDefault();
-
-                // If the stripped-down url returns null, we try again with the original url.
-                // Previously, the function would fail on e.g. "my_x_image.jpg"
-                if (propertyDataDto == null)
-                {
-                    sql = createSql(mediaPath);
-                    propertyDataDto = uow.Database.Fetch<PropertyDataDto, PropertyTypeDto>(sql).FirstOrDefault();
-                }
-
-                // If no reults far, try getting from a json value stored in the ntext column query
-                if (propertyDataDto == null)
-                {
-                    var ntextQuery = new Sql().Select("*")
-                        .From<PropertyDataDto>()
-                        .InnerJoin<PropertyTypeDto>()
-                        .On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                        .Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
-                        .Where("dataNtext LIKE @0", "%" + umbracoFileValue + "%");
-                    propertyDataDto = uow.Database.Fetch<PropertyDataDto, PropertyTypeDto>(ntextQuery).FirstOrDefault();
-                }
-
-                // If still no results, try getting from a json value stored in the nvarchar column
-                if (propertyDataDto == null)
-                {
-                    var nvarcharQuery = new Sql().Select("*")
-                        .From<PropertyDataDto>()
-                        .InnerJoin<PropertyTypeDto>()
-                        .On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                        .Where<PropertyTypeDto>(x => x.Alias == "umbracoFile")
-                        .Where("dataNvarchar LIKE @0", "%" + umbracoFileValue + "%");
-                    propertyDataDto = uow.Database.Fetch<PropertyDataDto, PropertyTypeDto>(nvarcharQuery).FirstOrDefault();
-                }
-
-                return propertyDataDto == null ? null : GetById(propertyDataDto.NodeId);
+                var repository = RepositoryFactory.CreateMediaRepository(uow);
+                return repository.GetMediaByPath(mediaPath);
             }
         }
 
@@ -824,7 +767,7 @@ namespace Umbraco.Core.Services
             using (new WriteLock(Locker))
             {
                 //This ensures that the correct method is called if this method is used to Move to recycle bin.
-                if (parentId == -21)
+                if (parentId == Constants.System.RecycleBinMedia)
                 {
                     MoveToRecycleBin(media, userId);
                     return;
@@ -925,7 +868,7 @@ namespace Umbraco.Core.Services
 
             var repository = RepositoryFactory.CreateMediaRepository(uow);
             repository.Delete(media);
-            deleteEventArgs.CanCancel = false;            
+            deleteEventArgs.CanCancel = false;
             uow.Events.Dispatch(Deleted, this, deleteEventArgs);
 
             Audit(uow, AuditType.Delete, "Delete Media performed by user", userId, media.Id);
@@ -1021,7 +964,7 @@ namespace Umbraco.Core.Services
 
                 if (raiseEvents)
                 {
-                    saveEventArgs.CanCancel = false;
+                    saveEventArgs.CanCancel = false;
                     uow.Events.Dispatch(Saved, this, saveEventArgs);
                 }
 
@@ -1060,7 +1003,7 @@ namespace Umbraco.Core.Services
                     recycleBinEventArgs.RecycleBinEmptiedSuccessfully = success;
                     uow.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs);
 
-                    Audit(uow, AuditType.Delete, "Empty Media Recycle Bin performed by user", 0, -21);
+                    Audit(uow, AuditType.Delete, "Empty Media Recycle Bin performed by user", 0, Constants.System.RecycleBinMedia);
                     uow.Commit();
                 }
             }

src/Umbraco.Core/Services/UserService.cs

@@ -558,6 +558,47 @@ namespace Umbraco.Core.Services
             }
         }
 
+        public Guid CreateLoginSession(int userId, string requestingIpAddress)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateUserRepository(uow);
+                var session = repository.CreateLoginSession(userId, requestingIpAddress);
+                uow.Commit();
+                return session;
+            }
+        }
+
+        public int ClearLoginSessions(int userId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateUserRepository(uow);
+                var count = repository.ClearLoginSessions(userId);
+                uow.Commit();
+                return count;
+            }
+        }
+
+        public void ClearLoginSession(Guid sessionId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateUserRepository(uow);
+                repository.ClearLoginSession(sessionId);
+                uow.Commit();
+            }
+        }
+
+        public bool ValidateLoginSession(int userId, Guid sessionId)
+        {
+            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
+            {
+                var repository = RepositoryFactory.CreateUserRepository(uow);
+                return repository.ValidateLoginSession(userId, sessionId);
+            }
+        }
+
         public IDictionary<UserState, int> GetUserStates()
         {
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))

src/Umbraco.Core/Sync/DatabaseServerMessenger.cs

@@ -87,7 +87,8 @@ namespace Umbraco.Core.Sync
             {
                 UtcStamp = DateTime.UtcNow,
                 Instructions = JsonConvert.SerializeObject(instructions, Formatting.None),
-                OriginIdentity = LocalIdentity
+                OriginIdentity = LocalIdentity,
+                InstructionCount = instructions.Sum(x => x.JsonIdCount)
             };
 
             ApplicationContext.DatabaseContext.Database.Insert(dto);
@@ -165,10 +166,10 @@ namespace Umbraco.Core.Sync
                 }
                 else
                 {
-                    //check for how many instructions there are to process
-                    //TODO: In 7.6 we need to store the count of instructions per row since this is not affective because there can be far more than one (if not thousands)
-                    // of instructions in a single row.
-                    var count = _appContext.DatabaseContext.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoCacheInstruction WHERE id > @lastId", new {lastId = _lastId});
+                    //check for how many instructions there are to process, each row contains a count of the number of instructions contained in each
+                    //row so we will sum these numbers to get the actual count.
+                    var count = _appContext.DatabaseContext.Database
+                        .ExecuteScalar<int>("SELECT SUM(instructionCount) FROM umbracoCacheInstruction WHERE id > @lastId", new {lastId = _lastId});
                     if (count > Options.MaxProcessingInstructionCount)
                     {
                         //too many instructions, proceed to cold boot
@@ -205,7 +206,7 @@ namespace Umbraco.Core.Sync
         /// <summary>
         /// Synchronize the server (throttled).
         /// </summary>
-        protected void Sync()
+        protected internal void Sync()
         {
             lock (_locko)
             {

src/Umbraco.Core/Sync/RefreshInstruction.cs

@@ -18,7 +18,10 @@ namespace Umbraco.Core.Sync
         // need this public, parameter-less constructor so the web service messenger
         // can de-serialize the instructions it receives
         public RefreshInstruction()
-        { }
+        {
+            //set default - this value is not used for reading after it's been deserialized, it's only used for persisting the instruction to the db
+            JsonIdCount = 1;
+        }
 
         // need this public one so it can be de-serialized - used by the Json thing
         // otherwise, should use GetInstructions(...)
@@ -30,12 +33,16 @@ namespace Umbraco.Core.Sync
             IntId = intId;
             JsonIds = jsonIds;
             JsonPayload = jsonPayload;
+            //set default - this value is not used for reading after it's been deserialized, it's only used for persisting the instruction to the db
+            JsonIdCount = 1;
         }
 
         private RefreshInstruction(ICacheRefresher refresher, RefreshMethodType refreshType)
         {
             RefresherId = refresher.UniqueIdentifier;
             RefreshType = refreshType;
+            //set default - this value is not used for reading after it's been deserialized, it's only used for persisting the instruction to the db
+            JsonIdCount = 1;
         }
 
         private RefreshInstruction(ICacheRefresher refresher, RefreshMethodType refreshType, Guid guidId)
@@ -50,9 +57,21 @@ namespace Umbraco.Core.Sync
             IntId = intId;
         }
 
-        private RefreshInstruction(ICacheRefresher refresher, RefreshMethodType refreshType, string json)
+        /// <summary>
+        /// A private constructor to create a new instance
+        /// </summary>
+        /// <param name="refresher"></param>
+        /// <param name="refreshType"></param>
+        /// <param name="json"></param>
+        /// <param name="idCount">
+        /// When the refresh method is <see cref="RefreshMethodType.RefreshByIds"/> we know how many Ids are being refreshed so we know the instruction
+        /// count which will be taken into account when we store this count in the database. 
+        /// </param>
+        private RefreshInstruction(ICacheRefresher refresher, RefreshMethodType refreshType, string json, int idCount = 1)
             : this(refresher, refreshType)
         {
+            JsonIdCount = idCount;
+
             if (refreshType == RefreshMethodType.RefreshByJson)
                 JsonPayload = json;
             else
@@ -77,8 +96,12 @@ namespace Umbraco.Core.Sync
                 case MessageType.RefreshById:
                     if (idType == null)
                         throw new InvalidOperationException("Cannot refresh by id if idType is null.");
-                    if (idType == typeof (int)) // bulk of ints is supported
-                        return new[] { new RefreshInstruction(refresher, RefreshMethodType.RefreshByIds, JsonConvert.SerializeObject(ids.Cast<int>().ToArray())) };
+                    if (idType == typeof(int))
+                    {
+                        // bulk of ints is supported
+                        var intIds = ids.Cast<int>().ToArray();
+                        return new[] { new RefreshInstruction(refresher, RefreshMethodType.RefreshByIds, JsonConvert.SerializeObject(intIds), intIds.Length) };
+                    }
                     // else must be guids, bulk of guids is not supported, iterate
                     return ids.Select(x => new RefreshInstruction(refresher, RefreshMethodType.RefreshByGuid, (Guid) x));
 
@@ -121,6 +144,14 @@ namespace Umbraco.Core.Sync
         /// </summary>
         public string JsonIds { get; set; }
 
+        /// <summary>
+        /// Gets or sets the number of Ids contained in the JsonIds json value
+        /// </summary>
+        /// <remarks>
+        /// This is used to determine the instruction count per row
+        /// </remarks>
+        public int JsonIdCount { get; set; }
+
         /// <summary>
         /// Gets or sets the payload data value.
         /// </summary>

src/Umbraco.Core/UdiEntityType.cs

@@ -26,7 +26,7 @@ namespace Umbraco.Core
 
                     { AnyGuid, UdiType.GuidUdi },
                     { Document, UdiType.GuidUdi },
-                    { DocumentBluePrint, UdiType.GuidUdi },
+                    { DocumentBlueprint, UdiType.GuidUdi },
                     { Media, UdiType.GuidUdi },
                     { Member, UdiType.GuidUdi },
                     { DictionaryItem, UdiType.GuidUdi },
@@ -68,7 +68,7 @@ namespace Umbraco.Core
 
             public const string Document = "document";
 
-            public const string DocumentBluePrint = "document-blueprint";
+            public const string DocumentBlueprint = "document-blueprint";
 
             public const string Media = "media";
             public const string Member = "member";
@@ -80,6 +80,7 @@ namespace Umbraco.Core
             public const string DocumentType = "document-type";
             public const string DocumentTypeContainer = "document-type-container";
 
+            //TODO: What is this? This alias is only used for the blue print tree to render the blueprint's document type, it's not a real udi type
             public const string DocumentTypeBluePrints = "document-type-blueprints";
             public const string MediaType = "media-type";
             public const string MediaTypeContainer = "media-type-container";
@@ -118,7 +119,7 @@ namespace Umbraco.Core
                     case UmbracoObjectTypes.Document:
                         return Document;
                     case UmbracoObjectTypes.DocumentBlueprint:
-                        return DocumentBluePrint;
+                        return DocumentBlueprint;
                     case UmbracoObjectTypes.Media:
                         return Media;
                     case UmbracoObjectTypes.Member:
@@ -163,7 +164,7 @@ namespace Umbraco.Core
                 {
                     case Document:
                         return UmbracoObjectTypes.Document;
-                    case DocumentBluePrint:
+                    case DocumentBlueprint:
                         return UmbracoObjectTypes.DocumentBlueprint;
                     case Media:
                         return UmbracoObjectTypes.Media;

src/Umbraco.Core/UdiGetterExtensions.cs

@@ -132,7 +132,7 @@ namespace Umbraco.Core
         public static GuidUdi GetUdi(this IContent entity)
         {
             if (entity == null) throw new ArgumentNullException("entity");
-            return new GuidUdi(entity.IsBlueprint ? Constants.UdiEntityType.DocumentBluePrint : Constants.UdiEntityType.Document, entity.Key).EnsureClosed();
+            return new GuidUdi(entity.IsBlueprint ? Constants.UdiEntityType.DocumentBlueprint : Constants.UdiEntityType.Document, entity.Key).EnsureClosed();
         }
 
         /// <summary>