Testing the arrows for expanding and collapsing a tree

2018-08-21 16:38:12 +02:00
284 changed files with 3914 additions and 5588 deletions
@@ -1,66 +0,0 @@
---
-name: 🐛 Bug Report
-about: File a bug report, if you've discovered a problem in Umbraco.
---
-
-A brief description of the issue goes here.
-
-<!--
-
-If you haven't yet done so, please read the "contributing guidelines"
-thoroughly. Then, proceed by filling out the rest of the details in the issue
-template below. The more details you can give us, the easier it will be for us
-to determine the cause of a problem.
-
-See: https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md
-
-->
-
-
-
-Reproduction
------------
-
-If you're filing a bug, please describe how to reproduce it. Include as much
-relevant information as possible, such as:
-
-### Bug summary
-
-<!--
-    * Write a short summary of the bug
-    * Try to pinpoint it as much as possible
-    * Try to state the _actual problem_, and not just what you _think_ the
-      solution might be.
-->
-
-### Specifics
-
-<!--
-    * Mention the URL where this bug occurs, if applicable
-    * What version of Umbraco are you using (down to the very last digit!)
-    * What browser and version you are using
-    * Please mention if you've checked it in other browsers as well
-    * Please include *full error messages* and *screenshots* if possible
-->
-
-### Steps to reproduce
-
-<!--
-    * Clearly mention the steps to reproduce the bug
-->
-
-### Expected result
-
-<!--
-    * What did you _expect_ that would happen on your Umbraco site?
-    * Describe the intended/desired outcome after you did the steps mentioned.
-->
-
-### Actual result
-
-<!--
-    * What is the actual result of the above steps?
-    * Describe the behaviour of the bug
-    * Please, please include **error messages** and screenshots. They might mean
-      nothing to you, but they are _very_ helpful to us.
-->
@@ -1,31 +0,0 @@
---
-name:  📮 Feature Request
-about: Open a feature request, if you want to propose a new feature.
---
-
-A brief description of your feature request goes here.
-
-
-<!--
-If you want to discuss the feature you're imagining, please make sure to keep
-those discussions on the forum at https://our.umbraco.com/ (choose the
-category "Contributing to Umbraco", Umbraco HQ follows all new topics there).
-
-Once you've come to a conclusion in the discussion, feel free to propose the
-new feature here. 
-->
-
-How can you help?
-------------------------------
-
-<!--
-The resources (read: available time and effort) of Umbraco's core team are
-limited.
-
-If we can not work on your suggestion, please don't take it personally. Most
-likely, it's either:
-
- - We think your idea is valid, but we can't find the time to work on it.
- - Your idea might be better suited as a package, if it's not suitable for
-   the majority of users.
-->
@@ -1,9 +0,0 @@
---
-name: ⁉️ Support Question
-about: Having trouble with Umbraco? -> https://our.umbraco.com
---
-
-This issue tracker is NOT meant for support questions. If you have a question,
-please join us on the forum at https://our.umbraco.com.
-
-Thanks!
@@ -1,9 +0,0 @@
---
-name: 📖 Documentation Issue
-about: See https://github.com/umbraco/UmbracoDocs/issues for documentation issues
---
-
-The Umbraco documentation has its own dedicated repository. Please open your
-documentation-related issue at https://github.com/umbraco/UmbracoDocs/issues
-
-Thanks!
@@ -1,31 +0,0 @@
---
-name: 🔐 Security Issue
-about: Discovered a Security Issue in Umbraco?
---
-
-⚠️ PLEASE DON'T DISCLOSE SECURITY-RELATED ISSUES PUBLICLY, SEE BELOW.
-
-If you have found a security issue in Umbraco, please send the details to
-security@umbraco.com and don't disclose it publicly until we can provide a fix for
-it. If you wish, we'll credit you for finding verified issues, when we release
-the patched version.
-
-❗ Please read more about how to report security issues on https://umbraco.com/security
-
-A note on "Self XSS"
--------------------
-
-Umbraco is a CMS, that allows users to edit content on a website. As such,
-all _authenticated users_ can:
-
- - Edit content, and (depending on the field types) insert HTML and CSS in that
-   content, with a variety of allowed attributes.
- - Depending on the user level: Edit template files, and insert C#, HTML, CSS and
-   javascript in so on.
- - Upload files to the site, which will become publicly available.
-
-We see these functionalities as _features_, and not as security issues. Please
-report the mentioned items only if they can be performed by non-authorized
-users, or other exploitable vulnerabilities.
-
-Thanks!
@@ -1,11 +0,0 @@
-### Prerequisites
-
- [ ] I have [created an issue](https://github.com/umbraco/Umbraco-CMS/issues) for the proposed changes in this PR, the link is:
- [ ] I have added steps to test this contribution in the description below
-
-### Description
-<!-- A description of the changes proposed in the pull-request -->
-<!-- Make sure to link to the related issue number so we can easily find it in the issue tracker -->
-
-
-<!-- Thanks for contributing to Umbraco CMS! -->
@@ -1,6 +1,6 @@
 # The MIT License (MIT) #

-Copyright (c) 2013-present Umbraco
+Copyright (c) 2013 Umbraco

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

@@ -8,7 +8,7 @@
  <meta name="title" content="{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}">
  <meta name="generator" content="docfx {{_docfxVersion}}">
  {{#_description}}<meta name="description" content="{{_description}}">{{/_description}}
-  <link rel="icon" type="image/png" href="https://our.umbraco.com/assets/images/app-icons/favicon.png">
+  <link rel="icon" type="image/png" href="https://our.umbraco.org/assets/images/app-icons/favicon.png">
  <link rel="stylesheet" href="{{_rel}}styles/docfx.vendor.css">
  <link rel="stylesheet" href="{{_rel}}styles/docfx.css">
  <link rel="stylesheet" href="{{_rel}}styles/main.css">
@@ -63,7 +63,7 @@ a:focus {
 }

 .navbar-header .navbar-brand {
-    background: url(https://our.umbraco.com/assets/images/logo.svg) left center no-repeat;
+    background: url(https://our.umbraco.org/assets/images/logo.svg) left center no-repeat;
    background-size: 40px auto;
    width:50px;
 }
@@ -94,14 +94,14 @@ function Get-UmbracoBuildEnv
  }
  
  # ensure we have node
-  $node = "$path\node-v8.12.0-win-x86"
-  $source = "http://nodejs.org/dist/v8.12.0/node-v8.12.0-win-x86.7z "
+  $node = "$path\node-v6.9.1-win-x86"
+  $source = "http://nodejs.org/dist/v6.9.1/node-v6.9.1-win-x86.7z"
  if (-not (test-path $node))
  {
    Write-Host "Download Node..."
-    Invoke-WebRequest $source -OutFile "$path\node-v8.12.0-win-x86.7z"
-    &$sevenZip x "$path\node-v8.12.0-win-x86.7z" -o"$path" -aos > $nul
-    Remove-File "$path\node-v8.12.0-win-x86.7z"    
+    Invoke-WebRequest $source -OutFile "$path\node-v6.9.1-win-x86.7z"
+    &$sevenZip x "$path\node-v6.9.1-win-x86.7z" -o"$path" -aos > $nul
+    Remove-File "$path\node-v6.9.1-win-x86.7z"    
  }
  
  # note: why? node already brings everything we need!
@@ -28,7 +28,7 @@
      <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="MySql.Data" version="[6.9.9, 7.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.7, 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)" />
@@ -20,7 +20,6 @@
      <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)" />
-      <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.0, 3.0.0)" />
    </dependencies>
  </metadata>
  <files>
@@ -21,6 +21,6 @@ The following items will now be automatically included when creating a deploy pa
 system: umbraco, umbraco_client, config\splashes and global.asax.

 Please read the release notes on our.umbraco.com:
-https://our.umbraco.com/download/releases
+http://our.umbraco.com/contribute/releases

- Umbraco
+- Umbraco
@@ -17,7 +17,7 @@ Assume positive intent and try to understand before being understood.

 Treat others as you would like to be treated.

-This also goes for treating the HQ with respect. For example: don’t promote products on [our.umbraco.com](https://our.umbraco.com) that directly compete with our commercial offerings which enables us to work for a sustainable Umbraco.
+This also goes for treating the HQ with respect. For example: don’t promote products on [our.umbraco.org](https://our.umbraco.org) that directly compete with our commercial offerings which enables us to work for a sustainable Umbraco.

 ## Open

@@ -82,7 +82,7 @@ These wonderful volunteers will provide you with a first reply to your PR, revie
 You can get in touch with [the PR team](#the-pr-team) in multiple ways, we love open conversations and we are a friendly bunch. No question you have is stupid. Any questions you have usually helps out multiple people with the same question. Ask away:

 - If there's an existing issue on the issue tracker then that's a good place to leave questions and discuss how to start or move forward
- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.com/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
+- Unsure where to start? Did something not work as expected? Try leaving a note in the ["Contributing to Umbraco"](https://our.umbraco.org/forum/contributing-to-umbraco-cms/) forum, the team monitors that one closely
 - We're also [active in the Gitter chatroom](https://gitter.im/umbraco/Umbraco-CMS)

 ## Code of Conduct
@@ -31,7 +31,7 @@ Before creating bug reports, please check [this list](#before-submitting-a-bug-r

 ##### Before Submitting A Bug Report

-  * Most importantly, check **if you can reproduce the problem** in the [latest version of Umbraco](https://our.umbraco.com/download/). We might have already fixed your particular problem.
+  * Most importantly, check **if you can reproduce the problem** in the [latest version of Umbraco](https://our.umbraco.org/download/). We might have already fixed your particular problem.
  * It also helps tremendously to check if the issue you're experiencing is present in **a clean install** of the Umbraco version you're currently using. Custom code can have side-effects that don't occur in a clean install.
  * **Use the Google**. Whatever you're experiencing, Google it plus "Umbraco" - usually you can get some pretty good hints from the search results, including open issues and further troubleshooting hints.
  * If you do find and existing issue has **and the issue is still open**, add a comment to the existing issue if you have additional information. If you have the same problem and no new info to add, just "star" the issue.
@@ -65,7 +65,7 @@ Most of the suggestions in the [reporting bugs](#reporting-bugs) section also co
 Some additional hints that may be helpful:

  * **Include screenshots and animated GIFs** which help you demonstrate the steps or point out the part of Umbraco which the suggestion is related to.
-  * **Explain why this enhancement would be useful to most Umbraco users** and isn't something that can or should be implemented as a [community package](https://our.umbraco.com/projects/).
+  * **Explain why this enhancement would be useful to most Umbraco users** and isn't something that can or should be implemented as a [community package](https://our.umbraco.org/projects/).

 ### Your First Code Contribution

@@ -80,7 +80,7 @@ The most successful pull requests usually look a like this:
  * Fill in the required template
  * Include screenshots and animated GIFs in your pull request whenever possible.
  * Unit tests, while optional are awesome, thank you!
-  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.com/documentation/Reference/) is generated
+  * New code is commented with documentation from which [the reference documentation](https://our.umbraco.org/documentation/Reference/) is generated

 Again, these are guidelines, not strict requirements. 

@@ -116,8 +116,8 @@ There's two big areas that you should know about:

 To find the general areas of something you're looking to fix or improve, have a look at the following two parts of the API documentation.

-  * [The AngularJS based backoffice files](https://our.umbraco.com/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
-  * [The rest](https://our.umbraco.com/apidocs/csharp/)
+  * [The AngularJS based backoffice files](https://our.umbraco.org/apidocs/ui/#/api) (to be found  in `src\Umbraco.Web.UI.Client\src`)
+  * [The rest](https://our.umbraco.org/apidocs/csharp/)

 ### What branch should I target for my contributions?

@@ -129,7 +129,7 @@ We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-fl

 The easiest way to get started is to run `build.bat` which will build both the backoffice (also known as "Belle") and the Umbraco core. You can then easily start debugging from Visual Studio, or if you need to debug Belle you can run `gulp dev` in `src\Umbraco.Web.UI.Client`. See [this page](BUILD.md) for more details.

-Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 (version 15.3 or higher, [the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.
+Alternatively, you can open `src\umbraco.sln` in Visual Studio 2017 ([the community edition is free](https://www.visualstudio.com/thank-you-downloading-visual-studio/?sku=Community&rel=15) for you to use to contribute to Open Source projects). In Visual Studio, find the Task Runner Explorer (in the View menu under Other Windows) and run the build task under the gulpfile.

 ![Gulp build in Visual Studio](img/gulpbuild.png)

@@ -156,4 +156,4 @@ git rebase upstream/dev-v7

 In this command we're syncing with the `dev-v7` branch, but you can of course choose another one if needed.

-(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
+(More info on how this works: [http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated](http://robots.thoughtbot.com/post/5133345960/keeping-a-git-fork-updated))
@@ -0,0 +1,11 @@
+### Prerequisites
+
+- [ ] I have written a descriptive pull-request title
+- [ ] I have linked this PR to an issue on the tracker at http://issues.umbraco.org
+
+### Description
+<!-- A description of the changes proposed in the pull-request -->
+
+
+
+<!-- Thanks for contributing to Umbraco CMS! -->
@@ -44,7 +44,6 @@ Umbraco is contribution focused and community driven. If you want to contribute

 ## Found a bug?

-Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/.github/CONTRIBUTING.md).
+Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](https://github.com/umbraco/Umbraco-CMS/blob/dev-v7/docs/CONTRIBUTING.md).

-You can comment and report issues on the [github issue tracker](https://github.com/umbraco/Umbraco-CMS/issues).
-Since [September 2018](https://umbraco.com/blog/a-second-take-on-umbraco-issue-tracker-hello-github-issues/) the old issue tracker is in read only mode, but can still be found at [http://issues.umbraco.org](http://issues.umbraco.org).
+To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).
@@ -2,7 +2,7 @@
 using System.Resources;

 [assembly: AssemblyCompany("Umbraco")]
-[assembly: AssemblyCopyright("Copyright © Umbraco 2018")]
+[assembly: AssemblyCopyright("Copyright © Umbraco 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -11,5 +11,5 @@ using System.Resources;

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

-[assembly: AssemblyFileVersion("7.13.0")]
-[assembly: AssemblyInformationalVersion("7.13.0")]
+[assembly: AssemblyFileVersion("7.12.1")]
+[assembly: AssemblyInformationalVersion("7.12.1")]
@@ -1,8 +1,8 @@
-using Semver;
-using System;
-using System.Collections.Concurrent;
+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;
@@ -13,7 +13,7 @@ using Umbraco.Core.Sync;

 namespace Umbraco.Core
 {
-    /// <summary>
+	/// <summary>
    /// the Umbraco Application context
    /// </summary>
    /// <remarks>
@@ -270,7 +270,7 @@ namespace Umbraco.Core
                return _umbracoApplicationUrl;
            }
        }
-
+
        /// <summary>
        /// Resets the url.
        /// </summary>
@@ -280,10 +280,10 @@ namespace Umbraco.Core
        }

 	    // ReSharper disable once InconsistentNaming
-	    internal string _umbracoApplicationUrl;
-
-        internal ConcurrentDictionary<string, string> _umbracoApplicationDomains = new ConcurrentDictionary<string, string>();
-
+	    internal string _umbracoApplicationUrl;
+
+        internal List<string> _umbracoApplicationDomains = new List<string>();
+
        internal string _umbracoApplicationDeploymentId;

        private Lazy<bool> _configured;
@@ -399,7 +399,7 @@ namespace Umbraco.Core
            }

            return version;
-        }
+        }

        private void AssertIsNotReady()
        {
@@ -13,7 +13,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        IEnumerable<string> ImageTagAllowedAttributes { get; }

        IEnumerable<IImagingAutoFillUploadField> ImageAutoFillProperties { get; }
-        
+
        string ScriptFolderPath { get; }

        IEnumerable<string> ScriptFileTypes { get; }
@@ -8,8 +8,6 @@

        bool DisableAlternativeTemplates { get; }

-        bool ValidateAlternativeTemplates { get; }
-        
        bool DisableFindContentByIdPath { get; }
 		
        bool DisableRedirectUrlTracking { get; }
@@ -1,5 +1,4 @@
-using System;
-using System.Configuration;
+using System.Configuration;

 namespace Umbraco.Core.Configuration.UmbracoSettings
 {
@@ -22,13 +21,6 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
        {
            get { return (bool) base["disableAlternativeTemplates"]; }
        }
-
-        [ConfigurationProperty("validateAlternativeTemplates", DefaultValue = "false")]
-        public bool ValidateAlternativeTemplates
-        {
-            get { return (bool)base["validateAlternativeTemplates"]; }
-        }
-
        [ConfigurationProperty("disableFindContentByIdPath", DefaultValue = "false")]
        public bool DisableFindContentByIdPath
        {
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
    public class UmbracoVersion
    {
-        private static readonly Version Version = new Version("7.13.0");
+        private static readonly Version Version = new Version("7.12.1");

        /// <summary>
        /// Gets the current version of Umbraco.
@@ -110,11 +110,6 @@ namespace Umbraco.Core
 				/// Property alias for the Media's file extension.
 				/// </summary>
 				public const string Extension = "umbracoExtension";
-
-				/// <summary>
-				/// The default height/width of an image file if the size can't be determined from the metadata
-				/// </summary>
-				public const int DefaultSize = 200;
 			}

 			/// <summary>
@@ -359,4 +354,4 @@ namespace Umbraco.Core
            }
 		}
 	}
-}
+}
@@ -61,7 +61,6 @@
            public const int DefaultContentListViewDataTypeId = -95;
            public const int DefaultMediaListViewDataTypeId = -96;
            public const int DefaultMembersListViewDataTypeId = -97;
-            public const int DefaultLabelDataTypeId = -92;

            public const string UmbracoConnectionName = "umbracoDbDSN";
            public const string UmbracoMigrationName = "Umbraco";
@@ -17,15 +17,15 @@ using Umbraco.Core.Models;

 namespace Umbraco.Core.IO
 {
-    /// <summary>
-    /// A custom file system provider for media
-    /// </summary>
-    [FileSystemProvider("media")]
-    public class MediaFileSystem : FileSystemWrapper
-    {
-        private readonly IContentSection _contentConfig;
+	/// <summary>
+	/// A custom file system provider for media
+	/// </summary>
+	[FileSystemProvider("media")]
+	public class MediaFileSystem : FileSystemWrapper
+	{
+	    private readonly IContentSection _contentConfig;
        private readonly UploadAutoFillProperties _uploadAutoFillProperties;
-        private readonly ILogger _logger;
+	    private readonly ILogger _logger;

        private readonly object _folderCounterLock = new object();
        private long _folderCounter;
@@ -39,8 +39,8 @@ namespace Umbraco.Core.IO
        };

        public MediaFileSystem(IFileSystem wrapped)
-            : this(wrapped, UmbracoConfig.For.UmbracoSettings().Content, ApplicationContext.Current.ProfilingLogger.Logger)
-        { }
+			: this(wrapped, UmbracoConfig.For.UmbracoSettings().Content, ApplicationContext.Current.ProfilingLogger.Logger)
+		{ }

        public MediaFileSystem(IFileSystem wrapped, IContentSection contentConfig, ILogger logger)
            : base(wrapped)
@@ -60,13 +60,13 @@ namespace Umbraco.Core.IO

        [Obsolete("This low-level method should NOT exist.")]
        public string GetRelativePath(int propertyId, string fileName)
-        {
+		{
            var sep = _contentConfig.UploadAllowDirectories
-                ? Path.DirectorySeparatorChar
-                : '-';
+				? Path.DirectorySeparatorChar
+				: '-';

-            return propertyId.ToString(CultureInfo.InvariantCulture) + sep + fileName;
-        }
+			return propertyId.ToString(CultureInfo.InvariantCulture) + sep + fileName;
+		}

        [Obsolete("This low-level method should NOT exist.", false)]
        public string GetRelativePath(string subfolder, string fileName)
@@ -264,7 +264,7 @@ namespace Umbraco.Core.IO
            var filename = Path.GetFileName(sourcepath);
            var filepath = GetMediaPath(filename, content.Key, propertyType.Key);
            this.CopyFile(sourcepath, filepath);
-
+            
            return filepath;
        }

@@ -321,7 +321,7 @@ namespace Umbraco.Core.IO
        /// <param name="filepath"></param>
        /// <param name="filestream"></param>
        private void SetUploadFile(IContentBase content, Property property, string filepath, Stream filestream)
-        {
+        {            
            // will use filepath for extension, and filestream for length
            _uploadAutoFillProperties.Populate(content, property.Alias, filepath, filestream);
        }
@@ -368,20 +368,19 @@ namespace Umbraco.Core.IO
                        return new Size(width, height);
                    }
                }
-
-                //we have no choice but to try to read in via GDI
-                using (var image = Image.FromStream(stream))
-                {
-
-                    var fileWidth = image.Width;
-                    var fileHeight = image.Height;
-                    return new Size(fileWidth, fileHeight);
-                }
            }
            catch (Exception)
            {
                //We will just swallow, just means we can't read exif data, we don't want to log an error either
-                return new Size(Constants.Conventions.Media.DefaultSize, Constants.Conventions.Media.DefaultSize);
+            }
+
+            //we have no choice but to try to read in via GDI
+            using (var image = Image.FromStream(stream))
+            {
+
+                var fileWidth = image.Width;
+                var fileHeight = image.Height;
+                return new Size(fileWidth, fileHeight);
            }
        }

@@ -431,8 +430,8 @@ namespace Umbraco.Core.IO
            }
        }

-        public void DeleteMediaFiles(IEnumerable<string> files)
-        {
+	    public void DeleteMediaFiles(IEnumerable<string> files)
+	    {
            files = files.Distinct();

            Parallel.ForEach(files, file =>
@@ -37,7 +37,6 @@ namespace Umbraco.Core.IO
            }
        }

-        [Obsolete("This file is no longer used and should not be accessed!")]
        public static string MetablogConfig
        {
            get
@@ -2,7 +2,6 @@
 using System.Drawing;
 using System.IO;
 using System.Text;
-using Umbraco.Core.Media.TypeDetector;

 namespace Umbraco.Core.Media.Exif
 {
@@ -119,25 +118,22 @@ namespace Umbraco.Core.Media.Exif
 		/// <returns>The <see cref="ImageFile"/> created from the file.</returns>
        public static ImageFile FromStream(Stream stream, Encoding encoding)
 		{
-            // JPEG
-            if(JPEGDetector.IsOfType(stream))
-            {
-                return new JPEGFile(stream, encoding);
-            }
-
-            // TIFF
-            if (TIFFDetector.IsOfType(stream))
-            {
-                return new TIFFFile(stream, encoding);
-            }
-
-            // SVG
-            if (SVGDetector.IsOfType(stream))
-            {
-                return new SVGFile(stream);
-            }
-
-            throw new NotValidImageFileException ();
+			stream.Seek (0, SeekOrigin.Begin);
+			byte[] header = new byte[8];
+			stream.Seek (0, SeekOrigin.Begin);
+			if (stream.Read (header, 0, header.Length) != header.Length)
+				throw new NotValidImageFileException ();
+			
+			// JPEG
+			if (header[0] == 0xFF && header[1] == 0xD8)
+				return new JPEGFile (stream, encoding);
+			
+			// TIFF
+			string tiffHeader = Encoding.ASCII.GetString (header, 0, 4);
+			if (tiffHeader == "MM\x00\x2a" || tiffHeader == "II\x2a\x00")
+				return new TIFFFile (stream, encoding);
+			
+			throw new NotValidImageFileException ();
 		}
 		#endregion
 	}
@@ -17,9 +17,5 @@
        /// The file is a TIFF File.
        /// </summary>
        TIFF,
-        /// <summary>
-        /// The file is a SVG File.
-        /// </summary>
-        SVG,
    }
 }
@@ -1,37 +0,0 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Media.Exif
-{
-    internal class SVGFile : ImageFile
-    {
-        public SVGFile(Stream fileStream)
-        {
-            fileStream.Position = 0;
-
-            var document = XDocument.Load(fileStream); //if it throws an exception the ugly try catch in MediaFileSystem will catch it
-
-            var width = document.Root?.Attributes().Where(x => x.Name == "width").Select(x => x.Value).FirstOrDefault();
-            var height = document.Root?.Attributes().Where(x => x.Name == "height").Select(x => x.Value).FirstOrDefault();
-
-            Properties.Add(new ExifSInt(ExifTag.PixelYDimension,
-                height == null ? Constants.Conventions.Media.DefaultSize : int.Parse(height)));
-            Properties.Add(new ExifSInt(ExifTag.PixelXDimension,
-                width == null ? Constants.Conventions.Media.DefaultSize : int.Parse(width)));
-            
-            Format = ImageFileFormat.SVG;
-        }
-
-        public override void Save(Stream stream)
-        {
-        }
-
-        public override Image ToImage()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
@@ -1,14 +0,0 @@
-using System.IO;
-
-namespace Umbraco.Core.Media.TypeDetector
-{
-    public class JPEGDetector : RasterizedTypeDetector
-    {
-        public static bool IsOfType(Stream fileStream)
-        {
-            var header = GetFileHeader(fileStream);
-
-            return header[0] == 0xff && header[1] == 0xD8;
-        }
-    }
-}
@@ -1,16 +0,0 @@
-using System.IO;
-
-namespace Umbraco.Core.Media.TypeDetector
-{
-    public abstract class RasterizedTypeDetector
-    {
-        public static byte[] GetFileHeader(Stream fileStream)
-        {
-            fileStream.Seek(0, SeekOrigin.Begin);
-            byte[] header = new byte[8];
-            fileStream.Seek(0, SeekOrigin.Begin);
-
-            return header;
-        }
-    }
-}
@@ -1,24 +0,0 @@
-using System.IO;
-using System.Xml.Linq;
-
-namespace Umbraco.Core.Media.TypeDetector
-{
-    public class SVGDetector
-    {
-        public static bool IsOfType(Stream fileStream)
-        {
-            var document = new XDocument();
-
-            try
-            {
-                document = XDocument.Load(fileStream);
-            }
-            catch (System.Exception ex)
-            {
-                return false;
-            }
-
-            return document.Root?.Name.LocalName == "svg";
-        }
-    }
-}
@@ -1,24 +0,0 @@
-using System.IO;
-using System.Text;
-
-namespace Umbraco.Core.Media.TypeDetector
-{
-    public class TIFFDetector
-    {
-        public static bool IsOfType(Stream fileStream)
-        {
-            string tiffHeader = GetFileHeader(fileStream);
-
-            return tiffHeader == "MM\x00\x2a" || tiffHeader == "II\x2a\x00";
-        }
-
-        public static string GetFileHeader(Stream fileStream)
-        {
-            var header = RasterizedTypeDetector.GetFileHeader(fileStream);
-
-            string tiffHeader = Encoding.ASCII.GetString(header, 0, 4);
-
-            return tiffHeader;
-        }
-    }
-}
@@ -102,28 +102,6 @@ namespace Umbraco.Core.Models
            }
        }

-        /// <summary>
-        /// Determines if AllowedTemplates contains templateId
-        /// </summary>
-        /// <param name="templateId">The template id to check</param>
-        /// <returns>True if AllowedTemplates contains the templateId else False</returns>
-        public bool IsAllowedTemplate(int templateId)
-        {
-            var allowedTemplates = AllowedTemplates ?? new ITemplate[0];
-            return allowedTemplates.Any(t => t.Id == templateId);
-        }
-
-        /// <summary>
-        /// Determines if AllowedTemplates contains templateId
-        /// </summary>
-        /// <param name="templateAlias">The template alias to check</param>
-        /// <returns>True if AllowedTemplates contains the templateAlias else False</returns>
-        public bool IsAllowedTemplate(string templateAlias)
-        {
-            var allowedTemplates = AllowedTemplates ?? new ITemplate[0];
-            return allowedTemplates.Any(t => t.Alias.Equals(templateAlias, StringComparison.InvariantCultureIgnoreCase));
-        }
-
        /// <summary>
        /// Sets the default template for the ContentType
        /// </summary>
@@ -17,20 +17,6 @@ namespace Umbraco.Core.Models
        /// </summary>
        IEnumerable<ITemplate> AllowedTemplates { get; set; }

-        /// <summary>
-        /// Determines if AllowedTemplates contains templateId
-        /// </summary>
-        /// <param name="templateId">The template id to check</param>
-        /// <returns>True if AllowedTemplates contains the templateId else False</returns>
-        bool IsAllowedTemplate(int templateId);
-
-        /// <summary>
-        /// Determines if AllowedTemplates contains templateId
-        /// </summary>
-        /// <param name="templateAlias">The template alias to check</param>
-        /// <returns>True if AllowedTemplates contains the templateAlias else False</returns>
-        bool IsAllowedTemplate(string templateAlias);
-
        /// <summary>
        /// Sets the default template for the ContentType
        /// </summary>
@@ -259,7 +259,7 @@ namespace Umbraco.Core.Models.Membership
        {
            get
            {
-                if (LastLoginDate == default && IsApproved == false && InvitedDate != null)
+                if (LastLoginDate == default(DateTime) && IsApproved == false && InvitedDate != null)
                    return UserState.Invited;

                if (IsLockedOut)
@@ -267,11 +267,7 @@ namespace Umbraco.Core.Models.Membership
                if (IsApproved == false)
                    return UserState.Disabled;

-                // User is not disabled or locked and has never logged in before
-                if (LastLoginDate == default && IsApproved && IsLockedOut == false)
-                    return UserState.Inactive;
-
-                    return UserState.Active;
+                return UserState.Active;
            }
        }

@@ -9,7 +9,6 @@
        Active = 0,
        Disabled = 1,
        LockedOut = 2,
-        Invited = 3,
-        Inactive = 4
+        Invited = 3
    }
-}
+}
@@ -83,7 +83,7 @@ namespace Umbraco.Core.Models
        /// <summary>
        /// Returns the instance of the tag support, by default tags are not enabled
        /// </summary>
-        public PropertyTags TagSupport
+        internal PropertyTags TagSupport
        {
            get { return _tagSupport; }
        }
@@ -242,4 +242,4 @@ namespace Umbraco.Core.Models
            return clone;
        }
    }
-}
+}
@@ -1,9 +1,9 @@
 namespace Umbraco.Core.Models
 {
-    public enum PropertyTagBehavior
+    internal enum PropertyTagBehavior
    {
        Replace,
        Remove,
        Merge
    }
-}
+}
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Models
    /// <summary>
    /// A property extension class that allows us to enable tags for any given property
    /// </summary>
-    public class PropertyTags
+    internal class PropertyTags
    {
        public PropertyTags()
        {
@@ -33,4 +33,4 @@ namespace Umbraco.Core.Models
        public IEnumerable<Tuple<string, string>> Tags { get; set; }

    }
-}
+}
@@ -6,17 +6,17 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
    {
        public ConstraintDefinition(ConstraintType type)
        {
-            _constraintType = type;
+            constraintType = type;
        }

-        private readonly ConstraintType _constraintType;
-        public bool IsPrimaryKeyConstraint => ConstraintType.PrimaryKey == _constraintType;
-        public bool IsUniqueConstraint => ConstraintType.Unique == _constraintType;
-        public bool IsNonUniqueConstraint => ConstraintType.NonUnique == _constraintType;
+        private ConstraintType constraintType;
+        public bool IsPrimaryKeyConstraint { get { return ConstraintType.PrimaryKey == constraintType; } }
+        public bool IsUniqueConstraint { get { return ConstraintType.Unique == constraintType; } }
+        public bool IsNonUniqueConstraint { get { return ConstraintType.NonUnique == constraintType; } }

        public string SchemaName { get; set; }
        public string ConstraintName { get; set; }
        public string TableName { get; set; }
        public ICollection<string> Columns = new HashSet<string>();
    }
-}
+}
@@ -1,5 +1,3 @@
-using System;
-
 namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
    /// <summary>
@@ -7,17 +5,9 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
    /// </summary>
    internal class DbIndexDefinition
    {
-        public DbIndexDefinition(Tuple<string, string, string, bool> data)
-        {
-            TableName = data.Item1;
-            IndexName = data.Item2;
-            ColumnName = data.Item3;
-            IsUnique = data.Item4;
-        }
-
-        public string IndexName { get; }
-        public string TableName { get; }
-        public string ColumnName { get; }
-        public bool IsUnique { get; }
+        public virtual string IndexName { get; set; }
+        public virtual string TableName { get; set; }
+        public virtual string ColumnName { get; set; }
+        public virtual bool IsUnique { get; set; }
    }
-}
+}
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Rdbms;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
@@ -10,9 +11,6 @@ using Umbraco.Core.Services;
 namespace Umbraco.Core.Persistence
 {

-    /// <summary>
-    /// Helper class for working with databases and schemas.
-    /// </summary>
    public class DatabaseSchemaHelper
    {
        private readonly Database _db;
@@ -20,22 +18,6 @@ namespace Umbraco.Core.Persistence
        private readonly ISqlSyntaxProvider _syntaxProvider;
        private readonly BaseDataCreation _baseDataCreation;

-        /// <summary>
-        /// Intializes a new helper instance.
-        /// </summary>
-        /// <param name="db">The database to be used.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="syntaxProvider">The syntax provider.</param>
-        /// <example>
-        /// A new instance could be initialized like:
-        /// <code>
-        /// var schemaHelper = new DatabaseSchemaHelper(
-        ///     ApplicationContext.Current.DatabaseContext.Database,
-        ///     ApplicationContext.Current.ProfilingLogger.Logger,
-        ///     ApplicationContext.Current.DatabaseContext.SqlSyntax
-        /// );
-        /// </code>
-        /// </example>
        public DatabaseSchemaHelper(Database db, ILogger logger, ISqlSyntaxProvider syntaxProvider)
        {
            _db = db;
@@ -44,41 +26,11 @@ namespace Umbraco.Core.Persistence
            _baseDataCreation = new BaseDataCreation(db, logger);
        }

-        /// <summary>
-        /// Returns whether a table with the specified <paramref name="tableName"/> exists in the database.
-        /// </summary>
-        /// <param name="tableName">The name of the table.</param>
-        /// <returns><c>true</c> if the table exists; otherwise <c>false</c>.</returns>
-        /// <example>
-        /// <code>
-        /// if (schemaHelper.TableExist("MyTable"))
-        /// {
-        ///     // do something when the table exists
-        /// }
-        /// </code>
-        /// </example>
        public bool TableExist(string tableName)
        {
            return _syntaxProvider.DoesTableExist(_db, tableName);
        }

-        /// <summary>
-        /// Returns whether the table for the specified <typeparamref name="T"/> exists in the database.
-        /// 
-        /// If <typeparamref name="T"/> has been decorated with an <see cref="TableNameAttribute"/>, the name from that
-        /// attribute will be used for the table name. If the attribute is not present, the name
-        /// <typeparamref name="T"/> will be used instead.
-        /// </summary>
-        /// <typeparam name="T">The type representing the DTO/table.</typeparam>
-        /// <returns><c>true</c> if the table exists; otherwise <c>false</c>.</returns>
-        /// <example>
-        /// <code>
-        /// if (schemaHelper.TableExist&lt;MyDto&gt;)
-        /// {
-        ///     // do something when the table exists
-        /// }
-        /// </code>
-        /// </example>
        public bool TableExist<T>()
        {
            var poco = Database.PocoData.ForType(typeof(T));
@@ -138,17 +90,6 @@ namespace Umbraco.Core.Persistence
            _logger.Info<Database>("Finalized database schema creation");
        }

-        /// Creates a new table in the database based on the type of <typeparamref name="T"/>.
-        /// 
-        /// If <typeparamref name="T"/> has been decorated with an <see cref="TableNameAttribute"/>, the name from that
-        /// attribute will be used for the table name. If the attribute is not present, the name
-        /// <typeparamref name="T"/> will be used instead.
-        /// 
-        /// If a table with the same name already exists, the <paramref name="overwrite"/> parameter will determine
-        /// whether the table is overwritten. If <c>true</c>, the table will be overwritten, whereas this method will
-        /// not do anything if the parameter is <c>false</c>.
-        /// <typeparam name="T">The type representing the DTO/table.</typeparam>
-        /// <param name="overwrite">Whether the table should be overwritten if it already exists.</param>
        public void CreateTable<T>(bool overwrite)
           where T : new()
        {
@@ -156,16 +97,6 @@ namespace Umbraco.Core.Persistence
            CreateTable(overwrite, tableType);
        }

-        /// <summary>
-        /// Creates a new table in the database based on the type of <typeparamref name="T"/>.
-        /// 
-        /// If <typeparamref name="T"/> has been decorated with an <see cref="TableNameAttribute"/>, the name from that
-        /// attribute will be used for the table name. If the attribute is not present, the name
-        /// <typeparamref name="T"/> will be used instead.
-        /// 
-        /// If a table with the same name already exists, this method will not do anything.
-        /// </summary>
-        /// <typeparam name="T">The type representing the DTO/table.</typeparam>
        public void CreateTable<T>()
          where T : new()
        {
@@ -173,19 +104,6 @@ namespace Umbraco.Core.Persistence
            CreateTable(false, tableType);
        }

-        /// <summary>
-        /// Creates a new table in the database for the specified <paramref name="modelType"/>.
-        /// 
-        /// If <paramref name="modelType"/> has been decorated with an <see cref="TableNameAttribute"/>, the name from
-        /// that  attribute will be used for the table name. If the attribute is not present, the name
-        /// <paramref name="modelType"/> will be used instead.
-        /// 
-        /// If a table with the same name already exists, the <paramref name="overwrite"/> parameter will determine
-        /// whether the table is overwritten. If <c>true</c>, the table will be overwritten, whereas this method will
-        /// not do anything if the parameter is <c>false</c>.
-        /// </summary>
-        /// <param name="overwrite">Whether the table should be overwritten if it already exists.</param>
-        /// <param name="modelType">The the representing the table.</param>
        public void CreateTable(bool overwrite, Type modelType)
        {
            var tableDefinition = DefinitionFactory.GetTableDefinition(_syntaxProvider, modelType);
@@ -199,8 +117,6 @@ namespace Umbraco.Core.Persistence
            var tableExist = TableExist(tableName);
            if (overwrite && tableExist)
            {
-                _logger.Info<Database>(string.Format("Table '{0}' already exists, but will be recreated", tableName));
-
                DropTable(tableName);
                tableExist = false;
            }
@@ -253,37 +169,15 @@ namespace Umbraco.Core.Persistence
                        _logger.Info<Database>(string.Format("Create Foreign Key sql {0}:\n {1}", createdFk, sql));
                    }

+                    
+
                    transaction.Complete();
-                    if (overwrite)
-                    {
-                        _logger.Info<Database>(string.Format("Table '{0}' was recreated", tableName));
-                    }
-                    else
-                    {
-                        _logger.Info<Database>(string.Format("New table '{0}' was created", tableName));
-                    }
                }
            }
