Merge branch 'dev-v7' into master-v7

(cherry picked from commit 2281cd8291)

.editorconfig

@@ -1,10 +1,16 @@
-root=true
+# editorconfig.org
 
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
 [*]
-end_of_line = lf
+insert_final_newline = true
 indent_style = space
 indent_size = 4
-trim_trailing_whitespace = true
 
-[*.{cs,cshtml,csx,vb,vbx,vbhtml,fs,fsx,txt,ps1,sql}]
-indent_size = 4
+# Trim trailing whitespace, limited support.
+# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
+trim_trailing_whitespace = true

.gitattributes

@@ -0,0 +1,49 @@
+*.doc  diff=astextplain
+*.DOC	diff=astextplain
+*.docx	diff=astextplain
+*.DOCX	diff=astextplain
+*.dot	diff=astextplain
+*.DOT	diff=astextplain
+*.pdf	diff=astextplain
+*.PDF	diff=astextplain
+*.rtf	diff=astextplain
+*.RTF	diff=astextplain
+
+*.jpg  	binary
+*.png 	binary
+*.gif 	binary
+
+*.cs text=auto diff=csharp 
+*.vb text=auto
+*.c text=auto
+*.cpp text=auto
+*.cxx text=auto
+*.h text=auto
+*.hxx text=auto
+*.py text=auto
+*.rb text=auto
+*.java text=auto
+*.html text=auto
+*.htm text=auto
+*.css text=auto
+*.scss text=auto
+*.sass text=auto
+*.less text=auto
+*.js text=auto
+*.lisp text=auto
+*.clj text=auto
+*.sql text=auto
+*.php text=auto
+*.lua text=auto
+*.m text=auto
+*.asm text=auto
+*.erl text=auto
+*.fs text=auto
+*.fsx text=auto
+*.hs text=auto
+
+*.csproj text=auto merge=union 
+*.vbproj text=auto merge=union 
+*.fsproj text=auto merge=union 
+*.dbproj text=auto merge=union 
+*.sln text=auto eol=crlf merge=union 

build/Modules/Umbraco.Build/Umbraco.Build.psm1

@@ -239,18 +239,18 @@ function Prepare-Tests
   
   # data
   Write-Host "Copy data files"
-  if( -Not (Test-Path -Path "$tmp\tests\Packaging" ) )
+  if (-Not (Test-Path -Path "$tmp\tests\Packaging" ) )
   {
     Write-Host "Create packaging directory"
-    New-Item -ItemType directory -Path "$tmp\tests\Packaging"
+    mkdir "$tmp\tests\Packaging" > $null
   }
   Copy-Files "$src\Umbraco.Tests\Packaging\Packages" "*" "$tmp\tests\Packaging\Packages"
   
   # required for package install tests  
-  if( -Not (Test-Path -Path "$tmp\tests\bin" ) )
+  if (-Not (Test-Path -Path "$tmp\tests\bin" ) )
   {
     Write-Host "Create bin directory"
-    New-Item -ItemType directory -Path "$tmp\tests\bin"
+    mkdir "$tmp\tests\bin" > $null
   }
 }
 

build/NuSpecs/UmbracoCms.Core.nuspec

@@ -27,18 +27,19 @@
       <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.2, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.6, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0.0, 2.0.0)" />
       <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Examine" version="[0.1.85, 1.0.0)" />
+      <dependency id="Examine" version="[0.1.89, 1.0.0)" />
       <dependency id="ImageProcessor" version="[2.5.6, 3.0.0)" />
       <dependency id="ImageProcessor.Web" version="[4.8.7, 5.0.0)" />
       <dependency id="semver" version="[1.1.2, 3.0.0)" />
 	    <!-- Markdown can not be updated due to: https://github.com/hey-red/markdownsharp/issues/71#issuecomment-233585487 -->
       <dependency id="Markdown" version="[1.14.7, 2.0.0)" />
-      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
+      <dependency id="System.Threading.Tasks.Dataflow" version="[4.7.0, 5.0.0)" />
     </dependencies>
   </metadata>
   <files>

build/NuSpecs/UmbracoCms.nuspec

@@ -17,7 +17,7 @@
     <dependencies>
       <dependency id="UmbracoCms.Core" version="[$version$]" />
       <dependency id="Newtonsoft.Json" version="[10.0.2, 11.0.0)" />
-      <dependency id="Umbraco.ModelsBuilder" version="[3.0.7, 4.0.0)" />
+      <dependency id="Umbraco.ModelsBuilder" version="[3.0.10, 4.0.0)" />
       <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.2.1, 3.0.0)" />
 	  <dependency id="ImageProcessor.Web.Config" version="[2.3.1, 3.0.0)" />
     </dependencies>

src/SQLCE4Umbraco/SqlCE4Umbraco.csproj

@@ -49,11 +49,9 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

src/SolutionInfo.cs

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

src/Umbraco.Core/ApplicationContext.cs

@@ -1,7 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Threading;
-using Semver;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
@@ -261,7 +261,7 @@ namespace Umbraco.Core
         /// - http://issues.umbraco.org/issue/U4-5728
         /// - http://issues.umbraco.org/issue/U4-5391
         /// </remarks>
-        internal string UmbracoApplicationUrl
+        public string UmbracoApplicationUrl
         {
             get
             {
@@ -269,9 +269,21 @@ namespace Umbraco.Core
                 return _umbracoApplicationUrl;
             }
         }
+
+        /// <summary>
+        /// Resets the url.
+        /// </summary>
+        public void ResetUmbracoApplicationUrl()
+        {
+            _umbracoApplicationUrl = null;
+        }
 
 	    // ReSharper disable once InconsistentNaming
-	    internal string _umbracoApplicationUrl;
+	    internal string _umbracoApplicationUrl;
+
+        internal List<string> _umbracoApplicationDomains = new List<string>();
+
+        internal string _umbracoApplicationDeploymentId;
 
         private Lazy<bool> _configured;
         internal MainDom MainDom { get; private set; }
@@ -342,52 +354,6 @@ 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/Collections/CompositeTypeTypeKey.cs

@@ -0,0 +1,61 @@
+using System;
+
+namespace Umbraco.Core.Collections
+{
+    /// <summary>
+    /// Represents a composite key of (Type, Type) for fast dictionaries.
+    /// </summary>
+    internal struct CompositeTypeTypeKey : IEquatable<CompositeTypeTypeKey>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CompositeTypeTypeKey"/> struct.
+        /// </summary>
+        public CompositeTypeTypeKey(Type type1, Type type2) : this()
+        {
+            Type1 = type1;
+            Type2 = type2;
+        }
+
+        /// <summary>
+        /// Gets the first type.
+        /// </summary>
+        public Type Type1 { get; private set; }
+
+        /// <summary>
+        /// Gets the second type.
+        /// </summary>
+        public Type Type2 { get; private set; }
+
+        /// <inheritdoc/>
+        public bool Equals(CompositeTypeTypeKey other)
+        {
+            return Type1 == other.Type1 && Type2 == other.Type2;
+        }
+
+        /// <inheritdoc/>
+        public override bool Equals(object obj)
+        {
+            var other = obj is CompositeTypeTypeKey ? (CompositeTypeTypeKey)obj : default(CompositeTypeTypeKey);
+            return Type1 == other.Type1 && Type2 == other.Type2;
+        }
+
+        public static bool operator ==(CompositeTypeTypeKey key1, CompositeTypeTypeKey key2)
+        {
+            return key1.Type1 == key2.Type1 && key1.Type2 == key2.Type2;
+        }
+
+        public static bool operator !=(CompositeTypeTypeKey key1, CompositeTypeTypeKey key2)
+        {
+            return key1.Type1 != key2.Type1 || key1.Type2 != key2.Type2;
+        }
+
+        /// <inheritdoc/>
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Type1.GetHashCode() * 397) ^ Type2.GetHashCode();
+            }
+        }
+    }
+}

src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs

@@ -1,10 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using System.Web;
 using System.Xml.Linq;
 using ClientDependency.Core.CompositeFiles.Providers;
 using ClientDependency.Core.Config;
+using Semver;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 
@@ -24,10 +28,74 @@ namespace Umbraco.Core.Configuration
             _logger = logger;
             _fileName = IOHelper.MapPath(string.Format("{0}/ClientDependency.config", SystemDirectories.Config));
         }
+        
+        /// <summary>
+        /// Changes the version number in ClientDependency.config to a hashed value for the version and the DateTime.Day
+        /// </summary>
+        /// <param name="version">The <see cref="SemVersion">version</see> of Umbraco we're upgrading to</param>
+        /// <param name="date">A <see cref="DateTime">date</see> value to use in the hash to prevent this method from updating the version on each startup</param>
+        /// <param name="dateFormat">Allows the developer to specify the <see cref="string">date precision</see> for the hash (i.e. "yyyyMMdd" would be a precision for the day)</param>
+        /// <returns>Boolean to indicate succesful update of the ClientDependency.config file</returns>
+        public bool UpdateVersionNumber(SemVersion version, DateTime date, string dateFormat)
+        {
+            var byteContents = Encoding.Unicode.GetBytes(version + date.ToString(dateFormat));
+            
+            //This is a way to convert a string to a long
+            //see https://www.codeproject.com/Articles/34309/Convert-String-to-bit-Integer
+            //We could much more easily use MD5 which would create us an INT but since that is not compliant with
+            //hashing standards we have to use SHA
+            int intHash;
+            using (var hash = SHA256.Create())
+            {
+                var bytes = hash.ComputeHash(byteContents);
+
+                var longResult = new[] { 0, 8, 16, 24 }
+                    .Select(i => BitConverter.ToInt64(bytes, i))
+                    .Aggregate((x, y) => x ^ y);
+
+                //CDF requires an INT, and although this isn't fail safe, it will work for our purposes. We are not hashing for crypto purposes
+                //so there could be some collisions with this conversion but it's not a problem for our purposes
+                //It's also important to note that the long.GetHashCode() implementation in .NET is this: return (int) this ^ (int) (this >> 32);
+                //which means that this value will not change per appdomain like some GetHashCode implementations.
+                intHash = longResult.GetHashCode();
+            }
+
+            try
+            {
+                var clientDependencyConfigXml = XDocument.Load(_fileName, LoadOptions.PreserveWhitespace);
+                if (clientDependencyConfigXml.Root != null)
+                {
+
+                    var versionAttribute = clientDependencyConfigXml.Root.Attribute("version");
+
+                    //Set the new version to the hashcode of now
+                    var oldVersion = versionAttribute.Value;
+                    var newVersion = Math.Abs(intHash).ToString();
+
+                    //don't update if it's the same version
+                    if (oldVersion == newVersion)
+                        return false;
+
+                    versionAttribute.SetValue(newVersion);
+                    clientDependencyConfigXml.Save(_fileName, SaveOptions.DisableFormatting);
+
+                    _logger.Info<ClientDependencyConfiguration>(string.Format("Updated version number from {0} to {1}", oldVersion, newVersion));
+                    return true;
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.Error<ClientDependencyConfiguration>("Couldn't update ClientDependency version number", ex);
+            }
+
+            return false;
+        }
 
         /// <summary>
         /// Changes the version number in ClientDependency.config to a random value to avoid stale caches
         /// </summary>
+        /// <seealso cref="UpdateVersionNumber(SemVersion, DateTime, string)" />
+        [Obsolete("Use the UpdateVersionNumber method specifying the version, date and dateFormat instead")]
         public bool IncreaseVersionNumber()
         {
             try
@@ -107,4 +175,4 @@ namespace Umbraco.Core.Configuration
             return success;
         }
     }
-}
+}

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

@@ -1,18 +0,0 @@
-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

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

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

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

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

@@ -5,8 +5,6 @@ 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