-            else
-            {
-                // The table exists and was not recreated/overwritten.
-                _logger.Info<Database>(string.Format("Table '{0}' already exists - no changes were made", tableName));
-            }
+
+            _logger.Info<Database>(string.Format("New table '{0}' was created", tableName));
        }

-        /// <summary>
-        /// Drops the table for the specified <typeparamref name="T"/>.
-        /// 
-        /// If <typeparamref name="T"/> has been decorated with an <see cref="TableNameAttribute"/>, the name from that
-        /// attribute will be used for the table name. If the attribute is not present, the name
-        /// <typeparamref name="T"/> will be used instead.
-        /// </summary>
-        /// <typeparam name="T">The type representing the DTO/table.</typeparam>
-        /// <example>
-        /// <code>
-        /// schemaHelper.DropTable&lt;MyDto&gt;);
-        /// </code>
-        /// </example>
        public void DropTable<T>()
            where T : new()
        {
@@ -299,15 +193,6 @@ namespace Umbraco.Core.Persistence
            DropTable(tableName);
        }

-        /// <summary>
-        /// Drops the table with the specified <paramref name="tableName"/>.
-        /// </summary>
-        /// <param name="tableName">The name of the table.</param>
-        /// <example>
-        /// <code>
-        /// schemaHelper.DropTable("MyTable");
-        /// </code>
-        /// </example>
        public void DropTable(string tableName)
        {
            var sql = new Sql(string.Format(
@@ -30,7 +30,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial

            if(tableName.Equals("umbracoNode"))
            {
-                CreateUmbracoNodeData();
+                CreateUmbracNodeData();
            }

            if (tableName.Equals("umbracoLock"))
@@ -111,7 +111,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            _logger.Info<BaseDataCreation>(string.Format("Done creating data in table {0}", tableName));
        }

-        private void CreateUmbracoNodeData()
+        private void CreateUmbracNodeData()
        {
            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -1, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1", SortOrder = 0, UniqueId = new Guid("916724a5-173d-4619-b97e-b9de133dd6f5"), Text = "SYSTEM DATA: umbraco master root", NodeObjectType = new Guid(Constants.ObjectTypes.SystemRoot), CreateDate = DateTime.Now });
            _database.Insert("umbracoNode", "id", false, new NodeDto { NodeId = -20, Trashed = false, ParentId = -1, UserId = 0, Level = 0, Path = "-1,-20", SortOrder = 0, UniqueId = new Guid("0F582A79-1E41-4CF0-BFA0-76340651891A"), Text = "Recycle Bin", NodeObjectType = new Guid(Constants.ObjectTypes.ContentRecycleBin), CreateDate = DateTime.Now });
@@ -159,7 +159,13 @@ namespace Umbraco.Core.Persistence.Migrations.Initial

            //get the db index defs
            result.DbIndexDefinitions = _sqlSyntaxProvider.GetDefinedIndexes(_database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();

            foreach (var item in OrderedTables.OrderBy(x => x.Key))
            {
@@ -178,14 +184,6 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            return result;
        }

-        /// <summary>
-        /// This validates the Primary/Foreign keys in the database
-        /// </summary>
-        /// <param name="result"></param>
-        /// <remarks>
-        /// This does not validate any database constraints that are not PKs or FKs because Umbraco does not create a database with non PK/FK contraints.
-        /// Any unique "constraints" in the database are done with unique indexes.
-        /// </remarks>
        private void ValidateDbConstraints(DatabaseSchemaResult result)
        {
            //MySql doesn't conform to the "normal" naming of constraints, so there is currently no point in doing these checks.
@@ -198,7 +196,8 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            var constraintsInDatabase = _sqlSyntaxProvider.GetConstraintsPerColumn(_database).DistinctBy(x => x.Item3).ToList();
            var foreignKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("FK_")).Select(x => x.Item3).ToList();
            var primaryKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("PK_")).Select(x => x.Item3).ToList();
-
+            var indexesInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("IX_")).Select(x => x.Item3).ToList();
+            var indexesInSchema = result.TableDefinitions.SelectMany(x => x.Indexes.Select(y => y.Name)).ToList();
            var unknownConstraintsInDatabase =
                constraintsInDatabase.Where(
                    x =>
@@ -213,7 +212,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
            // In theory you could have: FK_ or fk_ ...or really any standard that your development department (or developer) chooses to use.
            foreach (var unknown in unknownConstraintsInDatabase)
            {
-                if (foreignKeysInSchema.InvariantContains(unknown) || primaryKeysInSchema.InvariantContains(unknown))
+                if (foreignKeysInSchema.InvariantContains(unknown) || primaryKeysInSchema.InvariantContains(unknown) || indexesInSchema.InvariantContains(unknown))
                {
                    result.ValidConstraints.Add(unknown);
                }
@@ -255,6 +254,23 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
                result.Errors.Add(new Tuple<string, string>("Constraint", primaryKey));
            }

+            //Constaints:
+
+            //NOTE: SD: The colIndex checks above should really take care of this but I need to keep this here because it was here before
+            // and some schema validation checks might rely on this data remaining here!
+            //Add valid and invalid index differences to the result object
+            var validIndexDifferences = indexesInDatabase.Intersect(indexesInSchema, StringComparer.InvariantCultureIgnoreCase);
+            foreach (var index in validIndexDifferences)
+            {
+                result.ValidConstraints.Add(index);
+            }
+            var invalidIndexDifferences =
+                indexesInDatabase.Except(indexesInSchema, StringComparer.InvariantCultureIgnoreCase)
+                                .Union(indexesInSchema.Except(indexesInDatabase, StringComparer.InvariantCultureIgnoreCase));
+            foreach (var index in invalidIndexDifferences)
+            {
+                result.Errors.Add(new Tuple<string, string>("Constraint", index));
+            }
        }

        private void ValidateDbColumns(DatabaseSchemaResult result)
@@ -28,7 +28,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
        public override void Up()
        {
            var dbIndexes = _skipIndexCheck ? new DbIndexDefinition[]{} : SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();

            //make sure it doesn't already exist
            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsMacroProperty_Alias")) == false)
@@ -48,4 +54,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            Delete.Index("IX_cmsMacroProperty_Alias").OnTable("cmsMacroProperty");
        }
    }
-}
+}
@@ -30,7 +30,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
        public override void Up()
        {
            var dbIndexes = _forTesting ? new DbIndexDefinition[] { } : SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();

            //make sure it doesn't already exist
            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsMacro_Alias")) == false)
@@ -69,4 +75,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            Delete.Index("IX_cmsMacro_Alias").OnTable("cmsMacro");
        }
    }