@@ -1,17 +0,0 @@
-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,12 +8,6 @@ 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
         {
@@ -155,11 +149,6 @@ 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.8.0");
+        private static readonly Version Version = new Version("7.7.13");
 
         /// <summary>
         /// Gets the current version of Umbraco.

src/Umbraco.Core/DateTimeExtensions.cs

@@ -21,9 +21,9 @@ namespace Umbraco.Core
         public static DateTime TruncateTo(this DateTime dt, DateTruncate truncateTo)
         {
             if (truncateTo == DateTruncate.Year)
-                return new DateTime(dt.Year, 0, 0);
+                return new DateTime(dt.Year, 1, 1);
             if (truncateTo == DateTruncate.Month)
-                return new DateTime(dt.Year, dt.Month, 0);
+                return new DateTime(dt.Year, dt.Month, 1);
             if (truncateTo == DateTruncate.Day)
                 return new DateTime(dt.Year, dt.Month, dt.Day);
             if (truncateTo == DateTruncate.Hour)
@@ -41,43 +41,43 @@ namespace Umbraco.Core
             Hour,
             Minute,
             Second
-        }
-
+        }
+
         /// <summary>
-        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
+        /// Calculates the number of minutes from a date time, on a rolling daily basis (so if 
         /// date time is before the time, calculate onto next day)
         /// </summary>
         /// <param name="fromDateTime">Date to start from</param>
         /// <param name="scheduledTime">Time to compare against (in Hmm form, e.g. 330, 2200)</param>
-        /// <returns></returns>
-        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
-        {
-            // Ensure time provided is 4 digits long
-            if (scheduledTime.Length == 3)
-            {
-                scheduledTime = "0" + scheduledTime;
-            }
-
-            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
-            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
-
-            DateTime scheduledDateTime;
-            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
-            {
-                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
-            }
-            else
-            {
-                var nextDay = fromDateTime.AddDays(1);
-                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
-            }
-
-            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
-        }
-
-        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
-        {
-            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
+        /// <returns></returns>
+        public static int PeriodicMinutesFrom(this DateTime fromDateTime, string scheduledTime)
+        {
+            // Ensure time provided is 4 digits long
+            if (scheduledTime.Length == 3)
+            {
+                scheduledTime = "0" + scheduledTime;
+            }
+
+            var scheduledHour = int.Parse(scheduledTime.Substring(0, 2));
+            var scheduledMinute = int.Parse(scheduledTime.Substring(2));
+
+            DateTime scheduledDateTime;
+            if (IsScheduledInRemainingDay(fromDateTime, scheduledHour, scheduledMinute))
+            {
+                scheduledDateTime = new DateTime(fromDateTime.Year, fromDateTime.Month, fromDateTime.Day, scheduledHour, scheduledMinute, 0);
+            }
+            else
+            {
+                var nextDay = fromDateTime.AddDays(1);
+                scheduledDateTime = new DateTime(nextDay.Year, nextDay.Month, nextDay.Day, scheduledHour, scheduledMinute, 0);
+            }
+
+            return (int)(scheduledDateTime - fromDateTime).TotalMinutes;
+        }
+
+        private static bool IsScheduledInRemainingDay(DateTime fromDateTime, int scheduledHour, int scheduledMinute)
+        {
+            return scheduledHour > fromDateTime.Hour || (scheduledHour == fromDateTime.Hour && scheduledMinute >= fromDateTime.Minute);
         }
     }
 }

src/Umbraco.Core/Events/ImportPackageEventArgs.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using Umbraco.Core.Packaging.Models;
 
 namespace Umbraco.Core.Events
@@ -7,18 +8,27 @@ namespace Umbraco.Core.Events
     public class ImportPackageEventArgs<TEntity> : CancellableEnumerableObjectEventArgs<TEntity>, IEquatable<ImportPackageEventArgs<TEntity>>
     {
         private readonly MetaData _packageMetaData;
-
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        [Obsolete("Use the overload specifying packageMetaData instead")]
         public ImportPackageEventArgs(TEntity eventObject, bool canCancel)
             : base(new[] { eventObject }, canCancel)
         {
         }
 
-        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
-            : base(new[] { eventObject })
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData, bool canCancel)
+            : base(new[] { eventObject }, canCancel)
         {
+            if (packageMetaData == null) throw new ArgumentNullException("packageMetaData");
             _packageMetaData = packageMetaData;
         }
 
+        public ImportPackageEventArgs(TEntity eventObject, MetaData packageMetaData)
+            : this(eventObject, packageMetaData, true)
+        {
+            
+        }
+
         public MetaData PackageMetaData
         {
             get { return _packageMetaData; }

src/Umbraco.Core/Events/ScopeEventDispatcherBase.cs

@@ -76,260 +76,257 @@ namespace Umbraco.Core.Events
         {
             if (_events == null)
                 return Enumerable.Empty<IEventDefinition>();
-            
+
+            IReadOnlyList<IEventDefinition> events;
             switch (filter)
             {
                 case EventDefinitionFilter.All:
-                    return FilterSupersededAndUpdateToLatestEntity(_events);
+                    events = _events;
+                    break;
                 case EventDefinitionFilter.FirstIn:
                     var l1 = new OrderedHashSet<IEventDefinition>();
                     foreach (var e in _events)
-                    {
                         l1.Add(e);
-                    }
-                    return FilterSupersededAndUpdateToLatestEntity(l1);
+                    events = l1;
+                    break;
                 case EventDefinitionFilter.LastIn:
                     var l2 = new OrderedHashSet<IEventDefinition>(keepOldest: false);
                     foreach (var e in _events)
-                    {
                         l2.Add(e);
-                    }
-                    return FilterSupersededAndUpdateToLatestEntity(l2);
+                    events = l2;
+                    break;
                 default:
                     throw new ArgumentOutOfRangeException("filter", filter, null);
             }
+
+            return FilterSupersededAndUpdateToLatestEntity(events);
         }
-        
-        private class EventDefinitionTypeData
+
+        private class EventDefinitionInfos
         {
             public IEventDefinition EventDefinition { get; set; }
-            public Type EventArgType { get; set; }
-            public SupersedeEventAttribute[] SupersedeAttributes { get; set; }
+            public Type[] SupersedeTypes { get; set; }
         }
-        
-        /// <summary>
-        /// This will iterate over the events (latest first) and filter out any events or entities in event args that are included 
-        /// in more recent events that Supersede previous ones. For example, If an Entity has been Saved and then Deleted, we don't want
-        /// to raise the Saved event (well actually we just don't want to include it in the args for that saved event)
-        /// </summary>
-        /// <param name="events"></param>
-        /// <returns></returns>
-        private static IEnumerable<IEventDefinition> FilterSupersededAndUpdateToLatestEntity(IReadOnlyList<IEventDefinition> events)
+
+        // fixme
+        // this is way too convoluted, the superceede attribute is used only on DeleteEventargs to specify
+        // that it superceeds save, publish, move and copy - BUT - publish event args is also used for
+        // unpublishing and should NOT be superceeded - so really it should not be managed at event args
+        // level but at event level
+        //
+        // what we want is:
+        // if an entity is deleted, then all Saved, Moved, Copied, Published events prior to this should
+        // not trigger for the entity - and even though, does it make any sense? making a copy of an entity
+        // should ... trigger?
+        //
+        // not going to refactor it all - we probably want to *always* trigger event but tell people that
+        // due to scopes, they should not expected eg a saved entity to still be around - however, now,
+        // going to write a ugly condition to deal with U4-10764
+
+        // iterates over the events (latest first) and filter out any events or entities in event args that are included
+        // in more recent events that Supersede previous ones. For example, If an Entity has been Saved and then Deleted, we don't want
+        // to raise the Saved event (well actually we just don't want to include it in the args for that saved event)
+        internal static IEnumerable<IEventDefinition> FilterSupersededAndUpdateToLatestEntity(IReadOnlyList<IEventDefinition> events)
         {
-            //used to keep the 'latest' entity and associated event definition data
-            var allEntities = new List<Tuple<IEntity, EventDefinitionTypeData>>();
-
-            //tracks all CancellableObjectEventArgs instances in the events which is the only type of args we can work with
-            var cancelableArgs = new List<CancellableObjectEventArgs>();
+            // keeps the 'latest' entity and associated event data
+            var entities = new List<Tuple<IEntity, EventDefinitionInfos>>();
 
+            // collects the event definitions
+            // collects the arguments in result, that require their entities to be updated
             var result = new List<IEventDefinition>();
+            var resultArgs = new List<CancellableObjectEventArgs>();
 
-            //This will eagerly load all of the event arg types and their attributes so we don't have to continuously look this data up
-            var allArgTypesWithAttributes = events.Select(x => x.Args.GetType())
+            // eagerly fetch superceeded arg types for each arg type
+            var argTypeSuperceeding = events.Select(x => x.Args.GetType())
                 .Distinct()
-                .ToDictionary(x => x, x => x.GetCustomAttributes<SupersedeEventAttribute>(false).ToArray());
-               
-            //Iterate all events and collect the actual entities in them and relates them to their corresponding EventDefinitionTypeData
-            //we'll process the list in reverse because events are added in the order they are raised and we want to filter out
-            //any entities from event args that are not longer relevant 
-            //(i.e. if an item is Deleted after it's Saved, we won't include the item in the Saved args)
+                .ToDictionary(x => x, x => x.GetCustomAttributes<SupersedeEventAttribute>(false).Select(y => y.SupersededEventArgsType).ToArray());
+
+            // iterate over all events and filter
+            //
+            // process the list in reverse, because events are added in the order they are raised and we want to keep
+            // the latest (most recent) entities and filter out what is not relevant anymore (too old), eg if an entity
+            // is Deleted after being Saved, we want to filter out the Saved event
             for (var index = events.Count - 1; index >= 0; index--)
             {
-                var eventDefinition = events[index];
+                var def = events[index];
 
-                var argType = eventDefinition.Args.GetType();
-                var attributes = allArgTypesWithAttributes[eventDefinition.Args.GetType()];
-
-                var meta = new EventDefinitionTypeData
+                var infos = new EventDefinitionInfos
                 {
-                    EventDefinition = eventDefinition,
-                    EventArgType = argType,
-                    SupersedeAttributes = attributes
+                    EventDefinition = def,
+                    SupersedeTypes = argTypeSuperceeding[def.Args.GetType()]
                 };
 
-                var args = eventDefinition.Args as CancellableObjectEventArgs;
-                if (args != null)
+                var args = def.Args as CancellableObjectEventArgs;
+                if (args == null)
                 {
-                    var list = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
-
-                    if (list == null)
+                    // not a cancellable event arg, include event definition in result
+                    result.Add(def);
+                }
+                else
+                {
+                    // event object can either be a single object or an enumerable of objects
+                    // try to get as an enumerable, get null if it's not
+                    var eventObjects = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
+                    if (eventObjects == null)
                     {
-                        //extract the event object
-                        var obj = args.EventObject as IEntity;
-                        if (obj != null)
+                        // single object, cast as an IEntity
+                        // if cannot cast, cannot filter, nothing - just include event definition in result
+                        var eventEntity = args.EventObject as IEntity;
+                        if (eventEntity == null)
                         {
-                            //Now check if this entity already exists in other event args that supersede this current event arg type
-                            if (IsFiltered(obj, meta, allEntities) == false)
-                            {
-                                //if it's not filtered we can adde these args to the response
-                                cancelableArgs.Add(args);
-                                result.Add(eventDefinition);
-                                //track the entity
-                                allEntities.Add(Tuple.Create(obj, meta));
-                            }
+                            result.Add(def);
+                            continue;
                         }
-                        else
+
+                        // look for this entity in superceding event args
+                        // found = must be removed (ie not added), else track
+                        if (IsSuperceeded(eventEntity, infos, entities) == false)
                         {
-                            //Can't retrieve the entity so cant' filter or inspect, just add to the output
-                            result.Add(eventDefinition);                            
+                            // track
+                            entities.Add(Tuple.Create(eventEntity, infos));
+
+                            // track result arguments
+                            // include event definition in result
+                            resultArgs.Add(args);
+                            result.Add(def);
                         }
                     }
                     else
                     {
+                        // enumerable of objects
                         var toRemove = new List<IEntity>();
-                        foreach (var entity in list)
+                        foreach (var eventObject in eventObjects)
                         {
-                            //extract the event object
-                            var obj = entity as IEntity;
-                            if (obj != null)
-                            {
-                                //Now check if this entity already exists in other event args that supersede this current event arg type
-                                if (IsFiltered(obj, meta, allEntities))
-                                {
-                                    //track it to be removed
-                                    toRemove.Add(obj);
-                                }
-                                else
-                                {
-                                    //track the entity, it's not filtered
-                                    allEntities.Add(Tuple.Create(obj, meta));
-                                }
-                            }
+                            // extract the event object, cast as an IEntity
+                            // if cannot cast, cannot filter, nothing to do - just leave it in the list & continue
+                            var eventEntity = eventObject as IEntity;
+                            if (eventEntity == null)
+                                continue;
+
+                            // look for this entity in superceding event args
+                            // found = must be removed, else track
+                            if (IsSuperceeded(eventEntity, infos, entities))
+                                toRemove.Add(eventEntity);
                             else
-                            {
-                                //we don't need to do anything here, we can't cast to IEntity so we cannot filter, so it will just remain in the list
-                            }
+                                entities.Add(Tuple.Create(eventEntity, infos));
                         }
 
-                        //remove anything that has been filtered
+                        // remove superceded entities
                         foreach (var entity in toRemove)
-                        {
-                            list.Remove(entity);
-                        }
+                            eventObjects.Remove(entity);
 
-                        //track the event and include in the response if there's still entities remaining in the list
-                        if (list.Count > 0)
+                        // if there are still entities in the list, keep the event definition
+                        if (eventObjects.Count > 0)
                         {
                             if (toRemove.Count > 0)
                             {
-                                //re-assign if the items have changed
-                                args.EventObject = list;
+                                // re-assign if changed
+                                args.EventObject = eventObjects;
                             }
-                            cancelableArgs.Add(args);
-                            result.Add(eventDefinition);
+
+                            // track result arguments
+                            // include event definition in result
+                            resultArgs.Add(args);
+                            result.Add(def);
                         }
                     }
                 }
-                else
-                {
-                    //it's not a cancelable event arg so we just include it in the result
-                    result.Add(eventDefinition);
-                }
             }
 
-            //Now we'll deal with ensuring that only the latest(non stale) entities are used throughout all event args
-            UpdateToLatestEntities(allEntities, cancelableArgs);
+            // go over all args in result, and update them with the latest instanceof each entity
+            UpdateToLatestEntities(entities, resultArgs);
 
-            //we need to reverse the result since we've been adding by latest added events first!
+            // reverse, since we processed the list in reverse
             result.Reverse();
 
             return result;
         }
 
-        private static void UpdateToLatestEntities(IEnumerable<Tuple<IEntity, EventDefinitionTypeData>> allEntities, IEnumerable<CancellableObjectEventArgs> cancelableArgs)
+        // edits event args to use the latest instance of each entity
+        private static void UpdateToLatestEntities(IEnumerable<Tuple<IEntity, EventDefinitionInfos>> entities, IEnumerable<CancellableObjectEventArgs> args)
         {
-            //Now we'll deal with ensuring that only the latest(non stale) entities are used throughout all event args
-
+            // get the latest entities
+            // ordered hash set + keepOldest will keep the latest inserted entity (in case of duplicates)
             var latestEntities = new OrderedHashSet<IEntity>(keepOldest: true);
-            foreach (var entity in allEntities.OrderByDescending(entity => entity.Item1.UpdateDate))
-            {
+            foreach (var entity in entities.OrderByDescending(entity => entity.Item1.UpdateDate))
                 latestEntities.Add(entity.Item1);
-            }
 
-            foreach (var args in cancelableArgs)
+            foreach (var arg in args)
             {
-                var list = TypeHelper.CreateGenericEnumerableFromObject(args.EventObject);
-                if (list == null)
+                // event object can either be a single object or an enumerable of objects
+                // try to get as an enumerable, get null if it's not
+                var eventObjects = TypeHelper.CreateGenericEnumerableFromObject(arg.EventObject);
+                if (eventObjects == null)
                 {
-                    //try to find the args entity in the latest entity - based on the equality operators, this will 
-                    //match by Id since that is the default equality checker for IEntity. If one is found, than it is 
-                    //the most recent entity instance so update the args with that instance so we don't emit a stale instance.
-                    var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, args.EventObject));
+                    // single object
+                    // look for a more recent entity for that object, and replace if any
+                    // works by "equalling" entities ie the more recent one "equals" this one (though different object)
+                    var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, arg.EventObject));
                     if (foundEntity != null)
-                    {
-                        args.EventObject = foundEntity;
-                    }
+                        arg.EventObject = foundEntity;
                 }
                 else
                 {
+                    // enumerable of objects
+                    // same as above but for each object
                     var updated = false;
-
-                    for (int i = 0; i < list.Count; i++)
+                    for (var i = 0; i < eventObjects.Count; i++)
                     {
-                        //try to find the args entity in the latest entity - based on the equality operators, this will 
-                        //match by Id since that is the default equality checker for IEntity. If one is found, than it is 
-                        //the most recent entity instance so update the args with that instance so we don't emit a stale instance.
-                        var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, list[i]));
-                        if (foundEntity != null)
-                        {
-                            list[i] = foundEntity;
-                            updated = true;
-                        }
+                        var foundEntity = latestEntities.FirstOrDefault(x => Equals(x, eventObjects[i]));
+                        if (foundEntity == null) continue;
+                        eventObjects[i] = foundEntity;
+                        updated = true;
                     }
 
                     if (updated)
-                    {
-                        args.EventObject = list;
-                    }
+                        arg.EventObject = eventObjects;
                 }
             }
         }
 
-        /// <summary>
-        /// This will check against all of the processed entity/events (allEntities) to see if this entity already exists in 
-        /// event args that supersede the event args being passed in and if so returns true.
-        /// </summary>
-        /// <param name="entity"></param>
-        /// <param name="eventDef"></param>
-        /// <param name="allEntities"></param>
-        /// <returns></returns>
-        private static bool IsFiltered(
-            IEntity entity,
-            EventDefinitionTypeData eventDef,
-            List<Tuple<IEntity, EventDefinitionTypeData>> allEntities)
+        // determines if a given entity, appearing in a given event definition, should be filtered out,
+        // considering the entities that have already been visited - an entity is filtered out if it
+        // appears in another even definition, which superceedes this event definition.
+        private static bool IsSuperceeded(IEntity entity, EventDefinitionInfos infos, List<Tuple<IEntity, EventDefinitionInfos>> entities)
         {
-            var argType = eventDef.EventDefinition.Args.GetType();
+            //var argType = meta.EventArgsType;
+            var argType = infos.EventDefinition.Args.GetType();
 
-            //check if the entity is found in any processed event data that could possible supersede this one
-            var foundByEntity = allEntities
-                .Where(x => x.Item2.SupersedeAttributes.Length > 0
-                            //if it's the same arg type than it cannot supersede                
-                            && x.Item2.EventArgType != argType
-                            && Equals(x.Item1, entity))
+            // look for other instances of the same entity, coming from an event args that supercedes other event args,
+            // ie is marked with the attribute, and is not this event args (cannot supersede itself)
+            var superceeding = entities
+                .Where(x => x.Item2.SupersedeTypes.Length > 0 // has the attribute
+                    && x.Item2.EventDefinition.Args.GetType() != argType // is not the same
+                    && Equals(x.Item1, entity)) // same entity
                 .ToArray();
 
-            //no args have been processed with this entity so it should not be filtered
-            if (foundByEntity.Length == 0)
+            // first time we see this entity = not filtered
+            if (superceeding.Length == 0)
                 return false;
 
+            // fixme see notes above
+            // delete event args does NOT superceedes 'unpublished' event
+            if (argType.IsGenericType && argType.GetGenericTypeDefinition() == typeof(PublishEventArgs<>) && infos.EventDefinition.EventName == "UnPublished")
+                return false;
+
+            // found occurences, need to determine if this event args is superceded
             if (argType.IsGenericType)
             {
-                var supercededBy = foundByEntity
-                    .FirstOrDefault(x =>
-                        x.Item2.SupersedeAttributes.Any(y =>
-                            //if the attribute type is a generic type def then compare with the generic type def of the event arg
-                                (y.SupersededEventArgsType.IsGenericTypeDefinition && y.SupersededEventArgsType == argType.GetGenericTypeDefinition())
-                                //if the attribute type is not a generic type def then compare with the normal type of the event arg
-                                || (y.SupersededEventArgsType.IsGenericTypeDefinition == false && y.SupersededEventArgsType == argType)));
+                // generic, must compare type arguments
+                var supercededBy = superceeding.FirstOrDefault(x =>
+                    x.Item2.SupersedeTypes.Any(y =>
+                        // superceeding a generic type which has the same generic type definition
+                        // fixme no matter the generic type parameters? could be different?
+                        y.IsGenericTypeDefinition && y == argType.GetGenericTypeDefinition()
+                        // or superceeding a non-generic type which is ... fixme how is this ever possible? argType *is* generic?
+                        || y.IsGenericTypeDefinition == false && y == argType));
                 return supercededBy != null;
             }
             else
             {
-                var supercededBy = foundByEntity
-                    .FirstOrDefault(x =>
-                        x.Item2.SupersedeAttributes.Any(y =>
-                            //since the event arg type is not a generic type, then we just compare type 1:1
-                                y.SupersededEventArgsType == argType));
+                // non-generic, can compare types 1:1
+                var supercededBy = superceeding.FirstOrDefault(x =>
+                    x.Item2.SupersedeTypes.Any(y => y == argType));
                 return supercededBy != null;
             }
         }

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.UserHostAddress;
+                    return httpContext.Request.ServerVariables["REMOTE_ADDR"];
 
                 var addresses = ipAddress.Split(',');
                 if (addresses.Length != 0)
                     return addresses[0];
 