-}
+}
@@ -18,7 +18,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
        public override void Up()
        {
            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
            
            //add a foreign key to the parent id column too!

@@ -48,4 +54,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified");
        }
    }
-}
+}
@@ -26,7 +26,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            // it is absolutely required to exist in order to have it as a foreign key reference, so we'll need to check it's existence
            // this came to light from this issue: http://issues.umbraco.org/issue/U4-4133
            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsContent")) == false)
            {
                Create.Index("IX_cmsContent").OnTable("cmsContent").OnColumn("nodeId").Ascending().WithOptions().Unique();
@@ -89,4 +95,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
            //don't do anything, these keys should have always existed!
        }
    }
-}
+}
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZe
        {
            Execute.Code(database =>
            {                
-                var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(database);
+                var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(Context.Database);

                //make sure it doesn't already exist
                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsPropertyTypeAlias")) == false)
@@ -62,7 +62,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
                }

                var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                    .Select(x => new DbIndexDefinition(x)).ToArray();
+                    .Select(x => new DbIndexDefinition
+                    {
+                        TableName = x.Item1,
+                        IndexName = x.Item2,
+                        ColumnName = x.Item3,
+                        IsUnique = x.Item4
+                    }).ToArray();

                //make sure it doesn't already exist
                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsDictionary_id")) == false)
@@ -98,4 +104,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
            throw new NotImplementedException();
        }
    }