-                return httpContext.Request.UserHostAddress;
+                return httpContext.Request.ServerVariables["REMOTE_ADDR"];
             }
             catch (System.Exception ex)
             {

src/Umbraco.Core/Logging/RollingFileCleanupAppender.cs

@@ -0,0 +1,95 @@
+using System;
+using System.IO;
+using log4net.Appender;
+using log4net.Util;
+
+namespace Umbraco.Core.Logging
+{
+    /// <summary>
+    /// This class will do the exact same thing as the RollingFileAppender that comes from log4net
+    /// With the extension, that it is able to do automatic cleanup of the logfiles in the directory where logging happens
+    /// 
+    /// By specifying the properties MaxLogFileDays and BaseFilePattern, the files will automaticly get deleted when
+    /// the logger is configured(typically when the app starts). To utilize this appender swap out the type of the rollingFile appender
+    /// that ships with Umbraco, to be Umbraco.Core.Logging.RollingFileCleanupAppender, and add the maxLogFileDays and baseFilePattern elements 
+    /// to the configuration i.e.:
+    /// 
+    /// <example>
+    ///  <appender name="rollingFile" type="Log4netAwesomeness.CustomRollingFileAppender, Log4netAwesomeness">
+    ///	  <file type="log4net.Util.PatternString" value="App_Data\Logs\UmbracoTraceLog.%property{log4net:HostName}.txt" />
+    ///    <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+    ///    <appendToFile value="true" />
+    ///    <rollingStyle value="Date" />
+    ///    <maximumFileSize value="5MB" />
+    ///    <maxLogFileDays value="5"/>
+    ///    <basefilePattern value="UmbracoTraceLog.*.txt.*"/>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <layout type="log4net.Layout.PatternLayout">
+    ///      <conversionPattern value=" %date [P%property{processId}/D%property{appDomainId}/T%thread] %-5level %logger - %message%newline" />
+    ///    </layout>
+    ///    <encoding value="utf-8" />
+    ///  </appender>
+    /// </example>
+    /// </summary>
+    public class RollingFileCleanupAppender : RollingFileAppender
+    {
+        public int MaxLogFileDays { get; set; }
+        public string BaseFilePattern { get; set; }
+
+        /// <summary>
+        /// This override will delete logs older than the specified amount of days
+        /// </summary>
+        /// <param name="fileName"></param>
+        /// <param name="append"></param>
+        protected override void OpenFile(string fileName, bool append)
+        {
+            bool cleanup = true;
+            // Validate settings and input
+            if (MaxLogFileDays <= 0)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'MaxLogFileDays' needs to be a positive integer, aborting cleanup");
+                cleanup = false;
+            }
+
+            if (string.IsNullOrWhiteSpace(BaseFilePattern))
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), "Parameter 'BaseFilePattern' is empty, aborting cleanup");
+                cleanup = false;
+            }
+            // grab the directory we are logging to, as this is were we will search for older logfiles
+            var logFolder = Path.GetDirectoryName(fileName);
+            if (Directory.Exists(logFolder) == false)
+            {
+                LogLog.Warn(typeof(RollingFileCleanupAppender), string.Format("Directory '{0}' for logfiles does not exist, aborting cleanup", logFolder));
+                cleanup = false;
+            }
+            // If everything is validated, we can do the actual cleanup
+            if (cleanup)
+            {
+                Cleanup(logFolder);
+            }
+
+            base.OpenFile(fileName, append);
+        }
+
+        private void Cleanup(string directoryPath)
+        {
+            // only take files that matches the pattern we are using i.e. UmbracoTraceLog.*.txt.*
+            string[] logFiles = Directory.GetFiles(directoryPath, BaseFilePattern);
+            LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Found {0} files that matches the baseFilePattern: '{1}'", logFiles.Length, BaseFilePattern));
+
+            foreach (var logFile in logFiles)
+            {
+                DateTime lastAccessTime = System.IO.File.GetLastWriteTimeUtc(logFile);
+                // take the value from the config file
+                if (lastAccessTime < DateTime.Now.AddDays(-MaxLogFileDays))
+                {
+                    LogLog.Debug(typeof(RollingFileCleanupAppender), string.Format("Deleting file {0} as its lastAccessTime is older than {1} days speficied by MaxLogFileDays", logFile, MaxLogFileDays));
+                    base.DeleteFile(logFile);
+                }
+            }
+        }
+    }
+}

src/Umbraco.Core/Models/AuditItem.cs

@@ -2,30 +2,18 @@
 
 namespace Umbraco.Core.Models
 {
-    public sealed class AuditItem : Entity, IAuditItem
+    public sealed class AuditItem : Entity, IAggregateRoot
     {
-        /// <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/ContentType.cs

@@ -95,8 +95,10 @@ namespace Umbraco.Core.Models
             get { return _allowedTemplates; }
             set
             {
-                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector,
-                   Ps.Value.TemplateComparer);
+                SetPropertyValueAndDetectChanges(value, ref _allowedTemplates, Ps.Value.AllowedTemplatesSelector, Ps.Value.TemplateComparer);
+
+                if (_allowedTemplates.Any(x => x.Id == _defaultTemplate) == false)
+                    DefaultTemplateId = 0;
             }
         }
 

src/Umbraco.Core/Models/IAuditItem.cs

@@ -1,12 +0,0 @@
-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

@@ -34,12 +34,34 @@ namespace Umbraco.Core.Models.Identity
                 .ForMember(user => user.CalculatedContentStartNodeIds, expression => expression.MapFrom(user => user.CalculateContentStartNodeIds(applicationContext.Services.EntityService)))
                 .ForMember(user => user.CalculatedMediaStartNodeIds, expression => expression.MapFrom(user => user.CalculateMediaStartNodeIds(applicationContext.Services.EntityService)))
                 .ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()))
+
+                .ForMember(user => user.LockoutEnabled, expression => expression.Ignore())
+                .ForMember(user => user.Logins, expression => expression.Ignore())
+                .ForMember(user => user.Roles, expression => expression.Ignore())
+                .ForMember(user => user.PhoneNumber, expression => expression.Ignore())
+                .ForMember(user => user.PhoneNumberConfirmed, expression => expression.Ignore())
+                .ForMember(user => user.TwoFactorEnabled, expression => expression.Ignore())
+                .ForMember(user => user.Claims, expression => expression.Ignore())
+
                 .AfterMap((user, identityUser) =>
                 {
                     identityUser.ResetDirtyProperties(true);
                     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)
@@ -47,4 +69,4 @@ namespace Umbraco.Core.Models.Identity
             return storedPass.StartsWith(Constants.Security.EmptyPasswordPrefix) ? null : storedPass;
         }
     }
-}
+}

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

@@ -69,11 +69,6 @@ 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; }
-
-        /// <summary>
-        /// A Json blob stored for recording tour data for a user
-        /// </summary>
-        string TourData { get; set; }
+        string Avatar { get; set; }
     }
 }

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

@@ -99,7 +99,6 @@ 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;
@@ -133,7 +132,6 @@ 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);
@@ -466,18 +464,8 @@ 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/PublishedContent/PublishedContentModelFactory.cs

@@ -42,7 +42,7 @@ namespace Umbraco.Core.Models.PublishedContent
                 var typeName = attribute == null ? type.Name : attribute.ContentTypeAlias;
 
                 if (constructors.ContainsKey(typeName))
-                    throw new InvalidOperationException(string.Format("More that one type want to be a model for content type {0}.", typeName));
+                    throw new InvalidOperationException(string.Format("More than one type wants to be a model for content type {0}.", typeName));
 
                 // should work everywhere, but slow
                 //_constructors[typeName] = constructor;

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

@@ -27,10 +27,5 @@ 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,5 +24,4 @@ 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

@@ -1,29 +0,0 @@
-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,7 +27,6 @@ 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,14 +103,6 @@ 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

@@ -1,52 +0,0 @@
-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.7 - retained only to support migrations from previous versions")]
+    [Obsolete("Table no longer exists as of 7.6 - retained only to support migrations from previous versions")]
     [TableName("umbracoUserType")]
     [PrimaryKey("id")]
     [ExplicitColumns]

src/Umbraco.Core/Models/UmbracoObjectTypes.cs

@@ -188,7 +188,7 @@ namespace Umbraco.Core.Models
         Language,
 
         /// <summary>
-        /// Document
+        /// Document Blueprint
         /// </summary>
         [UmbracoObjectType(Constants.ObjectTypes.DocumentBlueprint, typeof(IContent))]
         [FriendlyName("DocumentBlueprint")]

src/Umbraco.Core/Models/UserExtensions.cs

@@ -30,11 +30,12 @@ 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[] GetUserAvatarUrls(this IUser user, ICacheProvider staticCache)
+        internal static string[] GetCurrentUserAvatarUrls(this IUser user, IUserService userService, 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/Packaging/PackageExtraction.cs

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

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,7 +5,6 @@ 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,6 +1,5 @@
 using System;
 using System.Globalization;
-using System.Text.RegularExpressions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Rdbms;
 
@@ -10,17 +9,20 @@ 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)
+        public MediaFactory(IMediaType contentType, Guid nodeObjectTypeId, int id)
         {
             _contentType = contentType;
             _nodeObjectTypeId = nodeObjectTypeId;
+            _id = id;
         }
 
-        public MediaFactory(Guid nodeObjectTypeId)
+        public MediaFactory(Guid nodeObjectTypeId, int id)
         {
             _nodeObjectTypeId = nodeObjectTypeId;
+            _id = id;
         }
 
         #region Implementation of IEntityFactory<IMedia,ContentVersionDto>
@@ -62,27 +64,15 @@ namespace Umbraco.Core.Persistence.Factories
             return BuildEntity(dto, _contentType);
         }
 
-        public MediaDto BuildDto(IMedia entity)
+        public ContentVersionDto BuildDto(IMedia 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
-            };
+            var dto = new ContentVersionDto
+                                        {
+                                            NodeId = entity.Id,
+                                            VersionDate = entity.UpdateDate,
+                                            VersionId = entity.Version,
+                                            ContentDto = BuildContentDto(entity)
+                                        };
             return dto;
         }
 
@@ -129,30 +119,5 @@ 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,7 +36,6 @@ 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
@@ -70,8 +69,7 @@ namespace Umbraco.Core.Persistence.Factories
                 UpdateDate = entity.UpdateDate,
                 Avatar = entity.Avatar,
                 EmailConfirmedDate = entity.EmailConfirmedDate,
-                InvitedDate = entity.InvitedDate,
-                TourData = entity.TourData
+                InvitedDate = entity.InvitedDate
             };
 
             foreach (var startNodeId in entity.StartContentIds)

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

@@ -1,47 +0,0 @@
-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,28 +43,27 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
                                                                               {3, typeof (ContentDto)},
                                                                               {4, typeof (ContentVersionDto)},
                                                                               {5, typeof (DocumentDto)},
-                                                                              {6, typeof (MediaDto)},
                                                                               
-                                                                              {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)},
+                                                                              {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)},
                                                                               
                                                                               {28, typeof (TagDto)},
                                                                               {29, typeof (TagRelationshipDto)},
@@ -92,7 +91,6 @@ 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,12 +148,6 @@ 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

@@ -1,101 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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,5 +1,6 @@
 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,12 +1,16 @@
 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,12 +38,8 @@ namespace Umbraco.Core.Persistence
 
             _tableDefinition = DefinitionFactory.GetTableDefinition(sqlSyntaxProvider, pd.type);
             if (_tableDefinition == null) throw new InvalidOperationException("No table definition found for type " + pd.type);
-
-            //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();
+            
+            _readerColumns = pd.Columns.Select(x => x.Value).ToArray();
             _sqlSyntaxProvider = sqlSyntaxProvider;
             _enumerator = dataSource.GetEnumerator();
             _columnDefinitions = _tableDefinition.Columns.ToArray();

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

@@ -1,113 +1,29 @@
 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, IAuditItem>, IAuditRepository
+    internal class AuditRepository : PetaPocoRepositoryBase<int, AuditItem>, IAuditRepository
     {
         public AuditRepository(IScopeUnitOfWork work, CacheHelper cache, ILogger logger, ISqlSyntaxProvider sqlSyntax)
             : base(work, cache, logger, sqlSyntax)
         {
         }
 
-        /// <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)
+        protected override void PersistNewItem(AuditItem entity)
         {
-            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;
+            throw new NotImplementedException();
         }
 
-        protected override void PersistUpdatedItem(IAuditItem entity)
+        #region Not Implemented - not needed
+
+        protected override void PersistUpdatedItem(AuditItem entity)
         {
             Database.Insert(new LogDto
             {
@@ -119,40 +35,26 @@ 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();
@@ -169,33 +71,6 @@ 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/Interfaces/IAuditRepository.cs

@@ -1,37 +1,11 @@
 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, IAuditItem>
+    public interface IAuditRepository : IRepository<int, AuditItem>
     {
-        /// <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,8 +9,6 @@ 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,12 +91,7 @@ namespace Umbraco.Core.Persistence.Repositories
 
         IProfile GetProfile(string username);
         IProfile GetProfile(int id);
-        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);
+        IDictionary<UserState, int> GetUserStates();
+        
     }
 }

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

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text.RegularExpressions;
+using System.Text;
 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>
 
-        private Sql GetBaseQuery(BaseQueryType queryType, bool includeFilePaths)
+        protected override Sql GetBaseQuery(BaseQueryType queryType)
         {
             var sql = new Sql();
             sql.Select(queryType == BaseQueryType.Count ? "COUNT(*)" : (queryType == BaseQueryType.Ids ? "cmsContentVersion.contentId" : "*"))
@@ -95,26 +95,14 @@ 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);
-
-            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);
+                .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);
             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);
@@ -140,7 +128,6 @@ 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",
@@ -380,7 +367,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);
+            var factory = new MediaFactory(NodeObjectTypeId, entity.Id);
             var dto = factory.BuildDto(entity);
 
             //NOTE Should the logic below have some kind of fallback for empty parent ids ?
@@ -393,7 +380,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var sortOrder = maxSortOrder + 1;
 
             //Create the (base) node data - umbracoNode
-            var nodeDto = dto.ContentVersionDto.ContentDto.NodeDto;
+            var nodeDto = dto.ContentDto.NodeDto;
             nodeDto.Path = parent.Path;
             nodeDto.Level = short.Parse(level.ToString(CultureInfo.InvariantCulture));
             nodeDto.SortOrder = sortOrder;
@@ -428,21 +415,15 @@ namespace Umbraco.Core.Persistence.Repositories
             entity.Level = level;
 
             //Create the Content specific data - cmsContent
-            var contentDto = dto.ContentVersionDto.ContentDto;
+            var contentDto = dto.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);
@@ -490,14 +471,14 @@ namespace Umbraco.Core.Persistence.Repositories
                 entity.SortOrder = maxSortOrder + 1;
             }
 
-            var factory = new MediaFactory(NodeObjectTypeId);
+            var factory = new MediaFactory(NodeObjectTypeId, entity.Id);
             //Look up Content entry to get Primary for updating the DTO
-            var contentDto = Database.First<ContentDto>("WHERE nodeId = @Id", new { Id = entity.Id });
+            var contentDto = Database.SingleOrDefault<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.ContentVersionDto.ContentDto.NodeDto;
+            var nodeDto = dto.ContentDto.NodeDto;
             nodeDto.ValidatePathWithException();
             var o = Database.Update(nodeDto);
 
@@ -505,18 +486,15 @@ namespace Umbraco.Core.Persistence.Repositories
             if (contentDto.ContentTypeId != entity.ContentTypeId)
             {
                 //Create the Content specific data - cmsContent
-                var newContentDto = dto.ContentVersionDto.ContentDto;
+                var newContentDto = dto.ContentDto;
                 Database.Update(newContentDto);
             }
 
             //In order to update the ContentVersion we need to retrieve its primary key id
-            var contentVerDto = Database.First<ContentVersionDto>("WHERE VersionId = @Version", new { Version = entity.Version });
-            dto.ContentVersionDto.Id = contentVerDto.Id;
+            var contentVerDto = Database.SingleOrDefault<ContentVersionDto>("WHERE VersionId = @Version", new { Version = entity.Version });
+            dto.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
@@ -661,39 +639,7 @@ namespace Umbraco.Core.Persistence.Repositories
             }
             #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;
-        }
+        #endregion
 
         /// <summary>
         /// Gets paged media results
@@ -757,8 +703,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);
         }
@@ -183,17 +183,17 @@ namespace Umbraco.Core.Persistence.Repositories
         }
 
         public IEnumerable<IMemberGroup> GetMemberGroupsForMember(string username)
-        {
-            var sql = new Sql()
+        {
+            var sql = new Sql()
                 .Select("un.*")
                 .From("umbracoNode AS un")
                 .InnerJoin("cmsMember2MemberGroup")
-                .On("un.id = cmsMember2MemberGroup.MemberGroup")
-                .LeftJoin("(SELECT umbracoNode.id, cmsMember.LoginName FROM umbracoNode INNER JOIN cmsMember ON umbracoNode.id = cmsMember.nodeId) AS member")
-                .On("member.id = cmsMember2MemberGroup.Member")
-                .Where("un.nodeObjectType=@objectType", new {objectType = NodeObjectTypeId })
-                .Where("member.LoginName=@loginName", new {loginName = username});
-            
+                .On("cmsMember2MemberGroup.MemberGroup = un.id")
+                .InnerJoin("cmsMember")
+                .On("cmsMember.nodeId = cmsMember2MemberGroup.Member")
+                .Where("un.nodeObjectType=@objectType", new { objectType = NodeObjectTypeId })
+                .Where("cmsMember.LoginName=@loginName", new { loginName = username });
+            
             return Database.Fetch<NodeDto>(sql)
                 .DistinctBy(dto => dto.NodeId)
                 .Select(x => _modelFactory.BuildEntity(x));
@@ -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,9 +1,14 @@
 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;
@@ -48,16 +53,15 @@ 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,6 +4,7 @@ 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;

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

@@ -20,6 +20,12 @@ namespace Umbraco.Core.Persistence.Repositories
 
                 var name = Name;
 
+				// cater for instances where node has no name.
+				if(string.IsNullOrWhiteSpace(name))
+				{
+					return _numPos;
+ 				}
+
                 if (name[name.Length - 1] != ')')
                     return _numPos = -1;
 
@@ -106,7 +112,7 @@ namespace Umbraco.Core.Persistence.Repositories
                 }
             }
 
-            return uniqueing ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
+            return uniqueing || string.IsNullOrWhiteSpace(nodeName) ? string.Concat(nodeName, " (", uniqueNumber.ToString(), ")") : nodeName;
         }
     }
 }

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

@@ -6,7 +6,6 @@ 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;
@@ -188,95 +187,18 @@ 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, result[0].num},
-                {UserState.Active, result[1].num},
-                {UserState.Disabled, result[2].num},
-                {UserState.LockedOut, result[3].num},
-                {UserState.Invited, result[4].num}
+                {UserState.All, (int)result[0].num},
+                {UserState.Active, (int)result[1].num},
+                {UserState.Disabled, (int)result[2].num},
+                {UserState.LockedOut, (int)result[3].num},
+                {UserState.Invited, (int)result[4].num}
             };
         }
 
-        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();
@@ -479,8 +401,7 @@ ORDER BY colName";
                 {"updateDate", "UpdateDate"},
                 {"avatar", "Avatar"},
                 {"emailConfirmedDate", "EmailConfirmedDate"},
-                {"invitedDate", "InvitedDate"},
-                {"tourData", "TourData"}
+                {"invitedDate", "InvitedDate"}
             };
 
             //create list of properties that have changed
@@ -913,6 +834,14 @@ 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/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,12 +40,13 @@ 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)),
-                        HttpContext.Current.IsDebuggingEnabled);
+                        isDebug);
                     
                     var sections = GetArray(obj, "sections");
                     foreach (var section in sections.Cast<JObject>())
@@ -112,4 +113,4 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
         }
 
     }
-}
+}

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

@@ -18,6 +18,8 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             return Constants.PropertyEditors.MultipleTextstringAlias.Equals(propertyType.PropertyEditorAlias);
         }
 
+        private static readonly string[] NewLineDelimiters = { "\r\n", "\r", "\n" };
+
         public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)
         {
             // data is (both in database and xml):
@@ -53,7 +55,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
             // Fall back on normal behaviour
             if (values.Any() == false)
             {
-                return sourceString.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
+                return sourceString.Split(NewLineDelimiters, StringSplitOptions.None);
             }
 
             return values.ToArray();

src/Umbraco.Core/Scoping/ScopeContext.cs

@@ -116,5 +116,19 @@ namespace Umbraco.Core.Scoping
             Enlisted[key] = enlistedOfT;
             return enlistedOfT.Item;
         }
+
+        public T GetEnlisted<T>(string key)
+        {
+            var enlistedObjects = _enlisted;
+            if (enlistedObjects == null) return default (T);
+
+            IEnlistedObject enlisted;
+            if (enlistedObjects.TryGetValue(key, out enlisted) == false)
+                return default (T);
+
+            var enlistedAs = enlisted as EnlistedObject<T>;
+            if (enlistedAs == null) throw new InvalidOperationException("An item with the key exists, but with a different type.");
+            return enlistedAs.Item;
+        }
     }
 }

src/Umbraco.Core/Security/AuthenticationExtensions.cs

@@ -11,14 +11,12 @@ 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
 {
@@ -243,11 +241,8 @@ 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, 
@@ -259,7 +254,14 @@ 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
@@ -329,23 +331,7 @@ 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,29 +2,16 @@
 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;
         }
@@ -37,9 +24,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,
-                //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
+                //set a new session id
                 new UserData
                 {
                     Id = user.Id,
@@ -50,22 +37,15 @@ namespace Umbraco.Core.Security
                     Roles = user.Roles.Select(x => x.RoleId).ToArray(),
                     StartContentNodes = user.CalculatedContentStartNodeIds,
                     StartMediaNodes = user.CalculatedMediaStartNodeIds,
-                    SecurityStamp = user.SecurityStamp
+                    SessionId = 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,83 +1,21 @@
 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),
@@ -96,45 +34,21 @@ namespace Umbraco.Core.Security
         }
 
         /// <summary>
-        /// Ensures that the culture is set correctly for the current back office user and that the user's session token is valid
+        /// Ensures that the culture is set correctly for the current back office user
         /// </summary>
         /// <param name="context"/>
         /// <returns/>
-        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)
+        public override Task ValidateIdentity(CookieValidateIdentityContext context)
         {
             var umbIdentity = context.Identity as UmbracoBackOfficeIdentity;
             if (umbIdentity != null && umbIdentity.IsAuthenticated)
             {
                 Thread.CurrentThread.CurrentCulture =
                     Thread.CurrentThread.CurrentUICulture =
-                        UserCultures.GetOrAdd(umbIdentity.Culture, s => new CultureInfo(s));
+                        new CultureInfo(umbIdentity.Culture);
             }
-        }
 
-        /// <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>();
+            return base.ValidateIdentity(context);
+        }
     }
 }

src/Umbraco.Core/Security/BackOfficeSignInManager.cs

@@ -223,9 +223,6 @@ 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,6 +152,7 @@ namespace Umbraco.Core.Security
             //NOTE: This method is mostly here for backwards compat
             base.InitUserManager(manager, membershipProvider, options.DataProtectionProvider, contentSectionConfig);
         }
+       
     }
 
     /// <summary>
@@ -168,7 +169,7 @@ namespace Umbraco.Core.Security
 
         #region What we support do not currently
 
-        //TODO: We could support this - but a user claims will mostly just be what is in the auth cookie
+        //NOTE: Not sure if we really want/need to ever support this 
         public override bool SupportsUserClaim
         {
             get { return false; }
@@ -270,22 +271,6 @@ 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>
@@ -689,5 +674,4 @@ namespace Umbraco.Core.Security
             return httpContext.GetCurrentRequestIpAddress();
         }
     }
-
 }

src/Umbraco.Core/Security/BackOfficeUserStore.cs

@@ -26,13 +26,12 @@ namespace Umbraco.Core.Security
         IUserRoleStore<BackOfficeIdentityUser, int>,
         IUserSecurityStampStore<BackOfficeIdentityUser, int>,
         IUserLockoutStore<BackOfficeIdentityUser, int>,
-        IUserTwoFactorStore<BackOfficeIdentityUser, int>,
-        IUserSessionStore<BackOfficeIdentityUser, int>
+        IUserTwoFactorStore<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;
@@ -754,15 +753,6 @@ 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

@@ -1,17 +0,0 @@
-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,5 +1,4 @@
 using System;
-using System.Web;
 using Microsoft.AspNet.Identity.Owin;
 using Microsoft.Owin;
 using Umbraco.Core.Models.Identity;
@@ -8,37 +7,6 @@ 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

@@ -1,118 +0,0 @@
-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,7 +36,6 @@ 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);
 