-}
+}
@@ -120,7 +120,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe


            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();

            //in some databases there's an index (IX_Master) on the master column which needs to be dropped first
            var foundIndex = dbIndexes.FirstOrDefault(x => x.TableName.InvariantEquals("cmsTemplate") && x.ColumnName.InvariantEquals("master"));
@@ -161,4 +167,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
            return path;
        }
    }
-}
+}
@@ -15,7 +15,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
        public override void Up()
        {
            var indexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();

            // drop the index if it exists
            if (indexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoNodeUniqueID")))
@@ -32,4 +38,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
        public override void Down()
        { }
    }
-}
+}
@@ -1,4 +1,7 @@
-using Umbraco.Core.Logging;
+using System;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.SqlSyntax;

 namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
@@ -13,22 +16,20 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ

        public override void Up()
        {
-            var relationTypeCount = Context.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoRelationType WHERE alias=@alias",
-                new { alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias });
-
-            if (relationTypeCount > 0)
-                return;
-
-            var uniqueId = (Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias + "____" + Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName).ToGuid();
-            Insert.IntoTable("umbracoRelationType").Row(new
+            var exists = Context.Database.FirstOrDefault<RelationTypeDto>("WHERE alias=@alias", new { alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias });
+            if (exists == null)
            {
-                typeUniqueId = uniqueId,
-                alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias,
-                name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName,
-                childObjectType = Constants.ObjectTypes.MediaType,
-                parentObjectType = Constants.ObjectTypes.MediaType,
-                dual = false
-            });
+                var uniqueId = (Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias + "____" + Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName).ToGuid();
+                Insert.IntoTable("umbracoRelationType").Row(new
+                {
+                    typeUniqueId = uniqueId,
+                    alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias,
+                    name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName,
+                    childObjectType = Constants.ObjectTypes.MediaType,
+                    parentObjectType = Constants.ObjectTypes.MediaType,
+                    dual = false
+                });
+            }
        }

        public override void Down()