@@ -67,9 +66,8 @@ 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
-            {
-                SecurityStamp = securityStamp,
+            var userData = new UserData(session)
+            {
                 SessionId = session,
                 AllowedApplications = allowedApps.ToArray(),
                 Culture = culture,
@@ -191,8 +189,7 @@ namespace Umbraco.Core.Security
                     Constants.Security.StartContentNodeIdClaimType,
                     Constants.Security.StartMediaNodeIdClaimType, 
                     ClaimTypes.Locality, 
-                    Constants.Security.SessionIdClaimType,
-                    Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType
+                    Constants.Security.SessionIdClaimType
                 };
             }
         } 
@@ -229,7 +226,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, SecurityStamp, ClaimValueTypes.String, Issuer, Issuer, this));
+                    AddClaim(new Claim(Microsoft.AspNet.Identity.Constants.DefaultSecurityStampClaimType, SessionId, ClaimValueTypes.String, Issuer, Issuer, this));
                 }
             }
 
@@ -310,11 +307,6 @@ 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 current sessionId for the user
+        /// The security stamp for the user
         /// </param>
         public UserData(string sessionId)
         {
@@ -29,18 +29,12 @@ namespace Umbraco.Core.Security
             Roles = new string[] { };
         }
 
-        /// <summary>
-        /// This is the 'sessionId' for validation
-        /// </summary>        
-        [DataMember(Name = "sessionId")]
-        public string SessionId { get; set; }
-
         /// <summary>
         /// This is the 'security stamp' for validation
         /// </summary>        
-        [DataMember(Name = "securityStamp")]
-        public string SecurityStamp { get; set; }
-
+        [DataMember(Name = "sessionId")]
+        public string SessionId { get; set; } 
+
         [DataMember(Name = "id")]
         public object Id { get; set; }
         

src/Umbraco.Core/Services/AuditService.cs

@@ -1,12 +1,8 @@
 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
@@ -26,86 +22,5 @@ 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

@@ -993,8 +993,7 @@ namespace Umbraco.Core.Services
                     FROM umbracoNode
                     JOIN cmsDocument ON umbracoNode.id=cmsDocument.nodeId AND cmsDocument.published=@0
                     WHERE umbracoNode.trashed=@1 AND umbracoNode.id IN (@2)",
-                    true, false, ids);
-                Console.WriteLine(sql.SQL);
+                    true, false, ids);                    
                 var x = uow.Database.Fetch<int>(sql);
                 return ids.Length == x.Count;
             }
@@ -1345,6 +1344,40 @@ namespace Umbraco.Core.Services
             return content;
         }
 
+        public void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0)
+        {
+            using (new WriteLock(Locker))
+            using (var uow = UowProvider.GetUnitOfWork())
+            {
+                var repository = RepositoryFactory.CreateContentBlueprintRepository(uow);
+
+                var contentTypeIdsA = contentTypeIds.ToArray();
+                var query = new Query<IContent>();
+                if (contentTypeIdsA.Length > 0)
+                {
+                    query.Where(x => contentTypeIdsA.Contains(x.ContentTypeId));
+                }
+                var blueprints = repository.GetByQuery(query).Select(x =>
+                {
+                    ((Content) x).IsBlueprint = true;
+                    return x;
+                }).ToArray();
+
+                foreach (var blueprint in blueprints)
+                {
+                    repository.Delete(blueprint);
+                }
+
+                uow.Events.Dispatch(DeletedBlueprint, this, new DeleteEventArgs<IContent>(blueprints), "DeletedBlueprint");
+                uow.Commit();
+            }
+        }
+
+        public void DeleteBlueprintsOfType(int contentTypeId, int userId = 0)
+        {
+            DeleteBlueprintsOfTypes(new[] {contentTypeId}, userId);
+        }
+
         /// <summary>
         /// Saves a single <see cref="IContent"/> object
         /// </summary>
@@ -2009,6 +2042,96 @@ namespace Umbraco.Core.Services
             return true;
         }
 
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        public bool Sort(int[] ids, int userId = 0, bool raiseEvents = true)
+        {
+            var shouldBePublished = new List<IContent>();
+            var shouldBeSaved = new List<IContent>();
+
+            using (new WriteLock(Locker))
+            {
+                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
+                var items = ids.Select(x => allContent[x]);
+
+                using (var uow = UowProvider.GetUnitOfWork())
+                {
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
+                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
+                    {
+                        uow.Commit();
+                        return false;
+                    }
+
+                    var repository = RepositoryFactory.CreateContentRepository(uow);
+
+                    var i = 0;
+                    foreach (var content in asArray)
+                    {
+                        //If the current sort order equals that of the content
+                        //we don't need to update it, so just increment the sort order
+                        //and continue.
+                        if (content.SortOrder == i)
+                        {
+                            i++;
+                            continue;
+                        }
+
+                        content.SortOrder = i;
+                        content.WriterId = userId;
+                        i++;
+
+                        if (content.Published)
+                        {
+                            //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                            var published = _publishingStrategy.Publish(uow, content, userId).Success;
+                            shouldBePublished.Add(content);
+                        }
+                        else
+                            shouldBeSaved.Add(content);
+
+                        repository.AddOrUpdate(content);
+                        //add or update a preview
+                        repository.AddOrUpdatePreviewXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    foreach (var content in shouldBePublished)
+                    {
+                        //Create and Save ContentXml DTO
+                        repository.AddOrUpdateContentXml(content, c => _entitySerializer.Serialize(this, _dataTypeService, _userService, c));
+                    }
+
+                    if (raiseEvents)
+                    {
+                        saveEventArgs.CanCancel = false;
+                        uow.Events.Dispatch(Saved, this, saveEventArgs, "Saved");
+                    }
+
+                    if (shouldBePublished.Any())
+                    {
+                        //TODO: This should not be an inner operation, but if we do this, it cannot raise events and cannot be cancellable!
+                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
+                    }
+
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
+                    uow.Commit();
+                }
+            }
+
+            return true;
+        }
+
         public IEnumerable<IContent> GetBlueprintsForContentTypes(params int[] documentTypeIds)
         {
             using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
@@ -2453,6 +2576,7 @@ 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);
                 }
             }
@@ -2748,4 +2872,4 @@ namespace Umbraco.Core.Services
 
         #endregion
     }
-}
+}

src/Umbraco.Core/Services/ContentTypeService.cs

@@ -377,7 +377,7 @@ namespace Umbraco.Core.Services
                 repo.Delete(container);
                 uow.Commit();
                 deleteEventArgs.CanCancel = false;
-                uow.Events.Dispatch(DeletedMediaTypeContainer, this, deleteEventArgs);
+                uow.Events.Dispatch(DeletedMediaTypeContainer, this, deleteEventArgs, "DeletedMediaTypeContainer");
 
                 return OperationStatus.Success(evtMsgs);
                 //TODO: Audit trail ?
@@ -920,7 +920,9 @@ namespace Umbraco.Core.Services
                     var deletedContentTypes = new List<IContentType> { contentType };
                     deletedContentTypes.AddRange(GetDescendants(contentType));
 
-                    _contentService.DeleteContentOfTypes(deletedContentTypes.Select(x => x.Id), userId);
+                    var ids = deletedContentTypes.Select(x => x.Id).ToArray();
+                    _contentService.DeleteContentOfTypes(ids, userId);
+                    _contentService.DeleteBlueprintsOfTypes(ids);
 
                     repository.Delete(contentType);
                     deleteEventArgs.DeletedEntities = deletedContentTypes.DistinctBy(x => x.Id);

src/Umbraco.Core/Services/IAuditService.cs

@@ -1,58 +1,9 @@
-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/IContentService.cs

@@ -101,7 +101,9 @@ namespace Umbraco.Core.Services
         IContent GetBlueprintById(Guid id);
         void SaveBlueprint(IContent content, int userId = 0);
         void DeleteBlueprint(IContent content, int userId = 0);
-        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0);
+        IContent CreateContentFromBlueprint(IContent blueprint, string name, int userId = 0);
+        void DeleteBlueprintsOfType(int contentTypeId, int userId = 0);
+        void DeleteBlueprintsOfTypes(IEnumerable<int> contentTypeIds, int userId = 0);
 
         /// <summary>
         /// Gets all XML entries found in the cmsContentXml table based on the given path
@@ -642,7 +644,21 @@ namespace Umbraco.Core.Services
         /// <param name="userId"></param>
         /// <param name="raiseEvents"></param>
         /// <returns>True if sorting succeeded, otherwise False</returns>
-        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+        bool Sort(IEnumerable<IContent> items, int userId = 0, bool raiseEvents = true);
+
+        /// <summary>
+        /// Sorts a collection of <see cref="IContent"/> objects by updating the SortOrder according
+        /// to the ordering of node Ids passed in.
+        /// </summary>
+        /// <remarks>
+        /// Using this method will ensure that the Published-state is maintained upon sorting
+        /// so the cache is updated accordingly - as needed.
+        /// </remarks>
+        /// <param name="ids"></param>
+        /// <param name="userId"></param>
+        /// <param name="raiseEvents"></param>
+        /// <returns>True if sorting succeeded, otherwise False</returns>
+        bool Sort(int[] ids, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
         /// Gets the parent of the current content as an <see cref="IContent"/> item.

src/Umbraco.Core/Services/IUserService.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Models;
@@ -12,35 +11,7 @@ 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/MediaService.cs

@@ -4,6 +4,7 @@ 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;
@@ -11,6 +12,7 @@ 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;
@@ -41,7 +43,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"/>
@@ -61,7 +63,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"/>
@@ -729,10 +731,65 @@ 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 repository = RepositoryFactory.CreateMediaRepository(uow);
-                return repository.GetMediaByPath(mediaPath);
+                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);
             }
         }
 
@@ -964,7 +1021,7 @@ namespace Umbraco.Core.Services
 
                 if (raiseEvents)
                 {
-                    saveEventArgs.CanCancel = false;
+                    saveEventArgs.CanCancel = false;
                     uow.Events.Dispatch(Saved, this, saveEventArgs);
                 }
 

src/Umbraco.Core/Services/MemberService.cs

@@ -695,7 +695,7 @@ namespace Umbraco.Core.Services
                 IQuery<IMember> filterQuery = null;
                 if (filter.IsNullOrWhiteSpace() == false)
                 {
-                    filterQuery = Query<IMember>.Builder.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter));
+                    filterQuery = Query<IMember>.Builder.Where(x => x.Name.Contains(filter) || x.Username.Contains(filter) || x.Email.Contains(filter));
                 }
 
                 var repository = RepositoryFactory.CreateMemberRepository(uow);
@@ -986,7 +986,11 @@ namespace Umbraco.Core.Services
         /// <param name="raiseEvents">Optional parameter to raise events.
         /// Default is <c>True</c> otherwise set to <c>False</c> to not raise events</param>
         public void Save(IMember entity, bool raiseEvents = true)