@@ -15,35 +15,21 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ

        public override void Up()
        {
-            Execute.Code(database =>
-            {
-                var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
-                // Some people seem to have a constraint in their DB instead of an index, we'd need to drop that one
-                // See: https://our.umbraco.com/forum/using-umbraco-and-getting-started/93282-upgrade-from-711-to-712-fails
-                var constraints = SqlSyntax.GetConstraintsPerTable(database).Distinct().ToArray();
-                if (constraints.Any(x => x.Item2.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
+            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
+                .Select(x => new DbIndexDefinition()
                {
-                    localContext.Delete.UniqueConstraint("IX_umbracoLanguage_languageISOCode").FromTable("umbracoLanguage");
-                    return localContext.GetSql();
-                }
-                return null;
-            });
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();

-            Execute.Code(database =>
+            //Ensure the index exists before dropping it
+            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
            {
-                var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
-
-                //Now check for indexes of that name and drop that if it exists
-                var dbIndexes = SqlSyntax.GetDefinedIndexes(database)
-                    .Select(x => new DbIndexDefinition(x)).ToArray();
-                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
-                {
-                    localContext.Delete.Index("IX_umbracoLanguage_languageISOCode").OnTable("umbracoLanguage");
-                    return localContext.GetSql();
-                }
-                return null;
-            });
-
+                Delete.Index("IX_umbracoLanguage_languageISOCode").OnTable("umbracoLanguage");
+            }
+            
            Alter.Table("umbracoLanguage")
                .AlterColumn("languageISOCode")
                .AsString(14)
@@ -52,8 +38,6 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ
            Create.Index("IX_umbracoLanguage_languageISOCode")
                .OnTable("umbracoLanguage")
                .OnColumn("languageISOCode")
-                .Ascending()
-                .WithOptions()
                .Unique();
        }

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ
            // We need to get all datatypes with an alias of "umbraco.tags" so we can loop over them and set the missing values if needed
            var datatypes = Context.Database.Fetch<DataTypeDto>("SELECT * FROM cmsDataType");
            var tagsDataTypes = datatypes.Where(x => string.Equals(x.PropertyEditorAlias, Constants.PropertyEditors.TagsAlias, StringComparison.InvariantCultureIgnoreCase));
-            var dataTypePreValues = Context.Database.Fetch<DataTypePreValueDto>("SELECT * FROM cmsDataTypePreValues");
+            var dataTypePreValues = Context.Database.Fetch<DataTypePreValueDto>("SELECT * FROM cmsDataTypePrevalues");

            foreach (var datatype in tagsDataTypes)
            {
@@ -36,7 +36,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ
                // if the "storageType" has not been set we do so by adding a new row in the table for the nodid and set it
                if (result == null)
                {
-                    Insert.IntoTable("cmsDataTypePreValues").Row(new
+                    Insert.IntoTable("CmsDataTypePrevalues").Row(new
                    {
                        datatypeNodeId = datatype.DataTypeId,
                        value = "Csv",
@@ -48,8 +48,14 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwoZero
                //Some very old schemas don't have an index on the cmsContentType.nodeId column, I'm not actually sure when it was added but 
                // it is absolutely required to exist in order to add other foreign keys and much better for perf, so we'll need to check it's existence
                // this came to light from this issue: http://issues.umbraco.org/issue/U4-4133
-                var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                    .Select(x => new DbIndexDefinition(x)).ToArray();
+                var dbIndexes = SqlSyntaxContext.SqlSyntaxProvider.GetDefinedIndexes(Context.Database)
+                    .Select(x => new DbIndexDefinition()
+                    {
+                        TableName = x.Item1,
+                        IndexName = x.Item2,
+                        ColumnName = x.Item3,
+                        IsUnique = x.Item4
+                    }).ToArray();
                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsContentType")) == false)
                {
                    Create.Index("IX_cmsContentType").OnTable("cmsContentType").OnColumn("nodeId").Ascending().WithOptions().Unique();
@@ -76,4 +82,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwoZero
            throw new DataLossException("Cannot downgrade from a version 7.2 database to a prior version, the database schema has already been modified");
        }
    }
-}
+}
@@ -20,7 +20,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero
        {

            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();

            //do not create any indexes if they already exist in the database

@@ -112,4 +118,4 @@ DROP TABLE ""umbracoUserLogins_temp""");

        }
    }
-}
+}
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Membership;
@@ -48,33 +47,43 @@ namespace Umbraco.Core.Persistence.Repositories
            var sql = GetBaseQuery(false);

            if (query == null) query = new Query<IAuditItem>();
-            
-            var queryHasWhereClause = query.GetWhereClauses().Any();
            var translatorIds = new SqlTranslator<IAuditItem>(sql, query);
            var translatedQuery = translatorIds.Translate();

-            var customFilterWheres = customFilter?.GetWhereClauses().ToArray();
+            var customFilterWheres = customFilter != null ? customFilter.GetWhereClauses().ToArray() : null;
            var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
            if (hasCustomFilter)
            {
                var filterSql = new Sql();
-                foreach (var filterClause in customFilterWheres)
-                {                   
-                    filterSql.Append($"AND ({filterClause.Item1})", filterClause.Item2);
+                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, queryHasWhereClause);
+                translatedQuery = GetFilteredSqlForPagedResults(translatedQuery, filterSql);
            }

            if (auditTypeFilter.Length > 0)
            {
                var filterSql = new Sql();
-                foreach (var filterClause in auditTypeFilter)
-                {                   
-                    filterSql.Append("AND (logHeader = @logHeader)", new { logHeader = filterClause.ToString() });
+                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, queryHasWhereClause || hasCustomFilter);
+                translatedQuery = GetFilteredSqlForPagedResults(translatedQuery, filterSql);
            }

            if (orderDirection == Direction.Descending)
@@ -90,7 +99,7 @@ namespace Umbraco.Core.Persistence.Repositories
                dto => new AuditItem(dto.Id, dto.Comment, Enum<AuditType>.ParseOrNull(dto.Header) ?? AuditType.Custom, dto.UserId)).ToArray();

            //Mapping the DateStamp
-            for (var i = 0; i < pages.Length; i++)
+            for (int i = 0; i < pages.Length; i++)
            {
                pages[i].CreateDate = pagedResult.Items[i].Datestamp;
            }
@@ -160,17 +169,14 @@ namespace Umbraco.Core.Persistence.Repositories
        }
        #endregion

-        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql, bool hasWhereClause)
+        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql)
        {
            Sql filteredSql;

            // Apply filter
            if (filterSql != null)
            {
-               	//ensure we don't append a WHERE if there is already one
-                var sqlFilter = hasWhereClause
-                    ? filterSql.SQL
-                    : " WHERE " + filterSql.SQL.TrimStart("AND ");
+                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
@@ -134,7 +134,7 @@ 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)
+                .On<ContentDto, NodeDto>(SqlSyntax, left => left.NodeId, right => right.NodeId)
                .InnerJoin<ContentTypeDto>()
                .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId);
            //TODO: IF we want to enable querying on content type information this will need to be joined
@@ -836,19 +836,19 @@ order by umbracoNode.{2}, umbracoNode.parentID, umbracoNode.sortOrder",
        }

        public int CountPublished(string contentTypeAlias = null)
-        {
-            if (contentTypeAlias.IsNullOrWhiteSpace())
-            {
+        {
+            if (contentTypeAlias.IsNullOrWhiteSpace())
+            {
                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
-                .Where<DocumentDto>(x => x.Published == true);
-                return Database.ExecuteScalar<int>(sql);
+                .Where<DocumentDto>(x => x.Published == true);
+                return Database.ExecuteScalar<int>(sql);
            }
-            else
-            {
+            else
+            {
                var sql = GetBaseQuery(true).Where<NodeDto>(x => x.Trashed == false)
-                .Where<DocumentDto>(x => x.Published == true)
-                .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
-                return Database.ExecuteScalar<int>(sql);
+                .Where<DocumentDto>(x => x.Published == true)
+                .Where<ContentTypeDto>(x => x.Alias == contentTypeAlias);
+                return Database.ExecuteScalar<int>(sql);
            }
        }

@@ -1220,14 +1220,7 @@ ORDER BY cmsContentVersion.id DESC
                if (def.DocumentDto.TemplateId.HasValue)
                    templates.TryGetValue(def.DocumentDto.TemplateId.Value, out template); // else null
                cc.Template = template;
-                if (propertyData.ContainsKey(cc.Version))
-                {
-                    cc.Properties = propertyData[cc.Version];
-                }
-                else
-                {
-                    throw new InvalidOperationException($"No property data found for version: '{cc.Version}'.");
-                }
+                cc.Properties = propertyData[cc.Version];

                //on initial construction we don't want to have dirty properties tracked
                // http://issues.umbraco.org/issue/U4-1946
@@ -1314,4 +1307,4 @@ ORDER BY cmsContentVersion.id DESC
            }
        }
    }
-}
+}
@@ -284,7 +284,7 @@ namespace Umbraco.Core.Persistence.Repositories
                var nonAssignedRoles = roleNames.Except(assignedRoles, StringComparer.CurrentCultureIgnoreCase);
                foreach (var toAssign in nonAssignedRoles)
                {
-                    var groupId = rolesForNames.First(x => x.Text.InvariantEquals(toAssign)).NodeId;
+                    var groupId = rolesForNames.First(x => x.Text == toAssign).NodeId;
                    Database.Insert(new Member2MemberGroupDto { Member = mId, MemberGroup = groupId });
                }
            }
@@ -4,7 +4,6 @@ using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Web.Security;
 using Newtonsoft.Json;
 using Umbraco.Core.Configuration;
@@ -187,8 +186,6 @@ UNION
 SELECT '4CountOfLockedOut' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userNoConsole = 1
 UNION
 SELECT '5CountOfInvited' AS colName, COUNT(id) AS num FROM umbracoUser WHERE lastLoginDate IS NULL AND userDisabled = 1 AND invitedDate IS NOT NULL
-UNION
-SELECT '6CountOfDisabled' AS colName, COUNT(id) AS num FROM umbracoUser WHERE userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NULL 
 ORDER BY colName";

            var result = Database.Fetch<dynamic>(sql);
@@ -199,8 +196,7 @@ ORDER BY colName";
                {UserState.Active, (int)result[1].num},
                {UserState.Disabled, (int)result[2].num},
                {UserState.LockedOut, (int)result[3].num},
-                {UserState.Invited, (int)result[4].num},
-                {UserState.Inactive, (int) result[5].num}
+                {UserState.Invited, (int)result[4].num}
            };
        }

@@ -711,10 +707,10 @@ ORDER BY colName";



-        private IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords, string orderBy, Direction orderDirection,
-            string[] includeUserGroups = null,
-            string[] excludeUserGroups = null,
-            UserState[] userState = null,
+        private IEnumerable<IUser> GetPagedResultsByQuery(IQuery<IUser> query, long pageIndex, int pageSize, out long totalRecords, string orderBy, Direction orderDirection,
+            string[] includeUserGroups = null,
+            string[] excludeUserGroups = null,
+            UserState[] userState = null,
            IQuery<IUser> customFilter = null)
        {
            if (string.IsNullOrWhiteSpace(orderBy)) throw new ArgumentException("Value cannot be null or whitespace.", "orderBy");
@@ -722,23 +718,23 @@ ORDER BY colName";

            Sql filterSql = null;
            var customFilterWheres = customFilter != null ? customFilter.GetWhereClauses().ToArray() : null;
-            var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
+            var hasCustomFilter = customFilterWheres != null && customFilterWheres.Length > 0;
            if (hasCustomFilter
-                || (includeUserGroups != null && includeUserGroups.Length > 0) || (excludeUserGroups != null && excludeUserGroups.Length > 0)
-                || (userState != null && userState.Length > 0 && userState.Contains(UserState.All) == false))
-                filterSql = new Sql();
+                || (includeUserGroups != null && includeUserGroups.Length > 0) || (excludeUserGroups != null && excludeUserGroups.Length > 0)
+                || (userState != null && userState.Length > 0 && userState.Contains(UserState.All) == false))
+                filterSql = new Sql();

            if (hasCustomFilter)
            {
                foreach (var filterClause in customFilterWheres)
                {
-                    filterSql.Append($"AND ({filterClause.Item1})", filterClause.Item2);
+                    filterSql.Append(string.Format("AND ({0})", filterClause.Item1), filterClause.Item2);
                }
-            }
+            }

            if (includeUserGroups != null && includeUserGroups.Length > 0)
            {
-                const string subQuery = @"AND (umbracoUser.id IN (SELECT DISTINCT umbracoUser.id
+                var subQuery = @"AND (umbracoUser.id IN (SELECT DISTINCT umbracoUser.id
 		            FROM umbracoUser
 		            INNER JOIN umbracoUser2UserGroup ON umbracoUser2UserGroup.userId = umbracoUser.id
 		            INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
@@ -748,33 +744,27 @@ ORDER BY colName";

            if (excludeUserGroups != null && excludeUserGroups.Length > 0)
            {
-                const string subQuery = @"AND (umbracoUser.id NOT IN (SELECT DISTINCT umbracoUser.id
+                var subQuery = @"AND (umbracoUser.id NOT IN (SELECT DISTINCT umbracoUser.id
 		            FROM umbracoUser
 		            INNER JOIN umbracoUser2UserGroup ON umbracoUser2UserGroup.userId = umbracoUser.id
 		            INNER JOIN umbracoUserGroup ON umbracoUserGroup.id = umbracoUser2UserGroup.userGroupId
 		            WHERE umbracoUserGroup.userGroupAlias IN (@userGroups)))";
                filterSql.Append(subQuery, new { userGroups = excludeUserGroups });
-            }
+            }

            if (userState != null && userState.Length > 0)
-            {
+            {
                //the "ALL" state doesn't require any filtering so we ignore that, if it exists in the list we don't do any filtering
                if (userState.Contains(UserState.All) == false)
                {
                    var sb = new StringBuilder("(");
-                    var appended = false;
+                    var appended = false;

                    if (userState.Contains(UserState.Active))
                    {
                        sb.Append("(userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NOT NULL)");
                        appended = true;
                    }
-                    if (userState.Contains(UserState.Inactive))
-                    {
-                        if (appended) sb.Append(" OR ");
-                        sb.Append("(userDisabled = 0 AND userNoConsole = 0 AND lastLoginDate IS NULL)");
-                        appended = true;
-                    }
                    if (userState.Contains(UserState.Disabled))
                    {
                        if (appended) sb.Append(" OR ");
@@ -798,81 +788,67 @@ ORDER BY colName";

                    filterSql.Append("AND " + sb);
                }
-            }
-
-            // Get base query for returning IDs
-            var sqlBaseIds = GetBaseQuery("id");
-
+            }
+
+            // Get base query for returning IDs
+            var sqlBaseIds = GetBaseQuery("id");
+
            if (query == null) query = new Query<IUser>();
-            var queryHasWhereClause = query.GetWhereClauses().Any();
            var translatorIds = new SqlTranslator<IUser>(sqlBaseIds, query);
-            var sqlQueryIds = translatorIds.Translate();
-            var sqlBaseFull = GetBaseQuery("umbracoUser.*, umbracoUserGroup.*, umbracoUserGroup2App.*, umbracoUserStartNode.*");
-            var translatorFull = new SqlTranslator<IUser>(sqlBaseFull, query);
-
-            //get sorted and filtered sql
+            var sqlQueryIds = translatorIds.Translate();
+
+            //get sorted and filtered sql
            var sqlNodeIdsWithSort = GetSortedSqlForPagedResults(
-                GetFilteredSqlForPagedResults(sqlQueryIds, filterSql, queryHasWhereClause),
+                GetFilteredSqlForPagedResults(sqlQueryIds, filterSql),
                orderDirection, orderBy);

            // Get page of results and total count
            var pagedResult = Database.Page<UserDto>(pageIndex + 1, pageSize, sqlNodeIdsWithSort);
-            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
-
-            //NOTE: We need to check the actual items returned, not the 'totalRecords', that is because if you request a page number
-            // that doesn't actually have any data on it, the totalRecords will still indicate there are records but there are none in
-            // the pageResult.
+            totalRecords = Convert.ToInt32(pagedResult.TotalItems);
+
+            //NOTE: We need to check the actual items returned, not the 'totalRecords', that is because if you request a page number
+            // that doesn't actually have any data on it, the totalRecords will still indicate there are records but there are none in
+            // the pageResult.
            if (pagedResult.Items.Any())
            {
                //Create the inner paged query that was used above to get the paged result, we'll use that as the inner sub query
                var args = sqlNodeIdsWithSort.Arguments;
                string sqlStringCount, sqlStringPage;
                Database.BuildPageQueries<UserDto>(pageIndex * pageSize, pageSize, sqlNodeIdsWithSort.SQL, ref args, out sqlStringCount, out sqlStringPage);
-                
-                var sqlQueryFull = translatorFull.Translate();

-                //We need to make this FULL query an inner join on the paged ID query
-                var splitQuery = sqlQueryFull.SQL.Split(new[] { "WHERE " }, StringSplitOptions.None);
-                var fullQueryWithPagedInnerJoin = new Sql(splitQuery[0])
-                    .Append("INNER JOIN (")
-                    //join the paged query with the paged query arguments
+                var sqlQueryFull = GetBaseQuery("umbracoUser.*, umbracoUserGroup.*, umbracoUserGroup2App.*, umbracoUserStartNode.*");
+
+                var fullQueryWithPagedInnerJoin = sqlQueryFull
+                    .Append("INNER JOIN (")
+                    //join the paged query with the paged query arguments
                    .Append(sqlStringPage, args)
                    .Append(") temp ")
                    .Append("ON umbracoUser.id = temp.id");

                AddGroupLeftJoin(fullQueryWithPagedInnerJoin);

-                if (splitQuery.Length > 1)
-                {
-                    //add the original where clause back with the original arguments
-                    fullQueryWithPagedInnerJoin.Where(splitQuery[1], sqlQueryIds.Arguments);
-                }   
-
                //get sorted and filtered sql
                var fullQuery = GetSortedSqlForPagedResults(
-                    GetFilteredSqlForPagedResults(fullQueryWithPagedInnerJoin, filterSql, queryHasWhereClause),
+                    GetFilteredSqlForPagedResults(fullQueryWithPagedInnerJoin, filterSql),
                    orderDirection, orderBy);

                var users = ConvertFromDtos(Database.Fetch<UserDto, UserGroupDto, UserGroup2AppDto, UserStartNodeDto, UserDto>(new UserGroupRelator().Map, fullQuery))
                    .ToArray(); // important so we don't iterate twice, if we don't do this we can end up with null values in cache if we were caching.    

                return users;
-            }
+            }

            return Enumerable.Empty<IUser>();
        }

-        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql, bool hasWhereClause)
+        private Sql GetFilteredSqlForPagedResults(Sql sql, Sql filterSql)
        {
            Sql filteredSql;

            // Apply filter
            if (filterSql != null)
            {
-                //ensure we don't append a WHERE if there is already one
-                var sqlFilter = hasWhereClause
-                    ? filterSql.SQL
-                    : " WHERE " + filterSql.SQL.TrimStart("AND ");
+                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
@@ -939,4 +915,4 @@ ORDER BY colName";
        }
        
    }
-}
+}
@@ -290,9 +290,6 @@ namespace Umbraco.Core.Persistence.Repositories
            // Apply filter
            if (defaultFilter != null)
            {
-                //NOTE: It is assumed here that the `sql` already contains a WHERE clause, see UserRepository.GetFilteredSqlForPagedResults
-                // for an example of when it's not assumed there's already a WHERE clause
-
                var filterResult = defaultFilter();

                //NOTE: this is certainly strange - NPoco handles this much better but we need to re-create the sql
@@ -996,4 +993,4 @@ ORDER BY contentNodeId, versionId, propertytypeid
            }
        }
    }
-}
+}
@@ -53,8 +53,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
        string TruncateTable { get; }
        string CreateConstraint { get; }
        string DeleteConstraint { get; }
-
-        [Obsolete("This is never used, use the Format(ForeignKeyDefinition) instead")]
        string CreateForeignKeyConstraint { get; }
        string DeleteDefaultConstraint { get; }
        string FormatDateTime(DateTime date, bool includeTime = true);
@@ -80,32 +78,9 @@ namespace Umbraco.Core.Persistence.SqlSyntax

        IEnumerable<string> GetTablesInSchema(Database db);
        IEnumerable<ColumnInfo> GetColumnsInSchema(Database db);
-
-        /// <summary>
-        /// Returns all constraints defined in the database (Primary keys, foreign keys, unique constraints...) (does not include indexes)
-        /// </summary>
-        /// <param name="db"></param>
-        /// <returns>
-        /// A Tuple containing: TableName, ConstraintName
-        /// </returns>
        IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db);
-
-        /// <summary>
-        /// Returns all constraints defined in the database (Primary keys, foreign keys, unique constraints...) (does not include indexes)
-        /// </summary>
-        /// <param name="db"></param>
-        /// <returns>
-        /// A Tuple containing: TableName, ColumnName, ConstraintName
-        /// </returns>
        IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db);

-        /// <summary>
-        /// Returns all defined Indexes in the database excluding primary keys
-        /// </summary>
-        /// <param name="db"></param>
-        /// <returns>
-        /// A Tuple containing: TableName, IndexName, ColumnName, IsUnique
-        /// </returns>
        IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db);
    }
-}
+}
@@ -78,7 +78,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            return list;
        }

-        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
        {
            List<Tuple<string, string>> list;
@@ -101,7 +100,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            return list;
        }

-        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
        {
            List<Tuple<string, string, string>> list;
@@ -128,7 +126,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            return list;
        }

-        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
        {
            List<Tuple<string, string, string, bool>> list;
@@ -404,4 +401,4 @@ ORDER BY TABLE_NAME, INDEX_NAME",
            return PetaPocoExtensions.EscapeAtSymbols(MySql.Data.MySqlClient.MySqlHelper.EscapeString(val));
        }
    }
-}
+}
@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
    /// <summary>
    /// Represents an SqlSyntaxProvider for Sql Ce
    /// </summary>
-    [SqlSyntaxProvider(Constants.DatabaseProviders.SqlCe)]
+    [SqlSyntaxProviderAttribute(Constants.DatabaseProviders.SqlCe)]
    public class SqlCeSyntaxProvider : MicrosoftSqlSyntaxProviderBase<SqlCeSyntaxProvider>
    {
        public SqlCeSyntaxProvider()
@@ -123,27 +123,40 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                                   item.IS_NULLABLE, item.DATA_TYPE)).ToList();
        }

-        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
        {
            var items = db.Fetch<dynamic>("SELECT TABLE_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS");
-            return items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME)).ToList();
+            var indexItems = db.Fetch<dynamic>("SELECT TABLE_NAME, INDEX_NAME FROM INFORMATION_SCHEMA.INDEXES");
+            return
+                items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME))
+                     .Union(
+                         indexItems.Select(
+                             indexItem => new Tuple<string, string>(indexItem.TABLE_NAME, indexItem.INDEX_NAME)))
+                     .ToList();
        }

-        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
        {
-            var items = db.Fetch<dynamic>("SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE");
-            return items.Select(item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME)).ToList();
+            var items =
+                db.Fetch<dynamic>(
+                    "SELECT CONSTRAINT_NAME, TABLE_NAME, COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE");
+            var indexItems = db.Fetch<dynamic>("SELECT INDEX_NAME, TABLE_NAME, COLUMN_NAME FROM INFORMATION_SCHEMA.INDEXES");
+            return
+                items.Select(
+                    item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME))
+                     .Union(
+                         indexItems.Select(
+                             indexItem =>
+                             new Tuple<string, string, string>(indexItem.TABLE_NAME, indexItem.COLUMN_NAME,
+                                                               indexItem.INDEX_NAME))).ToList();
        }

-        /// <inheritdoc />
        public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
        {
            var items =
                db.Fetch<dynamic>(
                    @"SELECT TABLE_NAME, INDEX_NAME, COLUMN_NAME, [UNIQUE] FROM INFORMATION_SCHEMA.INDEXES 
-WHERE PRIMARY_KEY=0
+WHERE INDEX_NAME NOT LIKE 'PK_%'
 ORDER BY TABLE_NAME, INDEX_NAME");
            return
                items.Select(
@@ -202,4 +215,4 @@ ORDER BY TABLE_NAME, INDEX_NAME");
        public override string DropIndex { get { return "DROP INDEX {1}.{0}"; } }
        
    }
-}
+}
@@ -1,188 +1,186 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-
-namespace Umbraco.Core.Persistence.SqlSyntax
-{
-    /// <summary>
-    /// Represents an SqlSyntaxProvider for Sql Server.
-    /// </summary>
-    [SqlSyntaxProvider(Constants.DatabaseProviders.SqlServer)]
-    public class SqlServerSyntaxProvider : MicrosoftSqlSyntaxProviderBase<SqlServerSyntaxProvider>
-    {
-        /// <summary>
-        /// Gets/sets the version of the current SQL server instance
-        /// </summary>
-        internal SqlServerVersionName GetVersionName(Database database)
-        {
-            if (_versionName.HasValue)
-                return _versionName.Value;
-
-            try
-            {
-                var version = database.ExecuteScalar<string>("SELECT SERVERPROPERTY('productversion')");
-                var firstPart = version.Split('.')[0];
-                switch (firstPart)
-                {
-                    case "13":
-                        _versionName = SqlServerVersionName.V2016;
-                        break;
-                    case "12":
-                        _versionName = SqlServerVersionName.V2014;
-                        break;
-                    case "11":
-                        _versionName = SqlServerVersionName.V2012;
-                        break;
-                    case "10":
-                        _versionName = SqlServerVersionName.V2008;
-                        break;
-                    case "9":
-                        _versionName = SqlServerVersionName.V2005;
-                        break;
-                    case "8":
-                        _versionName = SqlServerVersionName.V2000;
-                        break;
-                    case "7":
-                        _versionName = SqlServerVersionName.V7;
-                        break;
-                    default:
-                        _versionName = SqlServerVersionName.Other;
-                        break;
-                }
-            }
-            catch (Exception)
-            {
-                _versionName = SqlServerVersionName.Invalid;
-            }
-
-            return _versionName.Value;
-        }
-
-        private SqlServerVersionName? _versionName;
-
-        /// <summary>
-        /// SQL Server stores default values assigned to columns as constraints, it also stores them with named values, this is the only
-        /// server type that does this, therefore this method doesn't exist on any other syntax provider
-        /// </summary>
-        /// <returns></returns>
-        public IEnumerable<Tuple<string, string, string, string>> GetDefaultConstraintsPerColumn(Database db)
-        {
-            var items = db.Fetch<dynamic>("SELECT TableName = t.Name, ColumnName = c.Name, dc.Name, dc.[Definition] FROM sys.tables t INNER JOIN sys.default_constraints dc ON t.object_id = dc.parent_object_id INNER JOIN sys.columns c ON dc.parent_object_id = c.object_id AND c.column_id = dc.parent_column_id INNER JOIN sys.schemas as s on t.[schema_id] = s.[schema_id] WHERE s.name = (SELECT SCHEMA_NAME())");
-            return items.Select(x => new Tuple<string, string, string, string>(x.TableName, x.ColumnName, x.Name, x.Definition));
-        }
-
-        public override IEnumerable<string> GetTablesInSchema(Database db)
-        {
-            var items = db.Fetch<dynamic>("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = (SELECT SCHEMA_NAME())");
-            return items.Select(x => x.TABLE_NAME).Cast<string>().ToList();
-        }
-
-        public override IEnumerable<ColumnInfo> GetColumnsInSchema(Database db)
-        {
-            var items = db.Fetch<dynamic>("SELECT TABLE_NAME, COLUMN_NAME, ORDINAL_POSITION, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = (SELECT SCHEMA_NAME())");
-            return
-                items.Select(
-                    item =>
-                    new ColumnInfo(item.TABLE_NAME, item.COLUMN_NAME, item.ORDINAL_POSITION, item.COLUMN_DEFAULT,
-                                   item.IS_NULLABLE, item.DATA_TYPE)).ToList();
-        }
-
-        /// <inheritdoc />
-        public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
-        {
-            var items =
-                db.Fetch<dynamic>(
-                    "SELECT TABLE_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_TABLE_USAGE WHERE TABLE_SCHEMA = (SELECT SCHEMA_NAME())");
-            return items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME)).ToList();
-        }
-
-        /// <inheritdoc />
-        public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
-        {
-            var items =
-                db.Fetch<dynamic>(
-                    "SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE WHERE TABLE_SCHEMA = (SELECT SCHEMA_NAME())");
-            return items.Select(item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME)).ToList();
-        }
-
-        /// <inheritdoc />
-        public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
-        {
-            var items =
-                db.Fetch<dynamic>(
-                    @"select T.name as TABLE_NAME, I.name as INDEX_NAME, AC.Name as COLUMN_NAME,
-CASE WHEN I.is_unique_constraint = 1 OR  I.is_unique = 1 THEN 1 ELSE 0 END AS [UNIQUE]
-from sys.tables as T inner join sys.indexes as I on T.[object_id] = I.[object_id] 
-   inner join sys.index_columns as IC on IC.[object_id] = I.[object_id] and IC.[index_id] = I.[index_id] 
-   inner join sys.all_columns as AC on IC.[object_id] = AC.[object_id] and IC.[column_id] = AC.[column_id] 
-   inner join sys.schemas as S on T.[schema_id] = S.[schema_id]
-WHERE S.name = (SELECT SCHEMA_NAME()) AND I.is_primary_key = 0
-order by T.name, I.name");
-            return items.Select(item => new Tuple<string, string, string, bool>(item.TABLE_NAME, item.INDEX_NAME, item.COLUMN_NAME,
-                item.UNIQUE == 1)).ToList();
-
-        }
-
-        public override bool DoesTableExist(Database db, string tableName)
-        {
-            var result =
-                db.ExecuteScalar<long>("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = @TableName AND TABLE_SCHEMA = (SELECT SCHEMA_NAME())",
-                                       new { TableName = tableName });
-
-            return result > 0;
-        }
-
-        public override string FormatColumnRename(string tableName, string oldName, string newName)
-        {
-            return string.Format(RenameColumn, tableName, oldName, newName);
-        }
-
-        public override string FormatTableRename(string oldName, string newName)
-        {
-            return string.Format(RenameTable, oldName, newName);
-        }
-
-        protected override string FormatIdentity(ColumnDefinition column)
-        {
-            return column.IsIdentity ? GetIdentityString(column) : string.Empty;
-        }
-
-        public override Sql SelectTop(Sql sql, int top)
-        {
-            return new Sql(sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments);
-        }
-
-        private static string GetIdentityString(ColumnDefinition column)
-        {
-            return "IDENTITY(1,1)";
-        }
-
-        protected override string FormatSystemMethods(SystemMethods systemMethod)
-        {
-            switch (systemMethod)
-            {
-                case SystemMethods.NewGuid:
-                    return "NEWID()";
-                case SystemMethods.CurrentDateTime:
-                    return "GETDATE()";
-                //case SystemMethods.NewSequentialId:
-                //    return "NEWSEQUENTIALID()";
-                //case SystemMethods.CurrentUTCDateTime:
-                //    return "GETUTCDATE()";
-            }
-
-            return null;
-        }
-
-        public override string DeleteDefaultConstraint
-        {
-            get { return "ALTER TABLE [{0}] DROP CONSTRAINT [DF_{0}_{1}]"; }
-        }
-
-
-        public override string DropIndex { get { return "DROP INDEX {0} ON {1}"; } }
-
-        public override string RenameColumn { get { return "sp_rename '{0}.{1}', '{2}', 'COLUMN'"; } }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+
+namespace Umbraco.Core.Persistence.SqlSyntax
+{
+    /// <summary>
+    /// Represents an SqlSyntaxProvider for Sql Server.
+    /// </summary>
+    [SqlSyntaxProvider(Constants.DatabaseProviders.SqlServer)]
+    public class SqlServerSyntaxProvider : MicrosoftSqlSyntaxProviderBase<SqlServerSyntaxProvider>
+    {
+        /// <summary>
+        /// Gets/sets the version of the current SQL server instance
+        /// </summary>
+        internal SqlServerVersionName GetVersionName(Database database)
+        {
+            if (_versionName.HasValue)
+                return _versionName.Value;
+
+            try
+            {
+                var version = database.ExecuteScalar<string>("SELECT SERVERPROPERTY('productversion')");
+                var firstPart = version.Split('.')[0];
+                switch (firstPart)
+                {
+                    case "13":
+                        _versionName = SqlServerVersionName.V2016;
+                        break;
+                    case "12":
+                        _versionName = SqlServerVersionName.V2014;
+                        break;
+                    case "11":
+                        _versionName = SqlServerVersionName.V2012;
+                        break;
+                    case "10":
+                        _versionName = SqlServerVersionName.V2008;
+                        break;
+                    case "9":
+                        _versionName = SqlServerVersionName.V2005;
+                        break;
+                    case "8":
+                        _versionName = SqlServerVersionName.V2000;
+                        break;
+                    case "7":
+                        _versionName = SqlServerVersionName.V7;
+                        break;
+                    default:
+                        _versionName = SqlServerVersionName.Other;
+                        break;
+                }
+            }
+            catch (Exception)
+            {
+                _versionName = SqlServerVersionName.Invalid;
+            }
+
+            return _versionName.Value;
+        }
+
+        private SqlServerVersionName? _versionName;
+
+        /// <summary>
+        /// SQL Server stores default values assigned to columns as constraints, it also stores them with named values, this is the only
+        /// server type that does this, therefore this method doesn't exist on any other syntax provider
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<Tuple<string, string, string, string>> GetDefaultConstraintsPerColumn(Database db)
+        {
+            var items = db.Fetch<dynamic>("SELECT TableName = t.Name,ColumnName = c.Name,dc.Name,dc.[Definition] FROM sys.tables t INNER JOIN sys.default_constraints dc ON t.object_id = dc.parent_object_id INNER JOIN sys.columns c ON dc.parent_object_id = c.object_id AND c.column_id = dc.parent_column_id");
+            return items.Select(x => new Tuple<string, string, string, string>(x.TableName, x.ColumnName, x.Name, x.Definition));
+        }
+
+        public override IEnumerable<string> GetTablesInSchema(Database db)
+        {
+            var items = db.Fetch<dynamic>("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES");
+            return items.Select(x => x.TABLE_NAME).Cast<string>().ToList();
+        }
+
+        public override IEnumerable<ColumnInfo> GetColumnsInSchema(Database db)
+        {
+            var items = db.Fetch<dynamic>("SELECT TABLE_NAME, COLUMN_NAME, ORDINAL_POSITION, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE FROM INFORMATION_SCHEMA.COLUMNS");
+            return
+                items.Select(
+                    item =>
+                    new ColumnInfo(item.TABLE_NAME, item.COLUMN_NAME, item.ORDINAL_POSITION, item.COLUMN_DEFAULT,
+                                   item.IS_NULLABLE, item.DATA_TYPE)).ToList();
+        }
+
+        public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
+        {
+            var items =
+                db.Fetch<dynamic>(
+                    "SELECT TABLE_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_TABLE_USAGE");
+            return items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME)).ToList();
+        }
+
+        public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
+        {
+            var items =
+                db.Fetch<dynamic>(
+                    "SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE");
+            return items.Select(item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME)).ToList();
+        }
+
+        public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
+        {
+            var items =
+                db.Fetch<dynamic>(
+                    @"select T.name as TABLE_NAME, I.name as INDEX_NAME, AC.Name as COLUMN_NAME,
+CASE WHEN I.is_unique_constraint = 1 OR  I.is_unique = 1 THEN 1 ELSE 0 END AS [UNIQUE]
+from sys.tables as T inner join sys.indexes as I on T.[object_id] = I.[object_id] 
+   inner join sys.index_columns as IC on IC.[object_id] = I.[object_id] and IC.[index_id] = I.[index_id] 
+   inner join sys.all_columns as AC on IC.[object_id] = AC.[object_id] and IC.[column_id] = AC.[column_id] 
+WHERE I.name NOT LIKE 'PK_%'
+order by T.name, I.name");
+            return items.Select(item => new Tuple<string, string, string, bool>(item.TABLE_NAME, item.INDEX_NAME, item.COLUMN_NAME,
+                item.UNIQUE == 1)).ToList();
+
+        }
+
+        public override bool DoesTableExist(Database db, string tableName)
+        {
+            var result =
+                db.ExecuteScalar<long>("SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = @TableName",
+                                       new { TableName = tableName });
+
+            return result > 0;
+        }
+
+        public override string FormatColumnRename(string tableName, string oldName, string newName)
+        {
+            return string.Format(RenameColumn, tableName, oldName, newName);
+        }
+
+        public override string FormatTableRename(string oldName, string newName)
+        {
+            return string.Format(RenameTable, oldName, newName);
+        }
+
+        protected override string FormatIdentity(ColumnDefinition column)
+        {
+            return column.IsIdentity ? GetIdentityString(column) : string.Empty;
+        }
+
+        public override Sql SelectTop(Sql sql, int top)
+        {
+            return new Sql(sql.SQL.Insert(sql.SQL.IndexOf(' '), " TOP " + top), sql.Arguments);
+        }
+
+        private static string GetIdentityString(ColumnDefinition column)
+        {
+            return "IDENTITY(1,1)";
+        }
+
+        protected override string FormatSystemMethods(SystemMethods systemMethod)
+        {
+            switch (systemMethod)
+            {
+                case SystemMethods.NewGuid:
+                    return "NEWID()";
+                case SystemMethods.CurrentDateTime:
+                    return "GETDATE()";
+                //case SystemMethods.NewSequentialId:
+                //    return "NEWSEQUENTIALID()";
+                //case SystemMethods.CurrentUTCDateTime:
+                //    return "GETUTCDATE()";
+            }
+
+            return null;
+        }
+
+        public override string DeleteDefaultConstraint
+        {
+            get { return "ALTER TABLE [{0}] DROP CONSTRAINT [DF_{0}_{1}]"; }
+        }
+
+
+        public override string DropIndex { get { return "DROP INDEX {0} ON {1}"; } }
+
+        public override string RenameColumn { get { return "sp_rename '{0}.{1}', '{2}', 'COLUMN'"; } }
+
+
+    }
+}
@@ -537,11 +537,10 @@ namespace Umbraco.Core.Persistence.SqlSyntax

        public virtual string CreateConstraint { get { return "ALTER TABLE {0} ADD CONSTRAINT {1} {2} ({3})"; } }
        public virtual string DeleteConstraint { get { return "ALTER TABLE {0} DROP CONSTRAINT {1}"; } }
-        
        public virtual string CreateForeignKeyConstraint { get { return "ALTER TABLE {0} ADD CONSTRAINT {1} FOREIGN KEY ({2}) REFERENCES {3} ({4}){5}{6}"; } }

        public virtual string ConvertIntegerToOrderableString { get { return "REPLACE(STR({0}, 8), SPACE(1), '0')"; } }
        public virtual string ConvertDateToOrderableString { get { return "CONVERT(nvarchar, {0}, 102)"; } }
        public virtual string ConvertDecimalToOrderableString { get { return "REPLACE(STR({0}, 20, 9), SPACE(1), '0')"; } }
    }
-}
+}
@@ -9,7 +9,13 @@ namespace Umbraco.Core.Persistence.SqlSyntax
        public static IEnumerable<DbIndexDefinition> GetDefinedIndexesDefinitions(this ISqlSyntaxProvider sql, Database db)
        {
            return sql.GetDefinedIndexes(db)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
        }

        /// <summary>
@@ -51,4 +57,4 @@ namespace Umbraco.Core.Persistence.SqlSyntax
        In,
        NotIn
    }
-}
+}
@@ -42,19 +42,18 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                return null;
            }

-            var isMultipleDataType = IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias);
-
            var selectedValues = (string[]) source;
-            
            if (selectedValues.Any())
            {
-                if (isMultipleDataType)
+                if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias))
+                {
                    return selectedValues;
+                }

                return selectedValues.First();
            }

-            return isMultipleDataType ? source : string.Empty;
+            return source;
        }

        public Type GetPropertyValueType(PublishedPropertyType propertyType)
@@ -1,10 +1,8 @@
 using System;
 using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -460,23 +458,5 @@ namespace Umbraco.Core.Security

            return ticket;
        }
-
-        /// <summary>
-        /// Ensures that the thread culture is set based on the back office user's culture
-        /// </summary>
-        /// <param name="identity"></param>
-        internal static void EnsureCulture(this IIdentity identity)
-        {
-            if (identity is UmbracoBackOfficeIdentity umbIdentity && umbIdentity.IsAuthenticated)
-            {
-                Thread.CurrentThread.CurrentUICulture =
-                    Thread.CurrentThread.CurrentCulture =
-                        UserCultures.GetOrAdd(umbIdentity.Culture, s => new CultureInfo(s));
-            }
-        }
-        /// <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>();
    }
-}
+}
@@ -102,8 +102,7 @@ namespace Umbraco.Core.Security
        /// <returns/>
        public override async Task ValidateIdentity(CookieValidateIdentityContext context)
        {
-            //ensure the thread culture is set
-            context?.Identity?.EnsureCulture();
+            EnsureCulture(context);

            await EnsureValidSessionId(context);

@@ -121,5 +120,21 @@ namespace Umbraco.Core.Security
            if (_appCtx.IsConfigured && _appCtx.IsUpgrading == false)
                await SessionIdValidator.ValidateSessionAsync(TimeSpan.FromMinutes(1), context);
        }
+
+        private void EnsureCulture(CookieValidateIdentityContext context)
+        {
+            var umbIdentity = context.Identity as UmbracoBackOfficeIdentity;
+            if (umbIdentity != null && umbIdentity.IsAuthenticated)
+            {
+                Thread.CurrentThread.CurrentCulture =
+                    Thread.CurrentThread.CurrentUICulture =
+                        UserCultures.GetOrAdd(umbIdentity.Culture, s => new CultureInfo(s));
+            }
+        }
+
+        /// <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>();
    }
-}
+}
@@ -236,10 +236,7 @@ namespace Umbraco.Core.Security

            if (dataProtectionProvider != null)
            {
-                manager.UserTokenProvider = new DataProtectorTokenProvider<T, int>(dataProtectionProvider.Create("ASP.NET Identity"))
-                {
-                    TokenLifespan = TimeSpan.FromDays(3)
-                };
+                manager.UserTokenProvider = new DataProtectorTokenProvider<T, int>(dataProtectionProvider.Create("ASP.NET Identity"));
            }

            manager.UserLockoutEnabledByDefault = true;
@@ -751,7 +748,6 @@ namespace Umbraco.Core.Security
            var httpContext = HttpContext.Current == null ? (HttpContextBase)null : new HttpContextWrapper(HttpContext.Current);
            return httpContext.GetCurrentRequestIpAddress();
        }
-
    }

 }
@@ -630,9 +630,7 @@ namespace Umbraco.Core.Security
                || identityUser.LastLoginDateUtc.HasValue && user.LastLoginDate.ToUniversalTime() != identityUser.LastLoginDateUtc.Value)
            {
                anythingChanged = true;
-                //if the LastLoginDate is being set to MinValue, don't convert it ToLocalTime
-                var dt = identityUser.LastLoginDateUtc == DateTime.MinValue ? DateTime.MinValue : identityUser.LastLoginDateUtc.Value.ToLocalTime();
-                user.LastLoginDate = dt;
+                user.LastLoginDate = identityUser.LastLoginDateUtc.Value.ToLocalTime();
            }
            if (identityUser.IsPropertyDirty("LastPasswordChangeDateUtc")
                || (user.LastPasswordChangeDate != default(DateTime) && identityUser.LastPasswordChangeDateUtc.HasValue == false)
@@ -720,7 +720,7 @@ namespace Umbraco.Core.Security
                    }
                    else
                    {
-                        //if the salt bytes is too short for the required key length for the algorithm, extend it
+                        //if the salt bytes is too long for the required key length for the algorithm, extend it
                        var numArray2 = new byte[keyedHashAlgorithm.Key.Length];
                        var dstOffset = 0;
                        while (dstOffset < numArray2.Length)
@@ -963,4 +963,4 @@ namespace Umbraco.Core.Security
        }

    }
-}
+}
@@ -2060,15 +2060,12 @@ namespace Umbraco.Core.Services
            using (new WriteLock(Locker))
            {
                var allContent = GetByIds(ids).ToDictionary(x => x.Id, x => x);
-                if (allContent.Any() == false)
-                {
-                    return false;
-                }
-                var items = ids.Select(x => allContent[x]).ToArray();
+                var items = ids.Select(x => allContent[x]);

                using (var uow = UowProvider.GetUnitOfWork())
                {
-                    var saveEventArgs = new SaveEventArgs<IContent>(items);
+                    var asArray = items.ToArray();
+                    var saveEventArgs = new SaveEventArgs<IContent>(asArray);
                    if (raiseEvents && uow.Events.DispatchCancelable(Saving, this, saveEventArgs, "Saving"))
                    {
                        uow.Commit();
@@ -2078,7 +2075,7 @@ namespace Umbraco.Core.Services
                    var repository = RepositoryFactory.CreateContentRepository(uow);

                    var i = 0;
-                    foreach (var content in items)
+                    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
@@ -2125,7 +2122,7 @@ namespace Umbraco.Core.Services
                        _publishingStrategy.PublishingFinalized(uow, shouldBePublished, false);
                    }

-                    Audit(uow, AuditType.Sort, "Sort child items performed by user", userId, items.First().ParentId);
+                    Audit(uow, AuditType.Sort, "Sorting content performed by user", userId, 0);
                    uow.Commit();
                }
            }
@@ -49,7 +49,7 @@ namespace Umbraco.Core.Services
        private Dictionary<string, IContentType> _importedContentTypes;
        private IPackageInstallation _packageInstallation;
        private readonly IUserService _userService;
-        private static HttpClient _httpClient;
+

        public PackagingService(
            ILogger logger,
@@ -89,6 +89,7 @@ namespace Umbraco.Core.Services
        /// <returns></returns>
        public string FetchPackageFile(Guid packageId, Version umbracoVersion, int userId)
        {
+            using (var httpClient = new HttpClient())
            using (var uow = _uowProvider.GetUnitOfWork())
            {
                //includeHidden = true because we don't care if it's hidden we want to get the file regardless
@@ -96,11 +97,7 @@ namespace Umbraco.Core.Services
                byte[] bytes;
                try
                {
-                    if (_httpClient == null)
-                    {
-                        _httpClient = new HttpClient();
-                    }
-                    bytes = _httpClient.GetByteArrayAsync(url).GetAwaiter().GetResult();
+                    bytes = httpClient.GetByteArrayAsync(url).GetAwaiter().GetResult();
                }
                catch (HttpRequestException ex)
                {
@@ -1749,7 +1746,7 @@ namespace Umbraco.Core.Services

        internal InstallationSummary InstallPackage(string packageFilePath, int userId = 0, bool raiseEvents = false)
        {
-            var metaData = GetPackageMetaData(packageFilePath);
+            var metaData = GetPackageMetaData(packageFilePath);

            if (raiseEvents)
            {                
@@ -77,7 +77,7 @@ namespace Umbraco.Core.Services
                regs = xr.Repository.GetAll().ToArray();

                // default role is single server, but if registrations contain more
-                // than one active server, then role is master or replica
+                // than one active server, then role is master or slave
                _currentServerRole = regs.Count(x => x.IsActive) > 1
                    ? (server.IsMaster ? ServerRole.Master : ServerRole.Slave)
                    : ServerRole.Single;
@@ -175,4 +175,4 @@ namespace Umbraco.Core.Services
            return _currentServerRole;
        }
    }
-}
+}
@@ -699,7 +699,7 @@ namespace Umbraco.Core.Services
            using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
            {
                var repository = RepositoryFactory.CreateUserRepository(uow);
-                return repository.GetPagedResultsByQuery(null, pageIndex, pageSize, out totalRecords, member => member.Name);
+                return repository.GetPagedResultsByQuery(null, pageIndex, pageSize, out totalRecords, member => member.Username);
            }
        }

@@ -1574,29 +1574,5 @@ namespace Umbraco.Core
            guid[left] = guid[right];
            guid[right] = temp;
        }
-        
-        /// <summary>
-        /// Converts a file name to a friendly name for a content item
-        /// </summary>
-        /// <param name="fileName"></param>
-        /// <returns></returns>
-        public static string ToFriendlyName(this string fileName)
-        {
-            // strip the file extension
-            fileName = fileName.StripFileExtension();
-
-            // underscores and dashes to spaces
-            fileName = fileName.ReplaceMany(new[] { '_', '-' }, ' ');
-
-            // any other conversions ?
-
-            // Pascalcase (to be done last)
-            fileName = System.Threading.Thread.CurrentThread.CurrentCulture.TextInfo.ToTitleCase(fileName);
-
-            // Replace multiple consecutive spaces with a single space
-            fileName = string.Join(" ", fileName.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries));
-
-            return fileName;
-        }
    }
 }
@@ -51,9 +51,10 @@ namespace Umbraco.Core.Sync
            if (request != null)
            {
                var applicationUrl = GetApplicationUrlFromRequest(request);
-                newApplicationUrl = appContext._umbracoApplicationDomains.TryAdd(applicationUrl, applicationUrl);
+                newApplicationUrl = !appContext._umbracoApplicationDomains.Contains(applicationUrl);
                if (newApplicationUrl)
                {
+                    appContext._umbracoApplicationDomains.Add(applicationUrl);
                    LogHelper.Info(typeof(ApplicationUrlHelper), string.Format("New ApplicationUrl detected: {0}", applicationUrl));
                }
            }
@@ -16,7 +16,7 @@ namespace Umbraco.Core.Sync
        Single = 1,

        /// <summary>
-        /// In a multi-servers environment, the server is a replica server.
+        /// In a multi-servers environment, the server is a slave server.
        /// </summary>
        Slave = 2,

@@ -25,4 +25,4 @@ namespace Umbraco.Core.Sync
        /// </summary>
        Master = 3
    }
-}
+}
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,8 +45,8 @@
    <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>
    </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.7\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>
@@ -365,11 +365,6 @@
    <Compile Include="IEmailSender.cs" />
    <Compile Include="IHttpContextAccessor.cs" />
    <Compile Include="Logging\RollingFileCleanupAppender.cs" />
-    <Compile Include="Media\Exif\SVGFile.cs" />
-    <Compile Include="Media\TypeDetector\JPEGDetector.cs" />
-    <Compile Include="Media\TypeDetector\RasterizedTypeDetector.cs" />
-    <Compile Include="Media\TypeDetector\SVGDetector.cs" />
-    <Compile Include="Media\TypeDetector\TIFFDetector.cs" />
    <Compile Include="Models\AuditEntry.cs" />
    <Compile Include="Models\Consent.cs" />
    <Compile Include="Models\ConsentExtensions.cs" />
@@ -572,8 +567,8 @@
    <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\TargetVersionSevenTwelveZero\RenameTrueFalseField.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\SetDefaultTagsStorageType.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\RenameTrueFalseField.cs" />	
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\SetDefaultTagsStorageType.cs" />      
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenNineZero\AddUmbracoAuditTable.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenNineZero\AddUmbracoConsentTable.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenNineZero\AddIsSensitiveMemberTypeColumn.cs" />
@@ -643,7 +638,7 @@
    <Compile Include="Media\Exif\TIFFStrip.cs" />
    <Compile Include="Media\Exif\Utility.cs" />
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeOne\UpdateUserLanguagesToIsoCode.cs" />
-    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\IncreaseLanguageIsoCodeColumnLength.cs" />
+    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\IncreaseLanguageIsoCodeColumnLength.cs" />      
    <Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenTwelveZero\UpdateUmbracoConsent.cs" />
    <Compile Include="Persistence\PocoDataDataReader.cs" />
    <Compile Include="Persistence\Querying\CachedExpression.cs" />
@@ -1693,4 +1688,4 @@
  <Target Name="AfterBuild">
  </Target>
  -->
-</Project>
+</Project>
@@ -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.7" 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" />
@@ -129,7 +129,7 @@ namespace Umbraco.Tests
        public void SetApplicationUrlFromDcSettingsSsl2()
        {
            // set from distributed call settings
-            // other servers are replica servers
+            // other servers are slave servers

            var settings = Mock.Of<IUmbracoSettingsSection>(section =>
                section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Enabled == true && callSection.Servers == new IServer[]
@@ -224,7 +224,7 @@ namespace Umbraco.Tests
        [Test]
        public void ServerRoleUnknown2()
        {
-            // distributed call enabled, cannot find server, assume it's an undeclared replica
+            // distributed call enabled, cannot find server, assume it's an undeclared slave

            var settings = Mock.Of<IUmbracoSettingsSection>(section =>
                section.DistributedCall == Mock.Of<IDistributedCallSection>(callSection => callSection.Enabled == true && callSection.Servers == new IServer[]
@@ -301,4 +301,4 @@ namespace Umbraco.Tests
            Assert.AreEqual("httpx://whatever.com/umbraco", appCtx._umbracoApplicationUrl);
        }
    }
-}
+}
@@ -23,12 +23,6 @@ namespace Umbraco.Tests.Configurations.UmbracoSettings
            Assert.IsTrue(SettingsSection.WebRouting.DisableAlternativeTemplates == false);
        }

-        [Test]
-        public void ValidateAlternativeTemplates()
-        {
-            Assert.IsTrue(SettingsSection.WebRouting.ValidateAlternativeTemplates == false);
-        }
-
        [Test]
        public void DisableFindContentByIdPath()
        {
@@ -66,46 +66,6 @@ namespace Umbraco.Tests.Persistence.Repositories
            }
        }

-        [Test]
-        public void Get_Paged_Items_By_User_Id_With_Query_And_Filter()
-        {
-            var provider = new PetaPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
-            {
-                for (int i = 0; i < 100; i++)
-                {
-                    repo.AddOrUpdate(new AuditItem(i, string.Format("Content {0} created", i), AuditType.New, 0));
-                    repo.AddOrUpdate(new AuditItem(i, string.Format("Content {0} published", i), AuditType.Publish, 0));
-                }
-                unitOfWork.Commit();
-            }
-
-            using (var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
-            {
-                var query = Query<IAuditItem>.Builder.Where(x => x.UserId == 0);
-
-                try
-                {
-                    DatabaseContext.Database.EnableSqlTrace = true;
-                    DatabaseContext.Database.EnableSqlCount();
-
-                    var page = repo.GetPagedResultsByQuery(query, 0, 10, out var total, Direction.Descending,
-                            new[] { AuditType.Publish },
-                            Query<IAuditItem>.Builder.Where(x => x.UserId > -1));
-
-                    Assert.AreEqual(10, page.Count());
-                    Assert.AreEqual(100, total);
-                }
-                finally
-                {
-                    DatabaseContext.Database.EnableSqlTrace = false;
-                    DatabaseContext.Database.DisableSqlCount();
-                }
-            }
-        }
-
-
        [Test]
        public void Get_Paged_Items_With_AuditType_Filter()
        {
@@ -123,24 +83,14 @@ namespace Umbraco.Tests.Persistence.Repositories

            using (var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
            {
-                try
-                {
-                    DatabaseContext.Database.EnableSqlTrace = true;
-                    DatabaseContext.Database.EnableSqlCount();
+                long total;
+                var page = repo.GetPagedResultsByQuery(Query<IAuditItem>.Builder, 0, 9, out total, Direction.Descending,
+                        new[] {AuditType.Publish}, null)
+                    .ToArray();

-                    var page = repo.GetPagedResultsByQuery(Query<IAuditItem>.Builder, 0, 9, out var total, Direction.Descending,
-                                new[] { AuditType.Publish }, null)
-                            .ToArray();
-
-                    Assert.AreEqual(9, page.Length);
-                    Assert.IsTrue(page.All(x => x.AuditType == AuditType.Publish));
-                    Assert.AreEqual(100, total);
-                }
-                finally
-                {
-                    DatabaseContext.Database.EnableSqlTrace = false;
-                    DatabaseContext.Database.DisableSqlCount();
-                }
+                Assert.AreEqual(9, page.Length);
+                Assert.IsTrue(page.All(x => x.AuditType == AuditType.Publish));
+                Assert.AreEqual(100, total);
            }
        }

@@ -161,25 +111,15 @@ namespace Umbraco.Tests.Persistence.Repositories

            using (var repo = new AuditRepository(unitOfWork, CacheHelper, Logger, SqlSyntax))
            {
-                try
-                {
-                    DatabaseContext.Database.EnableSqlTrace = true;
-                    DatabaseContext.Database.EnableSqlCount();
+                long total;
+                var page = repo.GetPagedResultsByQuery(Query<IAuditItem>.Builder, 0, 8, out total, Direction.Descending,
+                        null, Query<IAuditItem>.Builder.Where(item => item.Comment == "Content created"))
+                    .ToArray();

-                    var page = repo.GetPagedResultsByQuery(Query<IAuditItem>.Builder, 0, 8, out var total, Direction.Descending,
-                                null, Query<IAuditItem>.Builder.Where(item => item.Comment == "Content created"))
-                            .ToArray();
-
-                    Assert.AreEqual(8, page.Length);
-                    Assert.IsTrue(page.All(x => x.Comment == "Content created"));
-                    Assert.AreEqual(100, total);
-                }
-                finally
-                {
-                    DatabaseContext.Database.EnableSqlTrace = false;
-                    DatabaseContext.Database.DisableSqlCount();
-                }
+                Assert.AreEqual(8, page.Length);
+                Assert.IsTrue(page.All(x => x.Comment == "Content created"));
+                Assert.AreEqual(100, total);
            }
        }
    }
-}
+}
@@ -6,7 +6,6 @@ using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.IO;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
@@ -393,71 +392,7 @@ namespace Umbraco.Tests.Persistence.Repositories
                var result = repository.Count(query);

                // Assert
-                Assert.AreEqual(2, result);
-            }
-        }
-
-        [Test]
-        public void Can_Get_Paged_Results_By_Query_And_Filter_And_Groups()
-        {
-            // Arrange
-            var provider = new PetaPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
-            {
-                var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
-                var query = Query<IUser>.Builder.Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
-
-                try
-                {
-                    DatabaseContext.Database.EnableSqlTrace = true;
-                    DatabaseContext.Database.EnableSqlCount();
-
-                    // Act
-                    var result = repository.GetPagedResultsByQuery(query, 0, 10, out var totalRecs, user => user.Id, Direction.Ascending,
-                            excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
-                            filter: Query<IUser>.Builder.Where(x => x.Id > -1));
-
-                    // Assert
-                    Assert.AreEqual(2, totalRecs);
-                }
-                finally
-                {
-                    DatabaseContext.Database.EnableSqlTrace = false;
-                    DatabaseContext.Database.DisableSqlCount();
-                }
-            }
-        }
-
-        [Test]
-        public void Can_Get_Paged_Results_With_Filter_And_Groups()
-        {
-            // Arrange
-            var provider = new PetaPocoUnitOfWorkProvider(Logger);
-            var unitOfWork = provider.GetUnitOfWork();
-            using (var repository = CreateRepository(unitOfWork))
-            {
-                var users = CreateAndCommitMultipleUsers(repository, unitOfWork);
-
-                try
-                {
-                    DatabaseContext.Database.EnableSqlTrace = true;
-                    DatabaseContext.Database.EnableSqlCount();
-
-                    // Act
-                    var result = repository.GetPagedResultsByQuery(null, 0, 10, out var totalRecs, user => user.Id, Direction.Ascending,
-                        includeUserGroups: new[] { Constants.Security.AdminGroupAlias, Constants.Security.SensitiveDataGroupAlias },
-                        excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
-                        filter: Query<IUser>.Builder.Where(x => x.Id == 0));
-
-                    // Assert
-                    Assert.AreEqual(1, totalRecs);
-                }
-                finally
-                {
-                    DatabaseContext.Database.EnableSqlTrace = false;
-                    DatabaseContext.Database.DisableSqlCount();
-                }
+                Assert.That(result, Is.GreaterThanOrEqualTo(2));
            }
        }

@@ -504,4 +439,4 @@ namespace Umbraco.Tests.Persistence.Repositories
            return new IUser[] { user1, user2, user3 };
        }
    }
-}
+}
@@ -288,29 +288,6 @@ namespace Umbraco.Tests.Services
            Assert.AreEqual(2, membersInRole.Count());
        }

-        [Test]
-        public void Associate_Members_To_Roles_With_Member_Id_Casing()
-        {
-            ServiceContext.MemberService.AddRole("MyTestRole1");
-
-            IMemberType memberType = MockedContentTypes.CreateSimpleMemberType();
-            ServiceContext.MemberTypeService.Save(memberType);
-            var member1 = MockedMember.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            ServiceContext.MemberService.Save(member1);
-            var member2 = MockedMember.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            ServiceContext.MemberService.Save(member2);
-
-            // temp make sure they exist
-            Assert.IsNotNull(ServiceContext.MemberService.GetById(member1.Id));
-            Assert.IsNotNull(ServiceContext.MemberService.GetById(member2.Id));
-
-            ServiceContext.MemberService.AssignRoles(new[] { member1.Id, member2.Id }, new[] { "mytestrole1" });
-
-            var membersInRole = ServiceContext.MemberService.GetMembersInRole("MyTestRole1");
-
-            Assert.AreEqual(2, membersInRole.Count());
-        }
-
        [Test]
        public void Associate_Members_To_Roles_With_Member_Username()
        {
@@ -1202,4 +1179,4 @@ namespace Umbraco.Tests.Services
        }

    }
-}
+}
--- a/Show More
+++ b/Show More