-        {
+        {
+            //trimming username and email to make sure we have no trailing space
+            entity.Username = entity.Username.Trim();
+            entity.Email = entity.Email.Trim();
+
             using (var uow = UowProvider.GetUnitOfWork())
             {
                 var saveEventArgs = new SaveEventArgs<IMember>(entity);

src/Umbraco.Core/Services/PackagingService.cs

@@ -1748,9 +1748,10 @@ namespace Umbraco.Core.Services
 
         internal InstallationSummary InstallPackage(string packageFilePath, int userId = 0, bool raiseEvents = false)
         {
+            var metaData = GetPackageMetaData(packageFilePath);
+
             if (raiseEvents)
-            {
-                var metaData = GetPackageMetaData(packageFilePath);
+            {                
                 if (ImportingPackage.IsRaisedEventCancelled(new ImportPackageEventArgs<string>(packageFilePath, metaData), this))
                 {
                     var initEmpty = new InstallationSummary().InitEmpty();
@@ -1762,7 +1763,7 @@ namespace Umbraco.Core.Services
 
             if (raiseEvents)
             {
-                ImportedPackage.RaiseEvent(new ImportPackageEventArgs<InstallationSummary>(installationSummary, false), this);
+                ImportedPackage.RaiseEvent(new ImportPackageEventArgs<InstallationSummary>(installationSummary, metaData, false), this);
             }
 
             return installationSummary;

src/Umbraco.Core/Services/UserService.cs

@@ -228,9 +228,9 @@ namespace Umbraco.Core.Services
         }
 
         /// <summary>
-        /// Deletes an <see cref="IUser"/>
+        /// Disables an <see cref="IUser"/>
         /// </summary>
-        /// <param name="membershipUser"><see cref="IUser"/> to Delete</param>
+        /// <param name="membershipUser"><see cref="IUser"/> to disable</param>
         public void Delete(IUser membershipUser)
         {
             //disable
@@ -558,47 +558,6 @@ 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))
@@ -753,7 +712,7 @@ namespace Umbraco.Core.Services
         /// <param name="id">Id of the User to retrieve</param>
         /// <returns><see cref="IProfile"/></returns>
         public IProfile GetProfileById(int id)
-        {
+        {
             //This is called a TON. Go get the full user from cache which should already be IProfile
             var fullUser = GetUserById(id);
             var asProfile = fullUser as IProfile;

src/Umbraco.Core/Strings/DefaultShortStringHelper.cs

@@ -70,7 +70,7 @@ namespace Umbraco.Core.Strings
         {
             foreach (var node in _umbracoSettings.RequestHandler.CharCollection)
             {
-                if(string.IsNullOrEmpty(node.Char) == false)
+                if (string.IsNullOrEmpty(node.Char) == false)
                     _urlReplaceCharacters[node.Char] = node.Replacement;
             }
         }
@@ -109,7 +109,7 @@ namespace Umbraco.Core.Strings
         private void EnsureNotFrozen()
         {
             if (_frozen)
-                throw new InvalidOperationException("Cannot configure the helper once it is frozen.");            
+                throw new InvalidOperationException("Cannot configure the helper once it is frozen.");
         }
 
         /// <summary>
@@ -176,7 +176,7 @@ namespace Umbraco.Core.Strings
             }).WithConfig(CleanStringType.Alias, new Config
             {
                 PreFilter = ApplyUrlReplaceCharacters,
-                IsTerm = (c, leading) => leading 
+                IsTerm = (c, leading) => leading
                     ? char.IsLetter(c) // only letters
                     : (char.IsLetterOrDigit(c) || c == '_'), // letter, digit or underscore
                 StringType = CleanStringType.Ascii | CleanStringType.UmbracoCase,
@@ -215,12 +215,12 @@ namespace Umbraco.Core.Strings
                 return new Config
                 {
                     PreFilter = PreFilter,
-                    PostFilter =  PostFilter,
+                    PostFilter = PostFilter,
                     IsTerm = IsTerm,
                     StringType = StringType,
                     BreakTermsOnUpper = BreakTermsOnUpper,
-                    CutAcronymOnNonUpper =  CutAcronymOnNonUpper,
-                    GreedyAcronyms =  GreedyAcronyms,
+                    CutAcronymOnNonUpper = CutAcronymOnNonUpper,
+                    GreedyAcronyms = GreedyAcronyms,
                     Separator = Separator
                 };
             }
@@ -338,9 +338,9 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Gets the JavaScript code defining client-side short string services.
         /// </summary>
         public string GetShortStringServicesJavaScript(string controllerPath)
-        {
-                return string.Format(SssjsFormat,
-                    _umbracoSettings.Content.ForceSafeAliases ? "true" : "false", controllerPath);
+        {
+            return string.Format(SssjsFormat,
+                _umbracoSettings.Content.ForceSafeAliases ? "true" : "false", controllerPath);
         }
 
         #endregion
@@ -467,7 +467,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Cleans a string.
         /// </summary>
         /// <param name="text">The text to clean.</param>
-        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default, 
+        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default,
         /// strings are cleaned up to camelCase and Ascii.</param>
         /// <returns>The clean string.</returns>
         /// <remarks>The string is cleaned in the context of the default culture.</remarks>
@@ -480,7 +480,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Cleans a string, using a specified separator.
         /// </summary>
         /// <param name="text">The text to clean.</param>
-        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default, 
+        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default,
         /// strings are cleaned up to camelCase and Ascii.</param>
         /// <param name="separator">The separator.</param>
         /// <returns>The clean string.</returns>
@@ -494,7 +494,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Cleans a string in the context of a specified culture.
         /// </summary>
         /// <param name="text">The text to clean.</param>
-        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default, 
+        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default,
         /// strings are cleaned up to camelCase and Ascii.</param>
         /// <param name="culture">The culture.</param>
         /// <returns>The clean string.</returns>
@@ -507,7 +507,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// Cleans a string in the context of a specified culture, using a specified separator.
         /// </summary>
         /// <param name="text">The text to clean.</param>
-        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default, 
+        /// <param name="stringType">A flag indicating the target casing and encoding of the string. By default,
         /// strings are cleaned up to camelCase and Ascii.</param>
         /// <param name="separator">The separator.</param>
         /// <param name="culture">The culture.</param>
@@ -554,7 +554,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
                     text = Utf8ToAsciiConverter.ToAsciiString(text);
                     break;
                 case CleanStringType.TryAscii:
-                    const char ESC = (char) 27;
+                    const char ESC = (char)27;
                     var ctext = Utf8ToAsciiConverter.ToAsciiString(text, ESC);
                     if (ctext.Contains(ESC) == false) text = ctext;
                     break;
@@ -568,8 +568,8 @@ function validateSafeAlias(input, value, immediate, callback) {{
 
             // apply post-filter
             if (config.PostFilter != null)
-                text = config.PostFilter(text);
-            
+                text = config.PostFilter(text);
+
             return text;
         }
 
@@ -839,7 +839,7 @@ function validateSafeAlias(input, value, immediate, callback) {{
                     {
                         term = term.Substring(i);
                         term.CopyTo(0, output, opos, term.Length);
-                        opos += term.Length;                        
+                        opos += term.Length;
                     }
                     break;
 
@@ -914,21 +914,22 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// <returns>The filtered string.</returns>
         public virtual string ReplaceMany(string text, IDictionary<string, string> replacements)
         {
-            // be safe
             if (text == null)
+            {
                 throw new ArgumentNullException("text");
+            }
+
             if (replacements == null)
+            {
                 throw new ArgumentNullException("replacements");
+            }
 
-            // Have done various tests, implementing my own "super fast" state machine to handle 
-            // replacement of many items, or via regexes, but on short strings and not too
-            // many replacements (which prob. is going to be our case) nothing can beat this...
-            // (at least with safe and checked code -- we don't want unsafe/unchecked here)
+            foreach (KeyValuePair<string, string> item in replacements)
+            {
+                text = text.Replace(item.Key, item.Value);
+            }
 
-            // Note that it will do chained-replacements ie replaced items can be replaced
-            // in turn by another replacement (ie the order of replacements is important)
-
-            return replacements.Aggregate(text, (current, kvp) => current.Replace(kvp.Key, kvp.Value));
+            return text;
         }
 
         /// <summary>
@@ -940,15 +941,22 @@ function validateSafeAlias(input, value, immediate, callback) {{
         /// <returns>The filtered string.</returns>
         public virtual string ReplaceMany(string text, char[] chars, char replacement)
         {
-            // be safe
             if (text == null)
+            {
                 throw new ArgumentNullException("text");
+            }
+
             if (chars == null)
+            {
                 throw new ArgumentNullException("chars");
+            }
 
-            // see note above
+            for (int i = 0; i < chars.Length; i++)
+            {
+                text = text.Replace(chars[i], replacement);
+            }
 
-            return chars.Aggregate(text, (current, c) => current.Replace(c, replacement));
+            return text;
         }
 
         #endregion

src/Umbraco.Core/Sync/ApplicationUrlHelper.cs

@@ -3,6 +3,7 @@ using System.Web;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
+using Umbraco.Core.Logging;
 using Umbraco.Core.ObjectResolution;
 
 namespace Umbraco.Core.Sync
@@ -46,8 +47,20 @@ namespace Umbraco.Core.Sync
         // settings: for unit tests only
         internal static void EnsureApplicationUrl(ApplicationContext appContext, HttpRequestBase request = null, IUmbracoSettingsSection settings = null)
         {
+            bool newApplicationUrl = false;
+            if (request != null)
+            {
+                var applicationUrl = GetApplicationUrlFromRequest(request);
+                newApplicationUrl = !appContext._umbracoApplicationDomains.Contains(applicationUrl);
+                if (newApplicationUrl)
+                {
+                    appContext._umbracoApplicationDomains.Add(applicationUrl);
+                    LogHelper.Info(typeof(ApplicationUrlHelper), string.Format("New ApplicationUrl detected: {0}", applicationUrl));
+                }
+            }
+
             // if initialized, return
-            if (appContext._umbracoApplicationUrl != null) return;
+            if (appContext._umbracoApplicationUrl != null && !newApplicationUrl) return;
 
             var logger = appContext.ProfilingLogger.Logger;
 
@@ -132,6 +145,12 @@ namespace Umbraco.Core.Sync
         {
             var logger = appContext.ProfilingLogger.Logger;
 
+            appContext._umbracoApplicationUrl = GetApplicationUrlFromRequest(request);
+            logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (UmbracoModule request)");
+        }
+
+        private static string GetApplicationUrlFromRequest(HttpRequestBase request)
+        {
             // if (HTTP and SSL not required) or (HTTPS and SSL required),
             //  use ports from request
             // otherwise,
@@ -147,8 +166,7 @@ namespace Umbraco.Core.Sync
             var ssl = useSsl ? "s" : ""; // force, whatever the first request
             var url = "http" + ssl + "://" + request.ServerVariables["SERVER_NAME"] + port + IOHelper.ResolveUrl(SystemDirectories.Umbraco);
 
-            appContext._umbracoApplicationUrl = url.TrimEnd('/');
-            logger.Info(TypeOfApplicationUrlHelper, "ApplicationUrl: " + appContext.UmbracoApplicationUrl + " (UmbracoModule request)");
+            return url.TrimEnd('/');
         }
     }
-}
+}

src/Umbraco.Core/Sync/DatabaseServerMessenger.cs

@@ -87,8 +87,7 @@ namespace Umbraco.Core.Sync
             {
                 UtcStamp = DateTime.UtcNow,
                 Instructions = JsonConvert.SerializeObject(instructions, Formatting.None),
-                OriginIdentity = LocalIdentity,
-                InstructionCount = instructions.Sum(x => x.JsonIdCount)
+                OriginIdentity = LocalIdentity
             };
 
             ApplicationContext.DatabaseContext.Database.Insert(dto);
@@ -166,10 +165,10 @@ namespace Umbraco.Core.Sync
                 }
                 else
                 {
-                    //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});
+                    //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});
                     if (count > Options.MaxProcessingInstructionCount)
                     {
                         //too many instructions, proceed to cold boot
@@ -206,7 +205,7 @@ namespace Umbraco.Core.Sync
         /// <summary>
         /// Synchronize the server (throttled).
         /// </summary>
-        protected internal void Sync()
+        protected void Sync()
         {
             lock (_locko)
             {

src/Umbraco.Core/Sync/RefreshInstruction.cs

@@ -18,10 +18,7 @@ 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(...)
@@ -33,16 +30,12 @@ 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)
@@ -57,21 +50,9 @@ namespace Umbraco.Core.Sync
             IntId = intId;
         }
 
-        /// <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)
+        private RefreshInstruction(ICacheRefresher refresher, RefreshMethodType refreshType, string json)
             : this(refresher, refreshType)
         {
-            JsonIdCount = idCount;
-
             if (refreshType == RefreshMethodType.RefreshByJson)
                 JsonPayload = json;
             else
@@ -96,12 +77,8 @@ 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
-                        var intIds = ids.Cast<int>().ToArray();
-                        return new[] { new RefreshInstruction(refresher, RefreshMethodType.RefreshByIds, JsonConvert.SerializeObject(intIds), intIds.Length) };
-                    }
+                    if (idType == typeof (int)) // bulk of ints is supported
+                        return new[] { new RefreshInstruction(refresher, RefreshMethodType.RefreshByIds, JsonConvert.SerializeObject(ids.Cast<int>().ToArray())) };
                     // else must be guids, bulk of guids is not supported, iterate
                     return ids.Select(x => new RefreshInstruction(refresher, RefreshMethodType.RefreshByGuid, (Guid) x));
 
@@ -144,14 +121,6 @@ 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

@@ -117,6 +117,8 @@ namespace Umbraco.Core
                 {
                     case UmbracoObjectTypes.Document:
                         return Document;
+                    case UmbracoObjectTypes.DocumentBlueprint:
+                        return DocumentBluePrint;
                     case UmbracoObjectTypes.Media:
                         return Media;
                     case UmbracoObjectTypes.Member:
@@ -161,6 +163,8 @@ namespace Umbraco.Core
                 {
                     case Document:
                         return UmbracoObjectTypes.Document;
+                    case DocumentBluePrint:
+                        return UmbracoObjectTypes.DocumentBlueprint;
                     case Media:
                         return UmbracoObjectTypes.Media;
                     case Member:

src/Umbraco.Core/Umbraco.Core.csproj

@@ -39,18 +39,18 @@
   <ItemGroup>
     <Reference Include="AutoMapper, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="AutoMapper.Net4, Version=3.3.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
-      <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.6\lib\net45\ClientDependency.Core.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
-      <Private>True</Private>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
     <Reference Include="ImageProcessor, Version=2.5.6.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\ImageProcessor.2.5.6\lib\net45\ImageProcessor.dll</HintPath>
@@ -63,11 +63,9 @@
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.AspNet.Identity.Owin, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.3.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -83,17 +81,16 @@
     </Reference>
     <Reference Include="MiniProfiler, Version=2.1.0.0, Culture=neutral, PublicKeyToken=b44f9351044011a3, processorArchitecture=MSIL">
       <HintPath>..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Semver, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\semver.1.1.2\lib\net45\Semver.dll</HintPath>
@@ -105,16 +102,12 @@
     <Reference Include="System.Data.Entity" />
     <Reference Include="System.Data.SqlServerCe, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Data.SqlServerCe.Entity, Version=4.0.0.1, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\packages\SqlServerCE.4.0.0.1\lib\System.Data.SqlServerCe.Entity.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Linq.Expressions" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
@@ -246,7 +239,6 @@
     <Compile Include="Configuration\UmbracoConfigurationSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\AppCodeFileExtensionsCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\AppCodeFileExtensionsElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\BackOfficeElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\CharCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\CharElement.cs" />
     <Compile Include="Configuration\CommaDelimitedConfigurationElement.cs" />
@@ -255,7 +247,6 @@
     <Compile Include="Configuration\UmbracoSettings\ContentErrorPageElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentErrorsElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentSectionExtensions.cs" />
-    <Compile Include="Configuration\UmbracoSettings\IBackOfficeSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillPropertiesCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ImagingAutoFillUploadFieldElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
@@ -291,7 +282,6 @@
     <Compile Include="Configuration\UmbracoSettings\ISecuritySection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IServer.cs" />
     <Compile Include="Configuration\UmbracoSettings\ITemplatesSection.cs" />
-    <Compile Include="Configuration\UmbracoSettings\ITourSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IUmbracoSettingsSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IViewStateMoverModuleSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IWebRoutingSection.cs" />
@@ -322,7 +312,6 @@
     <Compile Include="Configuration\UmbracoSettings\ServerCollection.cs" />
     <Compile Include="Configuration\UmbracoSettings\ServerElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\TemplatesElement.cs" />
-    <Compile Include="Configuration\UmbracoSettings\TourConfigElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\UmbracoConfigurationElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\UmbracoSettingsSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\UrlReplacingElement.cs" />
@@ -368,9 +357,9 @@
     <Compile Include="HashGenerator.cs" />
     <Compile Include="IEmailSender.cs" />
     <Compile Include="IHttpContextAccessor.cs" />
+    <Compile Include="Logging\RollingFileCleanupAppender.cs" />
     <Compile Include="Models\EntityBase\EntityPath.cs" />
     <Compile Include="Models\EntityBase\IDeletableEntity.cs" />
-    <Compile Include="Models\IAuditItem.cs" />
     <Compile Include="Models\IUserControl.cs" />
     <Compile Include="Models\Membership\ContentPermissionSet.cs" />
     <Compile Include="Models\Membership\EntityPermissionCollection.cs" />
@@ -382,8 +371,6 @@
     <Compile Include="Models\Membership\UserState.cs" />
     <Compile Include="Models\Membership\UserType.cs" />
     <Compile Include="Models\PublishedContent\PublishedContentTypeConverter.cs" />
-    <Compile Include="Models\Rdbms\MediaDto.cs" />
-    <Compile Include="Models\Rdbms\UserLoginDto.cs" />
     <Compile Include="Models\Rdbms\UserStartNodeDto.cs" />
     <Compile Include="Models\UserControl.cs" />
     <Compile Include="OrderedHashSet.cs" />
@@ -545,18 +532,12 @@
     <Compile Include="Persistence\LockedRepository.cs" />
     <Compile Include="Persistence\LockingRepository.cs" />
     <Compile Include="Persistence\Mappers\AccessMapper.cs" />
-    <Compile Include="Persistence\Mappers\AuditMapper.cs" />
     <Compile Include="Persistence\Mappers\DomainMapper.cs" />
     <Compile Include="Persistence\Mappers\ExternalLoginMapper.cs" />
     <Compile Include="Persistence\Mappers\MigrationEntryMapper.cs" />
     <Compile Include="Persistence\Mappers\UserGroupMapper.cs" />
     <Compile Include="Persistence\Migrations\LocalMigrationContext.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionFourOneZero\AddPreviewXmlTable.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddTourDataUserColumn.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddIndexToPropertyTypeAliasColumn.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddInstructionCountColumn.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddCmsMediaTable.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenEightZero\AddUserLoginTable.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenSevenZero\AddIndexToDictionaryKeyColumn.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenSevenZero\EnsureContentTemplatePermissions.cs" />
     <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenSevenZero\ReduceDictionaryKeyColumnsSize.cs" />
@@ -704,13 +685,11 @@
     <Compile Include="Security\IBackOfficeUserPasswordChecker.cs" />
     <Compile Include="Security\IMembershipProviderPasswordHasher.cs" />
     <Compile Include="Security\IUserAwarePasswordHasher.cs" />
-    <Compile Include="Security\IUserSessionStore.cs" />
     <Compile Include="Security\MachineKeyGenerator.cs" />
     <Compile Include="Security\MembershipProviderPasswordHasher.cs" />
     <Compile Include="Security\EmailService.cs" />
     <Compile Include="Security\MembershipProviderPasswordValidator.cs" />
     <Compile Include="Security\OwinExtensions.cs" />
-    <Compile Include="Security\SessionIdValidator.cs" />
     <Compile Include="Security\UmbracoEmailMessage.cs" />
     <Compile Include="Security\UserAwareMembershipProviderPasswordHasher.cs" />
     <Compile Include="SemVersionExtensions.cs" />
@@ -1552,6 +1531,7 @@
     <Compile Include="ReadLock.cs" />
     <Compile Include="TypeFinder.cs" />
     <Compile Include="TypeHelper.cs" />
+    <Compile Include="Collections\CompositeTypeTypeKey.cs" />
     <Compile Include="Udi.cs" />
     <Compile Include="UdiDefinitionAttribute.cs" />
     <Compile Include="UdiEntityType.cs" />

src/Umbraco.Core/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.6" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
   <package id="ImageProcessor" version="2.5.6" targetFramework="net45" />
   <package id="log4net" version="2.0.8" targetFramework="net45" />
@@ -17,5 +17,6 @@
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net45" />
   <package id="Owin" version="1.0" targetFramework="net45" />
   <package id="semver" version="1.1.2" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
 </packages>

src/Umbraco.Tests.Benchmarks/BulkInsertBenchmarks.cs

@@ -3,43 +3,24 @@ using System.Collections.Generic;
 using System.Data.SqlServerCe;
 using System.IO;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnostics.Windows;
-using BenchmarkDotNet.Jobs;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Migrations.Initial;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Tests.Benchmarks.Config;
 using Umbraco.Tests.TestHelpers;
 using ILogger = Umbraco.Core.Logging.ILogger;
 
 namespace Umbraco.Tests.Benchmarks
 {
-    [Config(typeof(Config))]
+    [QuickRunWithMemoryDiagnoserConfig]
     public class BulkInsertBenchmarks
     {
-        private class Config : ManualConfig
-        {
-            public Config()
-            {
-                Add(new MemoryDiagnoser());
-                //Add(ExecutionValidator.FailOnError);
-
-                //The 'quick and dirty' settings, so it runs a little quicker
-                // see benchmarkdotnet FAQ
-                Add(Job.Default
-                    .WithLaunchCount(1) // benchmark process will be launched only once
-                    .WithIterationTime(100) // 100ms per iteration
-                    .WithWarmupCount(3) // 3 warmup iteration
-                    .WithTargetCount(3)); // 3 target iteration                
-            }
-        }
-
         private static byte[] _initDbBytes = null;
 
-        [Setup]
+        [GlobalSetup]
         public void Setup()
         {
             var logger = new DebugDiagnosticsLogger();
@@ -51,8 +32,8 @@ namespace Umbraco.Tests.Benchmarks
             SetupSqlCe(path, logger);
             SetupSqlServer(logger);
 
-            
-        }        
+
+        }
 
         private void SetupSqlServer(ILogger logger)
         {
@@ -75,7 +56,7 @@ namespace Umbraco.Tests.Benchmarks
 	[lastNotifiedDate] [datetime] NOT NULL,
 	[isActive] [bit] NOT NULL,
 	[isMaster] [bit] NOT NULL,
- CONSTRAINT [PK_umbracoServer] PRIMARY KEY CLUSTERED 
+ CONSTRAINT [PK_umbracoServer] PRIMARY KEY CLUSTERED
 (
 	[id] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
@@ -87,7 +68,7 @@ namespace Umbraco.Tests.Benchmarks
             var dbName = string.Concat("Umb", Guid.NewGuid(), ".sdf");
             AppDomain.CurrentDomain.SetData("DataDirectory", path);
             var sqlCeConnectionString = $"Datasource=|DataDirectory|\\{dbName};Flush Interval=1;";
-            
+
             _dbFile = Path.Combine(path, dbName);
 
             //only create the db one time
@@ -107,12 +88,12 @@ namespace Umbraco.Tests.Benchmarks
                     var creation = new DatabaseSchemaCreation(_dbSqlCe, logger, _sqlCeSyntax);
                     creation.InitializeDatabaseSchema();
                 }
-                _initDbBytes = File.ReadAllBytes(_dbFile);            
+                _initDbBytes = File.ReadAllBytes(_dbFile);
             }
             else
             {
                 File.WriteAllBytes(_dbFile, _initDbBytes);
-            }            
+            }
 
             //create the db
             _dbSqlCe = new UmbracoDatabase(
@@ -138,7 +119,7 @@ namespace Umbraco.Tests.Benchmarks
             return data;
         }
 
-        [Cleanup]
+        [GlobalCleanup]
         public void Cleanup()
         {
             _dbSqlCe.Dispose();