Merge branch 'v8/contrib' into pr/7003

.gitattributes

@@ -13,7 +13,7 @@
 *.png 	binary
 *.gif 	binary
 
-*.cs text=auto diff=csharp 
+*.cs text=auto diff=csharp
 *.vb text=auto
 *.c text=auto
 *.cpp text=auto
@@ -41,9 +41,13 @@
 *.fs text=auto
 *.fsx text=auto
 *.hs text=auto
+*.json text=auto
+*.xml text=auto
 
-*.csproj text=auto merge=union 
-*.vbproj text=auto merge=union 
-*.fsproj text=auto merge=union 
-*.dbproj text=auto merge=union 
-*.sln text=auto eol=crlf merge=union 
+*.csproj text=auto merge=union
+*.vbproj text=auto merge=union
+*.fsproj text=auto merge=union
+*.dbproj text=auto merge=union
+*.sln text=auto eol=crlf merge=union
+
+*.gitattributes text=auto

.github/CONTRIBUTING.md

@@ -60,10 +60,10 @@ Great question! The short version goes like this:
 
   ![Clone the fork](img/clonefork.png)
   
-  * **Switch to the correct branch** - switch to the v8-dev branch
+  * **Switch to the correct branch** - switch to the `v8/contrib` branch
   * **Build** - build your fork of Umbraco locally as described in [building Umbraco from source code](BUILD.md)
   * **Change** - make your changes, experiment, have fun, explore and learn, and don't be afraid. We welcome all contributions and will [happily give feedback](#questions)
-  * **Commit** - done? Yay! 🎉 **Important:** create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`. When you have a branch, commit your changes. Don't commit to `v8/dev`, create a new branch first.
+  * **Commit** - done? Yay! 🎉 **Important:** create a new branch now and name it after the issue you're fixing, we usually follow the format: `temp-12345`. This means it's a temporary branch for the particular issue you're working on, in this case `12345`. When you have a branch, commit your changes. Don't commit to `v8/contrib`, create a new branch first.
   * **Push** - great, now you can push the changes up to your fork on GitHub
   * **Create pull request** - exciting! You're ready to show us your changes (or not quite ready, you just need some feedback to progress - you can now make use of GitHub's draft pull request status, detailed [here] (https://github.blog/2019-02-14-introducing-draft-pull-requests/)). GitHub has picked up on the new branch you've pushed and will offer to create a Pull Request. Click that green button and away you go.
 
@@ -158,7 +158,7 @@ To find the general areas for something you're looking to fix or improve, have a
 
 ### Which branch should I target for my contributions?
 
-We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `v8/dev`. If you are working on v8, this is the branch you should be targetting. For v7 contributions, please target 'v7/dev'. 
+We like to use [Gitflow as much as possible](https://jeffkreeftmeijer.com/git-flow/), but don't worry if you are not familiar with it. The most important thing you need to know is that when you fork the Umbraco repository, the default branch is set to something, usually `v8/contrib`. If you are working on v8, this is the branch you should be targetting. For v7 contributions, please target 'v7/dev'. 
 
 Please note: we are no longer accepting features for v7 but will continue to merge bug fixes as and when they arise.
 
@@ -184,10 +184,10 @@ Then when you want to get the changes from the main repository:
 
 ```
 git fetch upstream
-git rebase upstream/v8/dev
+git rebase upstream/v8/contrib
 ```
 
-In this command we're syncing with the `v8/dev` branch, but you can of course choose another one if needed.
+In this command we're syncing with the `v8/contrib` 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))
 

.github/README.md

@@ -1,4 +1,4 @@
-# [Umbraco CMS](https://umbraco.com) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](../LICENSE.md) [![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=v8/dev)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) [![Twitter](https://img.shields.io/twitter/follow/umbraco.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=umbraco)
+# [Umbraco CMS](https://umbraco.com) · [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](../LICENSE.md) [![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=v8/contrib)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md) [![Twitter](https://img.shields.io/twitter/follow/umbraco.svg?style=social&label=Follow)](https://twitter.com/intent/follow?screen_name=umbraco)
 
 Umbraco is the friendliest, most flexible and fastest growing ASP.NET CMS, and used by more than 500,000 websites worldwide. Our mission is to help you deliver delightful digital experiences by making Umbraco friendly, simpler and social.
 

.gitignore

@@ -55,6 +55,7 @@ App_Data/TEMP/*
 src/Umbraco.Web.UI/[Cc]ss/*
 src/Umbraco.Web.UI/App_Code/*
 src/Umbraco.Web.UI/App_Data/*
+src/Umbraco.Web.UI/data/*
 src/Umbraco.Tests/App_Data/*
 src/Umbraco.Web.UI/[Mm]edia/*
 src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*

build/NuSpecs/UmbracoCms.Web.nuspec

@@ -28,7 +28,7 @@
                 <dependency id="ClientDependency" version="[1.9.8,1.999999)" />
                 <dependency id="ClientDependency-Mvc5" version="[1.9.3,1.999999)" />
                 <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.1,1.999999)" />
+                <dependency id="Examine" version="[1.0.2,1.999999)" />
                 <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
                 <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
                 <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />
@@ -52,14 +52,17 @@
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.dll" target="lib\net472\Umbraco.Web.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.dll" target="lib\net472\Umbraco.Web.UI.dll" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.dll" target="lib\net472\Umbraco.Examine.dll" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.dll" target="lib\net472\Umbraco.ModelsBuilder.Embedded.dll" />
 
         <!-- docs -->
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.xml" target="lib\net472\Umbraco.Web.xml" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Web.UI.xml" target="lib\net472\Umbraco.Web.UI.xml" />
         <file src="$BuildTmp$\WebApp\bin\Umbraco.Examine.xml" target="lib\net472\Umbraco.Examine.xml" />
+        <file src="$BuildTmp$\WebApp\bin\Umbraco.ModelsBuilder.Embedded.xml" target="lib\net472\Umbraco.ModelsBuilder.Embedded.xml" />
 
         <!-- symbols -->
         <file src="$BuildTmp$\bin\Umbraco.Web.pdb" target="lib\net472\Umbraco.Web.pdb" />
         <file src="$BuildTmp$\bin\Umbraco.Examine.pdb" target="lib\net472\Umbraco.Examine.pdb" />
+        <file src="$BuildTmp$\bin\Umbraco.ModelsBuilder.Embedded.pdb" target="lib\net472\Umbraco.ModelsBuilder.Embedded.pdb" />
     </files>
 </package>

build/NuSpecs/UmbracoCms.nuspec

@@ -26,7 +26,6 @@
                   not want this to happen as the alpha of the next major is, really, the next major already.
                 -->
                 <dependency id="Microsoft.AspNet.SignalR.Core" version="[2.4.0, 2.999999)" />
-                <dependency id="Umbraco.ModelsBuilder.Ui" version="[8.1.0]" />
                 <dependency id="ImageProcessor.Web" version="[4.10.0.100,4.999999)" />
                 <dependency id="ImageProcessor.Web.Config" version="[2.5.0.100,2.999999)" />
                 <dependency id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="[2.0.1,2.999999)" />

build/build.ps1

@@ -456,10 +456,10 @@
   $ubuild.DefineMethod("PrepareAngularDocs",
   {
     Write-Host "Prepare Angular Documentation"
-    
+
     $src = "$($this.SolutionRoot)\src"
     $out = $this.BuildOutput
-	  
+
     "Moving to Umbraco.Web.UI.Docs folder"
     cd ..\src\Umbraco.Web.UI.Docs
 

src/SolutionInfo.cs

@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.6.0")]
-[assembly: AssemblyInformationalVersion("8.6.0")]
+[assembly: AssemblyFileVersion("8.7.0")]
+[assembly: AssemblyInformationalVersion("8.7.0")]

src/Umbraco.Core/Compose/RelateOnCopyComponent.cs

@@ -26,10 +26,11 @@ namespace Umbraco.Core.Compose
 
             if (relationType == null)
             {
-                relationType = new RelationType(Constants.ObjectTypes.Document,
+                relationType = new RelationType(Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias,
+                    Constants.Conventions.RelationTypes.RelateDocumentOnCopyName,
+                    true,
                     Constants.ObjectTypes.Document,
-                    Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias,
-                    Constants.Conventions.RelationTypes.RelateDocumentOnCopyName) { IsBidirectional = true };
+                    Constants.ObjectTypes.Document);
 
                 relationService.Save(relationType);
             }

src/Umbraco.Core/Compose/RelateOnTrashComponent.cs

@@ -63,7 +63,7 @@ namespace Umbraco.Core.Compose
                 var documentObjectType = Constants.ObjectTypes.Document;
                 const string relationTypeName = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName;
 
-                relationType = new RelationType(documentObjectType, documentObjectType, relationTypeAlias, relationTypeName);
+                relationType = new RelationType(relationTypeName, relationTypeAlias, false, documentObjectType, documentObjectType);
                 relationService.Save(relationType);
             }
 
@@ -106,7 +106,7 @@ namespace Umbraco.Core.Compose
             {
                 var documentObjectType = Constants.ObjectTypes.Document;
                 const string relationTypeName = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName;
-                relationType = new RelationType(documentObjectType, documentObjectType, relationTypeAlias, relationTypeName);
+                relationType = new RelationType(relationTypeName, relationTypeAlias, false, documentObjectType, documentObjectType);
                 relationService.Save(relationType);
             }
             foreach (var item in e.MoveInfoCollection)

src/Umbraco.Core/Composing/ComponentCollection.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Core.Logging;
 
@@ -43,8 +44,15 @@ namespace Umbraco.Core.Composing
                     var componentType = component.GetType();
                     using (_logger.DebugDuration<ComponentCollection>($"Terminating {componentType.FullName}.", $"Terminated {componentType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
                     {
-                        component.Terminate();
-                        component.DisposeIfDisposable();
+                        try
+                        {
+                            component.Terminate();
+                            component.DisposeIfDisposable();
+                        }
+                        catch (Exception ex)
+                        {
+                            _logger.Error<ComponentCollection>(ex, "Error while terminating component {ComponentType}.", componentType.FullName);
+                        }
                     }
                 }
             }

src/Umbraco.Core/Composing/Composers.cs

@@ -18,19 +18,52 @@ namespace Umbraco.Core.Composing
         private readonly Composition _composition;
         private readonly IProfilingLogger _logger;
         private readonly IEnumerable<Type> _composerTypes;
+        private readonly IEnumerable<Attribute> _enableDisableAttributes;
 
         private const int LogThresholdMilliseconds = 100;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Composers"/> class.
+        /// Initializes a new instance of the <see cref="Composers" /> class.
         /// </summary>
         /// <param name="composition">The composition.</param>
-        /// <param name="composerTypes">The composer types.</param>
-        /// <param name="logger">A profiling logger.</param>
+        /// <param name="composerTypes">The <see cref="IComposer" /> types.</param>
+        /// <param name="logger">The profiling logger.</param>
+        [Obsolete("This overload only gets the EnableComposer/DisableComposer attributes from the composerTypes assemblies.")]
         public Composers(Composition composition, IEnumerable<Type> composerTypes, IProfilingLogger logger)
+            : this(composition, composerTypes, Enumerable.Empty<Attribute>(), logger)
+        {
+            var enableDisableAttributes = new List<Attribute>();
+
+            var assemblies = composerTypes.Select(t => t.Assembly).Distinct();
+            foreach (var assembly in assemblies)
+            {
+                enableDisableAttributes.AddRange(assembly.GetCustomAttributes(typeof(EnableComposerAttribute)));
+                enableDisableAttributes.AddRange(assembly.GetCustomAttributes(typeof(DisableComposerAttribute)));
+            }
+
+            _enableDisableAttributes = enableDisableAttributes;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Composers" /> class.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        /// <param name="composerTypes">The <see cref="IComposer" /> types.</param>
+        /// <param name="enableDisableAttributes">The <see cref="EnableComposerAttribute" /> and/or <see cref="DisableComposerAttribute" /> attributes.</param>
+        /// <param name="logger">The profiling logger.</param>
+        /// <exception cref="ArgumentNullException">composition
+        /// or
+        /// composerTypes
+        /// or
+        /// enableDisableAttributes
+        /// or
+        /// logger</exception>
+
+        public Composers(Composition composition, IEnumerable<Type> composerTypes, IEnumerable<Attribute> enableDisableAttributes, IProfilingLogger logger)
         {
             _composition = composition ?? throw new ArgumentNullException(nameof(composition));
             _composerTypes = composerTypes ?? throw new ArgumentNullException(nameof(composerTypes));
+            _enableDisableAttributes = enableDisableAttributes ?? throw new ArgumentNullException(nameof(enableDisableAttributes));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
@@ -103,7 +136,7 @@ namespace Umbraco.Core.Composing
                 .ToList();
 
             // enable or disable composers
-            EnableDisableComposers(composerTypeList);
+            EnableDisableComposers(_enableDisableAttributes, composerTypeList);
 
             void GatherInterfaces<TAttribute>(Type type, Func<TAttribute, Type> getTypeInAttribute, HashSet<Type> iset, List<Type> set2)
                 where TAttribute : Attribute
@@ -218,7 +251,7 @@ namespace Umbraco.Core.Composing
             return text.ToString();
         }
 
-        private static void EnableDisableComposers(ICollection<Type> types)
+        private static void EnableDisableComposers(IEnumerable<Attribute> enableDisableAttributes, ICollection<Type> types)
         {
             var enabled = new Dictionary<Type, EnableInfo>();
 
@@ -240,20 +273,16 @@ namespace Umbraco.Core.Composing
                 enableInfo.Weight = weight2;
             }
 
-            var assemblies = types.Select(x => x.Assembly).Distinct();
-            foreach (var assembly in assemblies)
+            foreach (var attr in enableDisableAttributes.OfType<EnableComposerAttribute>())
             {
-                foreach (var attr in assembly.GetCustomAttributes<EnableComposerAttribute>())
-                {
-                    var type = attr.EnabledType;
-                    UpdateEnableInfo(type, 2, enabled, true);
-                }
+                var type = attr.EnabledType;
+                UpdateEnableInfo(type, 2, enabled, true);
+            }
 
-                foreach (var attr in assembly.GetCustomAttributes<DisableComposerAttribute>())
-                {
-                    var type = attr.DisabledType;
-                    UpdateEnableInfo(type, 2, enabled, false);
-                }
+            foreach (var attr in enableDisableAttributes.OfType<DisableComposerAttribute>())
+            {
+                var type = attr.DisabledType;
+                UpdateEnableInfo(type, 2, enabled, false);
             }
 
             foreach (var composerType in types)

src/Umbraco.Core/Composing/Current.cs

@@ -154,6 +154,9 @@ namespace Umbraco.Core.Composing
         public static DataEditorCollection DataEditors
             => Factory.GetInstance<DataEditorCollection>();
 
+        public static DataValueReferenceFactoryCollection DataValueReferenceFactories
+            => Factory.GetInstance<DataValueReferenceFactoryCollection>();
+
         public static PropertyEditorCollection PropertyEditors
             => Factory.GetInstance<PropertyEditorCollection>();
 

src/Umbraco.Core/Composing/TypeLoader.cs

@@ -506,6 +506,49 @@ namespace Umbraco.Core.Composing
 
         #endregion
 
+        #region Get Assembly Attributes
+
+        /// <summary>
+        /// Gets the assembly attributes of the specified type <typeparamref name="T" />.
+        /// </summary>
+        /// <typeparam name="T">The attribute type.</typeparam>
+        /// <returns>
+        /// The assembly attributes of the specified type <typeparamref name="T" />.
+        /// </returns>
+        public IEnumerable<T> GetAssemblyAttributes<T>()
+            where T : Attribute
+        {
+            return AssembliesToScan.SelectMany(a => a.GetCustomAttributes<T>()).ToList();
+        }
+
+        /// <summary>
+        /// Gets all the assembly attributes.
+        /// </summary>
+        /// <returns>
+        /// All assembly attributes.
+        /// </returns>
+        public IEnumerable<Attribute> GetAssemblyAttributes()
+        {
+            return AssembliesToScan.SelectMany(a => a.GetCustomAttributes()).ToList();
+        }
+
+        /// <summary>
+        /// Gets the assembly attributes of the specified <paramref name="attributeTypes" />.
+        /// </summary>
+        /// <param name="attributeTypes">The attribute types.</param>
+        /// <returns>
+        /// The assembly attributes of the specified types.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">attributeTypes</exception>
+        public IEnumerable<Attribute> GetAssemblyAttributes(params Type[] attributeTypes)
+        {
+            if (attributeTypes == null) throw new ArgumentNullException(nameof(attributeTypes));
+
+            return AssembliesToScan.SelectMany(a => attributeTypes.SelectMany(at => a.GetCustomAttributes(at))).ToList();
+        }
+
+        #endregion
+
         #region Get Types
 
         /// <summary>

src/Umbraco.Core/CompositionExtensions.cs

@@ -49,6 +49,13 @@ namespace Umbraco.Core
         public static DataEditorCollectionBuilder DataEditors(this Composition composition)
             => composition.WithCollectionBuilder<DataEditorCollectionBuilder>();
 
+        /// <summary>
+        /// Gets the data value reference factory collection builder.
+        /// </summary>
+        /// <param name="composition">The composition.</param>
+        public static DataValueReferenceFactoryCollectionBuilder DataValueReferenceFactories(this Composition composition)
+            => composition.WithCollectionBuilder<DataValueReferenceFactoryCollectionBuilder>();
+
         /// <summary>
         /// Gets the property value converters collection builder.
         /// </summary>

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

@@ -0,0 +1,8 @@
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    public interface IKeepAliveSection : IUmbracoConfigurationSection
+    {
+        bool DisableKeepAliveTask { get; }
+        string KeepAlivePingUrl { get; }
+    }
+}

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

@@ -15,5 +15,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         ILoggingSection Logging { get; }
 
         IWebRoutingSection WebRouting { get; }
+
+        IKeepAliveSection KeepAlive { get; }
     }
 }

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

@@ -0,0 +1,13 @@
+using System.Configuration;
+
+namespace Umbraco.Core.Configuration.UmbracoSettings
+{
+    internal class KeepAliveElement : ConfigurationElement, IKeepAliveSection
+    {
+        [ConfigurationProperty("disableKeepAliveTask", DefaultValue = "false")]
+        public bool DisableKeepAliveTask => (bool)base["disableKeepAliveTask"];
+
+        [ConfigurationProperty("keepAlivePingUrl", DefaultValue = "{umbracoApplicationUrl}/api/keepalive/ping")]
+        public string KeepAlivePingUrl => (string)base["keepAlivePingUrl"];
+    }
+}

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

@@ -19,10 +19,12 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         [ConfigurationProperty("logging")]
         internal LoggingElement Logging => (LoggingElement)this["logging"];
 
-
         [ConfigurationProperty("web.routing")]
         internal WebRoutingElement WebRouting => (WebRoutingElement)this["web.routing"];
 
+        [ConfigurationProperty("keepAlive")]
+        internal KeepAliveElement KeepAlive => (KeepAliveElement)this["keepAlive"];
+
         IContentSection IUmbracoSettingsSection.Content => Content;
 
         ISecuritySection IUmbracoSettingsSection.Security => Security;
@@ -34,5 +36,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
         ILoggingSection IUmbracoSettingsSection.Logging => Logging;
 
         IWebRoutingSection IUmbracoSettingsSection.WebRouting => WebRouting;
+
+        IKeepAliveSection IUmbracoSettingsSection.KeepAlive => KeepAlive;
     }
 }

src/Umbraco.Core/Constants-AppSettings.cs

@@ -9,6 +9,8 @@ namespace Umbraco.Core
         /// </summary>
         public static class AppSettings
         {
+            public const string MainDomLock = "Umbraco.Core.MainDom.Lock";
+
             // TODO: Kill me - still used in Umbraco.Core.IO.SystemFiles:27
             [Obsolete("We need to kill this appsetting as we do not use XML content cache umbraco.config anymore due to NuCache")]
             public const string ContentXML = "Umbraco.Core.ContentXML"; //umbracoContentXML
@@ -41,6 +43,21 @@ namespace Umbraco.Core
             /// </summary>
             public const string Path = "Umbraco.Core.Path";
 
+            /// <summary>
+            /// Gets the path to the css directory (/css by default).
+            /// </summary>
+            public const string CssPath = "umbracoCssPath";
+
+            /// <summary>
+            /// Gets the path to the scripts directory (/scripts by default).
+            /// </summary>
+            public const string ScriptsPath = "umbracoScriptsPath";
+
+            /// <summary>
+            /// Gets the path to  media directory (/media by default).
+            /// </summary>
+            public const string MediaPath = "umbracoMediaPath";
+
             /// <summary>
             /// The reserved urls from web.config.
             /// </summary>

src/Umbraco.Core/Constants-Conventions.cs

@@ -315,34 +315,65 @@ namespace Umbraco.Core
             public static class RelationTypes
             {
                 /// <summary>
-                /// ContentType name for default relation type "Relate Document On Copy".
+                /// Name for default relation type "Related Media".
+                /// </summary>
+                public const string RelatedMediaName = "Related Media";
+
+                /// <summary>
+                /// Alias for default relation type "Related Media"
+                /// </summary>
+                public const string RelatedMediaAlias = "umbMedia";
+
+                /// <summary>
+                /// Name for default relation type "Related Document".
+                /// </summary>
+                public const string RelatedDocumentName = "Related Document";
+
+                /// <summary>
+                /// Alias for default relation type "Related Document"
+                /// </summary>
+                public const string RelatedDocumentAlias = "umbDocument";
+
+                /// <summary>
+                /// Name for default relation type "Relate Document On Copy".
                 /// </summary>
                 public const string RelateDocumentOnCopyName = "Relate Document On Copy";
 
                 /// <summary>
-                /// ContentType alias for default relation type "Relate Document On Copy".
+                /// Alias for default relation type "Relate Document On Copy".
                 /// </summary>
                 public const string RelateDocumentOnCopyAlias = "relateDocumentOnCopy";
 
                 /// <summary>
-                /// ContentType name for default relation type "Relate Parent Document On Delete".
+                /// Name for default relation type "Relate Parent Document On Delete".
                 /// </summary>
                 public const string RelateParentDocumentOnDeleteName = "Relate Parent Document On Delete";
 
                 /// <summary>
-                /// ContentType alias for default relation type "Relate Parent Document On Delete".
+                /// Alias for default relation type "Relate Parent Document On Delete".
                 /// </summary>
                 public const string RelateParentDocumentOnDeleteAlias = "relateParentDocumentOnDelete";
 
                 /// <summary>
-                /// ContentType name for default relation type "Relate Parent Media Folder On Delete".
+                /// Name for default relation type "Relate Parent Media Folder On Delete".
                 /// </summary>
                 public const string RelateParentMediaFolderOnDeleteName = "Relate Parent Media Folder On Delete";
 
                 /// <summary>
-                /// ContentType alias for default relation type "Relate Parent Media Folder On Delete".
+                /// Alias for default relation type "Relate Parent Media Folder On Delete".
                 /// </summary>
                 public const string RelateParentMediaFolderOnDeleteAlias = "relateParentMediaFolderOnDelete";
+
+                /// <summary>
+                /// Returns the types of relations that are automatically tracked
+                /// </summary>
+                /// <remarks>
+                /// Developers should not manually use these relation types since they will all be cleared whenever an entity
+                /// (content, media or member) is saved since they are auto-populated based on property values.
+                /// </remarks>
+                public static string[] AutomaticRelationTypes = new[] { RelatedMediaAlias, RelatedDocumentAlias };
+
+                //TODO: return a list of built in types so we can use that to prevent deletion in the uI
             }
         }
     }

src/Umbraco.Core/ContentExtensions.cs

@@ -13,6 +13,7 @@ using Umbraco.Core.IO;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Models.Membership;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Services;
 using Umbraco.Core.Services.Implement;
 
@@ -23,6 +24,8 @@ namespace Umbraco.Core
         // this ain't pretty
         private static IMediaFileSystem _mediaFileSystem;
         private static IMediaFileSystem MediaFileSystem => _mediaFileSystem ?? (_mediaFileSystem = Current.MediaFileSystem);
+        private static readonly PropertyEditorCollection _propertyEditors;
+        private static PropertyEditorCollection PropertyEditors = _propertyEditors ?? (_propertyEditors = Current.PropertyEditors);
 
         #region IContent
 
@@ -162,14 +165,12 @@ namespace Umbraco.Core
             // Fixes https://github.com/umbraco/Umbraco-CMS/issues/3937 - Assigning a new file to an
             // existing IMedia with extension SetValue causes exception 'Illegal characters in path'
             string oldpath = null;
-            if (property.GetValue(culture, segment) is string svalue)
+            var value = property.GetValue(culture, segment);
+
+            if (PropertyEditors.TryGet(propertyTypeAlias, out var editor)
+                && editor is IDataEditorWithMediaPath dataEditor)
             {
-                if (svalue.DetectIsJson())
-                {
-                    // the property value is a JSON serialized image crop data set - grab the "src" property as the file source
-                    var jObject = JsonConvert.DeserializeObject<JObject>(svalue);
-                    svalue = jObject != null ? jObject.GetValueAsString("src") : svalue;
-                }
+                var svalue = dataEditor.GetMediaPath(value);
                 oldpath = MediaFileSystem.GetRelativePath(svalue);
             }
 

src/Umbraco.Core/ContentVariationExtensions.cs

@@ -12,121 +12,260 @@ namespace Umbraco.Core
         /// <summary>
         /// Determines whether the content type is invariant.
         /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type is invariant.
+        /// </returns>
         public static bool VariesByNothing(this ISimpleContentType contentType) => contentType.Variations.VariesByNothing();
 
-        /// <summary>
-        /// Determines whether the content type varies by culture.
-        /// </summary>
-        public static bool VariesByCulture(this ISimpleContentType contentType) => contentType.Variations.VariesByCulture();
-
         /// <summary>
         /// Determines whether the content type is invariant.
         /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type is invariant.
+        /// </returns>
         public static bool VariesByNothing(this IContentTypeBase contentType) => contentType.Variations.VariesByNothing();
 
-        /// <summary>
-        /// Determines whether the content type varies by culture.
-        /// </summary>
-        /// <remarks>And then it could also vary by segment.</remarks>
-        public static bool VariesByCulture(this IContentTypeBase contentType) => contentType.Variations.VariesByCulture();
-
-        /// <summary>
-        /// Determines whether the content type varies by segment.
-        /// </summary>
-        /// <remarks>And then it could also vary by culture.</remarks>
-        public static bool VariesBySegment(this IContentTypeBase contentType) => contentType.Variations.VariesBySegment();
-
-        /// <summary>
-        /// Determines whether the content type varies by culture and segment.
-        /// </summary>
-        public static bool VariesByCultureAndSegment(this IContentTypeBase contentType) => contentType.Variations.VariesByCultureAndSegment();
-
-        /// <summary>
-        /// Determines whether the property type is invariant.
-        /// </summary>
-        public static bool VariesByNothing(this PropertyType propertyType) => propertyType.Variations.VariesByNothing();
-
-        /// <summary>
-        /// Determines whether the property type varies by culture.
-        /// </summary>
-        /// <remarks>And then it could also vary by segment.</remarks>
-        public static bool VariesByCulture(this PropertyType propertyType) => propertyType.Variations.VariesByCulture();
-
-        /// <summary>
-        /// Determines whether the property type varies by segment.
-        /// </summary>
-        /// <remarks>And then it could also vary by culture.</remarks>
-        public static bool VariesBySegment(this PropertyType propertyType) => propertyType.Variations.VariesBySegment();
-
-        /// <summary>
-        /// Determines whether the property type varies by culture and segment.
-        /// </summary>
-        public static bool VariesByCultureAndSegment(this PropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();
-
         /// <summary>
         /// Determines whether the content type is invariant.
         /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type is invariant.
+        /// </returns>
         public static bool VariesByNothing(this IPublishedContentType contentType) => contentType.Variations.VariesByNothing();
 
         /// <summary>
-        /// Determines whether the content type varies by culture.
+        /// Determines whether the property type is invariant.
         /// </summary>
-        /// <remarks>And then it could also vary by segment.</remarks>
-        public static bool VariesByCulture(this IPublishedContentType contentType) => contentType.Variations.VariesByCulture();
-
-        /// <summary>
-        /// Determines whether the content type varies by segment.
-        /// </summary>
-        /// <remarks>And then it could also vary by culture.</remarks>
-        public static bool VariesBySegment(this IPublishedContentType contentType) => contentType.Variations.VariesBySegment();
-
-        /// <summary>
-        /// Determines whether the content type varies by culture and segment.
-        /// </summary>
-        public static bool VariesByCultureAndSegment(this IPublishedContentType contentType) => contentType.Variations.VariesByCultureAndSegment();
+        /// <param name="propertyType">The property type.</param>
+        /// <returns>
+        /// A value indicating whether the property type is invariant.
+        /// </returns>
+        public static bool VariesByNothing(this PropertyType propertyType) => propertyType.Variations.VariesByNothing();
 
         /// <summary>
         /// Determines whether the property type is invariant.
         /// </summary>
+        /// <param name="propertyType">The property type.</param>
+        /// <returns>
+        /// A value indicating whether the property type is invariant.
+        /// </returns>
         public static bool VariesByNothing(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesByNothing();
 
-        /// <summary>
-        /// Determines whether the property type varies by culture.
-        /// </summary>
-        public static bool VariesByCulture(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesByCulture();
-
-        /// <summary>
-        /// Determines whether the property type varies by segment.
-        /// </summary>
-        public static bool VariesBySegment(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesBySegment();
-
-        /// <summary>
-        /// Determines whether the property type varies by culture and segment.
-        /// </summary>
-        public static bool VariesByCultureAndSegment(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();
-
         /// <summary>
         /// Determines whether a variation is invariant.
         /// </summary>
+        /// <param name="variation">The variation.</param>
+        /// <returns>
+        /// A value indicating whether the variation is invariant.
+        /// </returns>
         public static bool VariesByNothing(this ContentVariation variation) => variation == ContentVariation.Nothing;
 
+        /// <summary>
+        /// Determines whether the content type varies by culture.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by culture.
+        /// </returns>
+        public static bool VariesByCulture(this ISimpleContentType contentType) => contentType.Variations.VariesByCulture();
+
+        /// <summary>
+        /// Determines whether the content type varies by culture.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by culture.
+        /// </returns>
+        public static bool VariesByCulture(this IContentTypeBase contentType) => contentType.Variations.VariesByCulture();
+
+        /// <summary>
+        /// Determines whether the content type varies by culture.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by culture.
+        /// </returns>
+        public static bool VariesByCulture(this IPublishedContentType contentType) => contentType.Variations.VariesByCulture();
+
+        /// <summary>
+        /// Determines whether the property type varies by culture.
+        /// </summary>
+        /// <param name="propertyType">The property type.</param>
+        /// <returns>
+        /// A value indicating whether the property type varies by culture.
+        /// </returns>
+        public static bool VariesByCulture(this PropertyType propertyType) => propertyType.Variations.VariesByCulture();
+
+        /// <summary>
+        /// Determines whether the property type varies by culture.
+        /// </summary>
+        /// <param name="propertyType">The property type.</param>
+        /// <returns>
+        /// A value indicating whether the property type varies by culture.
+        /// </returns>
+        public static bool VariesByCulture(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesByCulture();
+
         /// <summary>
         /// Determines whether a variation varies by culture.
         /// </summary>
-        /// <remarks>And then it could also vary by segment.</remarks>
+        /// <param name="variation">The variation.</param>
+        /// <returns>
+        /// A value indicating whether the variation varies by culture.
+        /// </returns>
         public static bool VariesByCulture(this ContentVariation variation) => (variation & ContentVariation.Culture) > 0;
 
+        /// <summary>
+        /// Determines whether the content type varies by segment.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by segment.
+        /// </returns>
+        public static bool VariesBySegment(this ISimpleContentType contentType) => contentType.Variations.VariesBySegment();
+
+        /// <summary>
+        /// Determines whether the content type varies by segment.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by segment.
+        /// </returns>
+        public static bool VariesBySegment(this IContentTypeBase contentType) => contentType.Variations.VariesBySegment();
+
+        /// <summary>
+        /// Determines whether the content type varies by segment.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by segment.
+        /// </returns>
+        public static bool VariesBySegment(this IPublishedContentType contentType) => contentType.Variations.VariesBySegment();
+
+        /// <summary>
+        /// Determines whether the property type varies by segment.
+        /// </summary>
+        /// <param name="propertyType">The property type.</param>
+        /// <returns>
+        /// A value indicating whether the property type varies by segment.
+        /// </returns>
+        public static bool VariesBySegment(this PropertyType propertyType) => propertyType.Variations.VariesBySegment();
+
+        /// <summary>
+        /// Determines whether the property type varies by segment.
+        /// </summary>
+        /// <param name="propertyType">The property type.</param>
+        /// <returns>
+        /// A value indicating whether the property type varies by segment.
+        /// </returns>
+        public static bool VariesBySegment(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesBySegment();
+
         /// <summary>
         /// Determines whether a variation varies by segment.
         /// </summary>
-        /// <remarks>And then it could also vary by culture.</remarks>
+        /// <param name="variation">The variation.</param>
+        /// <returns>
+        /// A value indicating whether the variation varies by segment.
+        /// </returns>
         public static bool VariesBySegment(this ContentVariation variation) => (variation & ContentVariation.Segment) > 0;
 
+        /// <summary>
+        /// Determines whether the content type varies by culture and segment.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by culture and segment.
+        /// </returns>
+        public static bool VariesByCultureAndSegment(this ISimpleContentType contentType) => contentType.Variations.VariesByCultureAndSegment();
+
+        /// <summary>
+        /// Determines whether the content type varies by culture and segment.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by culture and segment.
+        /// </returns>
+        public static bool VariesByCultureAndSegment(this IContentTypeBase contentType) => contentType.Variations.VariesByCultureAndSegment();
+
+        /// <summary>
+        /// Determines whether the content type varies by culture and segment.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <returns>
+        /// A value indicating whether the content type varies by culture and segment.
+        /// </returns>
+        public static bool VariesByCultureAndSegment(this IPublishedContentType contentType) => contentType.Variations.VariesByCultureAndSegment();
+
+        /// <summary>
+        /// Determines whether the property type varies by culture and segment.
+        /// </summary>
+        /// <param name="propertyType">The property type.</param>
+        /// <returns>
+        /// A value indicating whether the property type varies by culture and segment.
+        /// </returns>
+        public static bool VariesByCultureAndSegment(this PropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();
+
+        /// <summary>
+        /// Determines whether the property type varies by culture and segment.
+        /// </summary>
+        /// <param name="propertyType">The property type.</param>
+        /// <returns>
+        /// A value indicating whether the property type varies by culture and segment.
+        /// </returns>
+        public static bool VariesByCultureAndSegment(this IPublishedPropertyType propertyType) => propertyType.Variations.VariesByCultureAndSegment();
+
         /// <summary>
         /// Determines whether a variation varies by culture and segment.
         /// </summary>
+        /// <param name="variation">The variation.</param>
+        /// <returns>
+        /// A value indicating whether the variation varies by culture and segment.
+        /// </returns>
         public static bool VariesByCultureAndSegment(this ContentVariation variation) => (variation & ContentVariation.CultureAndSegment) == ContentVariation.CultureAndSegment;
 
+        /// <summary>
+        /// Sets or removes the content type variation depending on the specified value.
+        /// </summary>
+        /// <param name="contentType">The content type.</param>
+        /// <param name="variation">The variation to set or remove.</param>
+        /// <param name="value">If set to <c>true</c> sets the variation; otherwise, removes the variation.</param>
+        /// <remarks>
+        /// This method does not support setting the variation to nothing.
+        /// </remarks>
+        public static void SetVariesBy(this IContentTypeBase contentType, ContentVariation variation, bool value = true) => contentType.Variations = contentType.Variations.SetFlag(variation, value);
+
+        /// <summary>
+        /// Sets or removes the property type variation depending on the specified value.
+        /// </summary>
+        /// <param name="propertyType">The property type.</param>
+        /// <param name="variation">The variation to set or remove.</param>
+        /// <param name="value">If set to <c>true</c> sets the variation; otherwise, removes the variation.</param>
+        /// <remarks>
+        /// This method does not support setting the variation to nothing.
+        /// </remarks>
+        public static void SetVariesBy(this PropertyType propertyType, ContentVariation variation, bool value = true) => propertyType.Variations = propertyType.Variations.SetFlag(variation, value);
+
+        /// <summary>
+        /// Returns the variations with the variation set or removed depending on the specified value.
+        /// </summary>
+        /// <param name="variations">The existing variations.</param>
+        /// <param name="variation">The variation to set or remove.</param>
+        /// <param name="value">If set to <c>true</c> sets the variation; otherwise, removes the variation.</param>
+        /// <returns>
+        /// The variations with the variation set or removed.
+        /// </returns>
+        /// <remarks>
+        /// This method does not support setting the variation to nothing.
+        /// </remarks>
+        public static ContentVariation SetFlag(this ContentVariation variations, ContentVariation variation, bool value = true)
+        {
+            return value
+                ? variations | variation // Set flag using bitwise logical OR
+                : variations & ~variation; // Remove flag using bitwise logical AND with bitwise complement (reversing the bit)
+        }
+
         /// <summary>
         /// Validates that a combination of culture and segment is valid for the variation.
         /// </summary>
@@ -135,16 +274,18 @@ namespace Umbraco.Core
         /// <param name="segment">The segment.</param>
         /// <param name="exact">A value indicating whether to perform exact validation.</param>
         /// <param name="wildcards">A value indicating whether to support wildcards.</param>
-        /// <param name="throwIfInvalid">A value indicating whether to throw a <see cref="NotSupportedException"/> when the combination is invalid.</param>
-        /// <returns>True if the combination is valid; otherwise false.</returns>
+        /// <param name="throwIfInvalid">A value indicating whether to throw a <see cref="NotSupportedException" /> when the combination is invalid.</param>
+        /// <returns>
+        ///   <c>true</c> if the combination is valid; otherwise <c>false</c>.
+        /// </returns>
+        /// <exception cref="NotSupportedException">Occurs when the combination is invalid, and <paramref name="throwIfInvalid" /> is true.</exception>
         /// <remarks>
         /// <para>When validation is exact, the combination must match the variation exactly. For instance, if the variation is Culture, then
         /// a culture is required. When validation is not strict, the combination must be equivalent, or more restrictive: if the variation is
         /// Culture, an invariant combination is ok.</para>
         /// <para>Basically, exact is for one content type, or one property type, and !exact is for "all property types" of one content type.</para>
-        /// <para>Both <paramref name="culture"/> and <paramref name="segment"/> can be "*" to indicate "all of them".</para>
+        /// <para>Both <paramref name="culture" /> and <paramref name="segment" /> can be "*" to indicate "all of them".</para>
         /// </remarks>
-        /// <exception cref="NotSupportedException">Occurs when the combination is invalid, and <paramref name="throwIfInvalid"/> is true.</exception>
         public static bool ValidateVariation(this ContentVariation variation, string culture, string segment, bool exact, bool wildcards, bool throwIfInvalid)
         {
             culture = culture.NullOrWhiteSpaceAsNull();
@@ -161,13 +302,14 @@ namespace Umbraco.Core
             if (variation.VariesByCulture())
             {
                 // varies by culture
-                // in exact mode, the culture cannot be null                
+                // in exact mode, the culture cannot be null
                 if (exact && culture == null)
                 {
                     if (throwIfInvalid)
                         throw new NotSupportedException($"Culture may not be null because culture variation is enabled.");
+
                     return false;
-                }    
+                }
             }
             else
             {
@@ -178,9 +320,10 @@ namespace Umbraco.Core
                 {
                     if (throwIfInvalid)
                         throw new NotSupportedException($"Culture \"{culture}\" is invalid because culture variation is disabled.");
+
                     return false;
                 }
-            }          
+            }
 
             // if it does not vary by segment
             // the segment cannot have a value
@@ -190,6 +333,7 @@ namespace Umbraco.Core
             {
                 if (throwIfInvalid)
                     throw new NotSupportedException($"Segment \"{segment}\" is invalid because segment variation is disabled.");
+
                 return false;
             }
 

src/Umbraco.Core/EnumExtensions.cs

@@ -3,81 +3,42 @@
 namespace Umbraco.Core
 {
     /// <summary>
-    /// Provides extension methods to enums.
+    /// Provides extension methods to <see cref="Enum"/>.
     /// </summary>
     public static class EnumExtensions
     {
-        // note:
-        // - no need to HasFlagExact, that's basically an == test
-        // - HasFlagAll cannot be named HasFlag because ext. methods never take priority over instance methods
-
         /// <summary>
-        /// Determines whether a flag enum has all the specified values.
+        /// Determines whether all the flags/bits are set within the enum value.
         /// </summary>
-        /// <remarks>
-        /// <para>True when all bits set in <paramref name="uses"/> are set in <paramref name="use"/>, though other bits may be set too.</para>
-        /// <para>This is the behavior of the original <see cref="Enum.HasFlag"/> method.</para>
-        /// </remarks>
-        public static bool HasFlagAll<T>(this T use, T uses)
+        /// <typeparam name="T">The enum type.</typeparam>
+        /// <param name="value">The enum value.</param>
+        /// <param name="flags">The flags.</param>
+        /// <returns>
+        ///   <c>true</c> if all the flags/bits are set within the enum value; otherwise, <c>false</c>.
+        /// </returns>
+        [Obsolete("Use Enum.HasFlag() or bitwise operations (if performance is important) instead.")]
+        public static bool HasFlagAll<T>(this T value, T flags)
             where T : Enum
         {
-            var num = Convert.ToUInt64(use);
-            var nums = Convert.ToUInt64(uses);
-
-            return (num & nums) == nums;
+            return value.HasFlag(flags);
         }
 
         /// <summary>
-        /// Determines whether a flag enum has any of the specified values.
+        /// Determines whether any of the flags/bits are set within the enum value.
         /// </summary>
-        /// <remarks>
-        /// <para>True when at least one of the bits set in <paramref name="uses"/> is set in <paramref name="use"/>.</para>
-        /// </remarks>
-        public static bool HasFlagAny<T>(this T use, T uses)
+        /// <typeparam name="T">The enum type.</typeparam>
+        /// <param name="value">The value.</param>
+        /// <param name="flags">The flags.</param>
+        /// <returns>
+        ///   <c>true</c> if any of the flags/bits are set within the enum value; otherwise, <c>false</c>.
+        /// </returns>
+        public static bool HasFlagAny<T>(this T value, T flags)
             where T : Enum
         {
-            var num = Convert.ToUInt64(use);
-            var nums = Convert.ToUInt64(uses);
+            var v = Convert.ToUInt64(value);
+            var f = Convert.ToUInt64(flags);
 
-            return (num & nums) > 0;
-        }
-
-        /// <summary>
-        /// Sets a flag of the given input enum
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="input">Enum to set flag of</param>
-        /// <param name="flag">Flag to set</param>
-        /// <returns>A new enum with the flag set</returns>
-        public static T SetFlag<T>(this T input, T flag)
-             where T : Enum
-        {
-            var i = Convert.ToUInt64(input);
-            var f = Convert.ToUInt64(flag);
-
-            // bitwise OR to set flag f of enum i
-            var result = i | f;
-            
-            return (T)Enum.ToObject(typeof(T), result);
-        }
-
-        /// <summary>
-        /// Unsets a flag of the given input enum
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="input">Enum to unset flag of</param>
-        /// <param name="flag">Flag to unset</param>
-        /// <returns>A new enum with the flag unset</returns>
-        public static T UnsetFlag<T>(this T input, T flag)
-             where T : Enum
-        {
-            var i = Convert.ToUInt64(input);
-            var f = Convert.ToUInt64(flag);
-
-            // bitwise AND combined with bitwise complement to unset flag f of enum i
-            var result = i & ~f;
-            
-            return (T)Enum.ToObject(typeof(T), result);
+            return (v & f) > 0;
         }
     }
 }

src/Umbraco.Core/IO/SystemDirectories.cs

@@ -29,13 +29,13 @@ namespace Umbraco.Core.IO
 
         public static string MacroPartials => MvcViews + "/MacroPartials/";
 
-        public static string Media => IOHelper.ReturnPath("umbracoMediaPath", "~/media");
+        public static string Media => IOHelper.ReturnPath(Constants.AppSettings.MediaPath, "~/media");
 
-        public static string Scripts => IOHelper.ReturnPath("umbracoScriptsPath", "~/scripts");
+        public static string Scripts => IOHelper.ReturnPath(Constants.AppSettings.ScriptsPath, "~/scripts");
 
-        public static string Css => IOHelper.ReturnPath("umbracoCssPath", "~/css");
+        public static string Css => IOHelper.ReturnPath(Constants.AppSettings.CssPath, "~/css");
 
-        public static string Umbraco => IOHelper.ReturnPath("umbracoPath", "~/umbraco");
+        public static string Umbraco => IOHelper.ReturnPath(Constants.AppSettings.Path, "~/umbraco");
 
         public static string Packages => Data + "/packages";
 

src/Umbraco.Core/Manifest/ManifestContentAppFactory.cs

@@ -19,6 +19,8 @@ namespace Umbraco.Core.Manifest
     //       '-content/foo',        // hide for content type 'foo'
     //       '+content/*',          // show for all other content types
     //       '+media/*',            // show for all media types
+    //       '-member/foo'          // hide for member type 'foo'
+    //       '+member/*'            // show for all member types
     //       '+role/admin'          // show for admin users. Role based permissions will override others.
     //     ]
     //   },
@@ -56,6 +58,10 @@ namespace Umbraco.Core.Manifest
                     partA = "media";
                     partB = media.ContentType.Alias;
                     break;
+                case IMember member:
+                    partA = "member";
+                    partB = member.ContentType.Alias;
+                    break;
 
                 default:
                     return null;

src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs

@@ -151,6 +151,8 @@ namespace Umbraco.Core.Migrations.Install
             _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.Domains, Name = "Domains" });
             _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.KeyValues, Name = "KeyValues" });
             _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.Languages, Name = "Languages" });
+
+            _database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.MainDom, Name = "MainDom" });
         }
 
         private void CreateContentTypeData()
@@ -310,14 +312,27 @@ namespace Umbraco.Core.Migrations.Install
         private void CreateRelationTypeData()
         {
             var relationType = new RelationTypeDto { Id = 1, Alias = Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias, ChildObjectType = Constants.ObjectTypes.Document, ParentObjectType = Constants.ObjectTypes.Document, Dual = true, Name = Constants.Conventions.RelationTypes.RelateDocumentOnCopyName };
-            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
+            relationType.UniqueId = CreateUniqueRelationTypeId(relationType.Alias, relationType.Name);
             _database.Insert(Constants.DatabaseSchema.Tables.RelationType, "id", false, relationType);
             relationType = new RelationTypeDto { Id = 2, Alias = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias, ChildObjectType = Constants.ObjectTypes.Document, ParentObjectType = Constants.ObjectTypes.Document, Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteName };
-            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
+            relationType.UniqueId = CreateUniqueRelationTypeId(relationType.Alias, relationType.Name);
             _database.Insert(Constants.DatabaseSchema.Tables.RelationType, "id", false, relationType);
             relationType = new RelationTypeDto { Id = 3, Alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias, ChildObjectType = Constants.ObjectTypes.Media, ParentObjectType = Constants.ObjectTypes.Media, Dual = false, Name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName };
-            relationType.UniqueId = (relationType.Alias + "____" + relationType.Name).ToGuid();
+            relationType.UniqueId = CreateUniqueRelationTypeId(relationType.Alias, relationType.Name);
             _database.Insert(Constants.DatabaseSchema.Tables.RelationType, "id", false, relationType);
+
+            relationType = new RelationTypeDto { Id = 4, Alias = Constants.Conventions.RelationTypes.RelatedMediaAlias, ChildObjectType = null, ParentObjectType = null, Dual = false, Name = Constants.Conventions.RelationTypes.RelatedMediaName };
+            relationType.UniqueId = CreateUniqueRelationTypeId(relationType.Alias, relationType.Name);
+            _database.Insert(Constants.DatabaseSchema.Tables.RelationType, "id", false, relationType);
+
+            relationType = new RelationTypeDto { Id = 5, Alias = Constants.Conventions.RelationTypes.RelatedDocumentAlias, ChildObjectType = null, ParentObjectType = null, Dual = false, Name = Constants.Conventions.RelationTypes.RelatedDocumentName };
+            relationType.UniqueId = CreateUniqueRelationTypeId(relationType.Alias, relationType.Name);
+            _database.Insert(Constants.DatabaseSchema.Tables.RelationType, "id", false, relationType);
+        }
+
+        internal static Guid CreateUniqueRelationTypeId(string alias, string name)
+        {
+            return (alias + "____" + name).ToGuid();
         }
 
         private void CreateKeyValueData()

src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs

@@ -183,8 +183,12 @@ namespace Umbraco.Core.Migrations.Upgrade
             To<RenameUserLoginDtoDateIndex>("{0372A42B-DECF-498D-B4D1-6379E907EB94}");
             To<FixContentNuCascade>("{5B1E0D93-F5A3-449B-84BA-65366B84E2D4}");
 
-            // to 8.6.0
+            // to 8.6.0...
+            To<UpdateRelationTypeTable>("{4759A294-9860-46BC-99F9-B4C975CAE580}");
+            To<AddNewRelationTypes>("{0BC866BC-0665-487A-9913-0290BD0169AD}");
             To<AddPropertyTypeValidationMessageColumns>("{3D67D2C8-5E65-47D0-A9E1-DC2EE0779D6B}");
+            To<MissingContentVersionsIndexes>("{EE288A91-531B-4995-8179-1D62D9AA3E2E}");
+            To<AddMainDomLock>("{2AB29964-02A1-474D-BD6B-72148D2A53A2}");
 
             //FINAL
         }

src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/AddMainDomLock.cs

@@ -0,0 +1,16 @@
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_6_0
+{
+    public class AddMainDomLock : MigrationBase
+    {
+        public AddMainDomLock(IMigrationContext context)
+            : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            Database.Insert(Constants.DatabaseSchema.Tables.Lock, "id", false, new LockDto { Id = Constants.Locks.MainDom, Name = "MainDom" });
+        }
+    }
+}

src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/AddNewRelationTypes.cs

@@ -0,0 +1,33 @@
+using Umbraco.Core.Migrations.Install;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_6_0
+{
+    /// <summary>
+    /// Ensures the new relation types are created
+    /// </summary>
+    public class AddNewRelationTypes : MigrationBase
+    {
+        public AddNewRelationTypes(IMigrationContext context)
+            : base(context)
+        { }
+
+        public override void Migrate()
+        {
+            CreateRelation(
+                Constants.Conventions.RelationTypes.RelatedMediaAlias,
+                Constants.Conventions.RelationTypes.RelatedMediaName);
+
+            CreateRelation(
+                Constants.Conventions.RelationTypes.RelatedDocumentAlias,
+                Constants.Conventions.RelationTypes.RelatedDocumentName);
+        }
+
+        private void CreateRelation(string alias, string name)
+        {
+            var uniqueId = DatabaseDataCreator.CreateUniqueRelationTypeId(alias ,name); //this is the same as how it installs so everything is consistent
+            Insert.IntoTable(Constants.DatabaseSchema.Tables.RelationType)
+               .Row(new { typeUniqueId = uniqueId, dual = 0, name, alias })
+               .Do();
+        }
+    }
+}

src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/AddPropertyTypeValidationMessageColumns.cs

@@ -3,6 +3,7 @@ using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Core.Migrations.Upgrade.V_8_6_0
 {
+
     public class AddPropertyTypeValidationMessageColumns : MigrationBase
     {
         public AddPropertyTypeValidationMessageColumns(IMigrationContext context)

src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/MissingContentVersionsIndexes.cs

@@ -0,0 +1,24 @@
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_6_0
+{
+    public class MissingContentVersionsIndexes : MigrationBase
+    {
+        public MissingContentVersionsIndexes(IMigrationContext context) : base(context)
+        {
+        }
+
+        public override void Migrate()
+        {
+            Create
+                .Index("IX_" + ContentVersionDto.TableName + "_NodeId")
+                .OnTable(ContentVersionDto.TableName)
+                .OnColumn("nodeId")
+                .Ascending()
+                .OnColumn("current")
+                .Ascending()
+                .WithOptions().NonClustered()
+                .Do();
+        }
+    }
+}

src/Umbraco.Core/Migrations/Upgrade/V_8_6_0/UpdateRelationTypeTable.cs

@@ -0,0 +1,38 @@
+using Umbraco.Core.Persistence.Dtos;
+
+namespace Umbraco.Core.Migrations.Upgrade.V_8_6_0
+{
+
+    public class UpdateRelationTypeTable : MigrationBase
+    {
+        public UpdateRelationTypeTable(IMigrationContext context)
+            : base(context)
+        { }
+
+        public override void Migrate()
+        {
+
+            Alter.Table(Constants.DatabaseSchema.Tables.RelationType).AlterColumn("parentObjectType").AsGuid().Nullable().Do();
+            Alter.Table(Constants.DatabaseSchema.Tables.RelationType).AlterColumn("childObjectType").AsGuid().Nullable().Do();
+
+            //TODO: We have to update this field to ensure it's not null, we can just copy across the name since that is not nullable
+
+            //drop index before we can alter the column
+            if (IndexExists("IX_umbracoRelationType_alias"))
+                Delete
+                   .Index("IX_umbracoRelationType_alias")
+                   .OnTable(Constants.DatabaseSchema.Tables.RelationType)
+                   .Do();
+            //change the column to non nullable
+            Alter.Table(Constants.DatabaseSchema.Tables.RelationType).AlterColumn("alias").AsString(100).NotNullable().Do();
+            //re-create the index
+            Create
+                .Index("IX_umbracoRelationType_alias")
+                .OnTable(Constants.DatabaseSchema.Tables.RelationType)
+                .OnColumn("alias")
+                .Ascending()
+                .WithOptions().Unique().WithOptions().NonClustered()
+                .Do();
+        }
+    }
+}

src/Umbraco.Core/Models/Editors/ContentPropertyFile.cs

@@ -1,5 +1,6 @@
 namespace Umbraco.Core.Models.Editors
 {
+
     /// <summary>
     /// Represents an uploaded file for a property.
     /// </summary>

src/Umbraco.Core/Models/Editors/UmbracoEntityReference.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.Models.Editors
+{
+    /// <summary>
+    /// Used to track reference to other entities in a property value
+    /// </summary>
+    public struct UmbracoEntityReference : IEquatable<UmbracoEntityReference>
+    {
+        private static readonly UmbracoEntityReference _empty = new UmbracoEntityReference(Udi.UnknownTypeUdi.Instance, string.Empty);
+
+        public UmbracoEntityReference(Udi udi, string relationTypeAlias)
+        {
+            Udi = udi ?? throw new ArgumentNullException(nameof(udi));
+            RelationTypeAlias = relationTypeAlias ?? throw new ArgumentNullException(nameof(relationTypeAlias));
+        }
+
+        public UmbracoEntityReference(Udi udi)
+        {
+            Udi = udi ?? throw new ArgumentNullException(nameof(udi));
+
+            switch (udi.EntityType)
+            {
+                case Constants.UdiEntityType.Media:
+                    RelationTypeAlias = Constants.Conventions.RelationTypes.RelatedMediaAlias;
+                    break;
+                default:
+                    RelationTypeAlias = Constants.Conventions.RelationTypes.RelatedDocumentAlias;
+                    break;
+            }
+        }
+
+        public static UmbracoEntityReference Empty() => _empty;
+
+        public static bool IsEmpty(UmbracoEntityReference reference) => reference == Empty();
+
+        public Udi Udi { get; }
+        public string RelationTypeAlias { get; }
+
+        public override bool Equals(object obj)
+        {
+            return obj is UmbracoEntityReference reference && Equals(reference);
+        }
+
+        public bool Equals(UmbracoEntityReference other)
+        {
+            return EqualityComparer<Udi>.Default.Equals(Udi, other.Udi) &&
+                   RelationTypeAlias == other.RelationTypeAlias;
+        }
+
+        public override int GetHashCode()
+        {
+            var hashCode = -487348478;
+            hashCode = hashCode * -1521134295 + EqualityComparer<Udi>.Default.GetHashCode(Udi);
+            hashCode = hashCode * -1521134295 + EqualityComparer<string>.Default.GetHashCode(RelationTypeAlias);
+            return hashCode;
+        }
+
+        public static bool operator ==(UmbracoEntityReference left, UmbracoEntityReference right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(UmbracoEntityReference left, UmbracoEntityReference right)
+        {
+            return !(left == right);
+        }
+    }
+}

src/Umbraco.Core/Models/Entities/ITreeEntity.cs

@@ -24,7 +24,7 @@
         /// Sets the parent entity.
         /// </summary>
         /// <remarks>Use this method to set the parent entity when the parent entity is known, but has not
-        /// been persistent and does not yet have an identity. The parent identifier will we retrieved
+        /// been persistent and does not yet have an identity. The parent identifier will be retrieved
         /// from the parent entity when needed. If the parent entity still does not have an entity by that
         /// time, an exception will be thrown by <see cref="ParentId"/> getter.</remarks>
         void SetParent(ITreeEntity parent);
@@ -53,4 +53,4 @@
         /// </remarks>
         bool Trashed { get; }
     }
-}
+}

src/Umbraco.Core/Models/Entities/MemberEntitySlim.cs

@@ -1,13 +1,6 @@
 namespace Umbraco.Core.Models.Entities
 {
-    public class MemberEntitySlim : EntitySlim, IMemberEntitySlim
+    public class MemberEntitySlim : ContentEntitySlim, IMemberEntitySlim
     {
-        public string ContentTypeAlias { get; set; }
-
-        /// <inheritdoc />
-        public string ContentTypeIcon { get; set; }
-
-        /// <inheritdoc />
-        public string ContentTypeThumbnail { get; set; }
     }
-}
+}

src/Umbraco.Core/Models/IRelation.cs

@@ -1,4 +1,5 @@
-using System.Runtime.Serialization;
+using System;
+using System.Runtime.Serialization;
 using Umbraco.Core.Models.Entities;
 
 namespace Umbraco.Core.Models
@@ -11,12 +12,18 @@ namespace Umbraco.Core.Models
         [DataMember]
         int ParentId { get; set; }
 
+        [DataMember]
+        Guid ParentObjectType { get; set; }
+
         /// <summary>
         /// Gets or sets the Child Id of the Relation (Destination)
         /// </summary>
         [DataMember]
         int ChildId { get; set; }
 
+        [DataMember]
+        Guid ChildObjectType { get; set; }
+
         /// <summary>
         /// Gets or sets the <see cref="RelationType"/> for the Relation
         /// </summary>

src/Umbraco.Core/Models/IRelationType.cs

@@ -29,13 +29,13 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
         [DataMember]
-        Guid ParentObjectType { get; set; }
+        Guid? ParentObjectType { get; set; }
 
         /// <summary>
         /// Gets or sets the Childs object type id
         /// </summary>
         /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
         [DataMember]
-        Guid ChildObjectType { get; set; }
+        Guid? ChildObjectType { get; set; }
     }
 }

src/Umbraco.Core/Models/MediaExtensions.cs

@@ -1,10 +1,8 @@
-using System;
-using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using System.Linq;
+using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
-using Umbraco.Core.PropertyEditors.ValueConverters;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Models
 {
@@ -18,29 +16,12 @@ namespace Umbraco.Core.Models
             if (!media.Properties.TryGetValue(propertyAlias, out var property))
                 return string.Empty;
 
-            // TODO: would need to be adjusted to variations, when media become variants
-            if (!(property.GetValue() is string jsonString))
-                return string.Empty;
-
-            if (property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.UploadField)
-                return jsonString;
-
-            if (property.PropertyType.PropertyEditorAlias == Constants.PropertyEditors.Aliases.ImageCropper)
+            if (Current.PropertyEditors.TryGet(property.PropertyType.PropertyEditorAlias, out var editor)
+                && editor is IDataEditorWithMediaPath dataEditor)
             {
-                if (jsonString.DetectIsJson() == false)
-                    return jsonString;
-
-                try
-                {
-                    var json = JsonConvert.DeserializeObject<JObject>(jsonString);
-                    if (json["src"] != null)
-                        return json["src"].Value<string>();
-                }
-                catch (Exception ex)
-                {
-                    logger.Error<ImageCropperValueConverter>(ex, "Could not parse the string '{JsonString}' to a json object", jsonString);
-                    return string.Empty;
-                }
+                // TODO: would need to be adjusted to variations, when media become variants
+                var value = property.GetValue();
+                return dataEditor.GetMediaPath(value);
             }
 
             // Without knowing what it is, just adding a string here might not be very nice

src/Umbraco.Core/Models/MediaTypeExtensions.cs

@@ -0,0 +1,10 @@
+namespace Umbraco.Core.Models
+{
+    internal static class MediaTypeExtensions
+    {
+        internal static bool IsSystemMediaType(this IMediaType mediaType) =>
+            mediaType.Alias == Constants.Conventions.MediaTypes.File
+            || mediaType.Alias == Constants.Conventions.MediaTypes.Folder
+            || mediaType.Alias == Constants.Conventions.MediaTypes.Image;
+    }
+}

src/Umbraco.Core/Models/ObjectTypes.cs

@@ -41,7 +41,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         public static UmbracoObjectTypes GetUmbracoObjectType(string name)
         {
-            return (UmbracoObjectTypes) Enum.Parse(typeof (UmbracoObjectTypes), name, false);
+            return (UmbracoObjectTypes) Enum.Parse(typeof (UmbracoObjectTypes), name, true);
         }
 
         #region Guid object type utilities

src/Umbraco.Core/Models/Relation.cs

@@ -17,13 +17,36 @@ namespace Umbraco.Core.Models
         private IRelationType _relationType;
         private string _comment;
 
+        /// <summary>
+        /// Constructor for constructing the entity to be created
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <param name="childId"></param>
+        /// <param name="relationType"></param>
         public Relation(int parentId, int childId, IRelationType relationType)
         {
             _parentId = parentId;
             _childId = childId;
             _relationType = relationType;
         }
-        
+
+        /// <summary>
+        /// Constructor for reconstructing the entity from the data source
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <param name="childId"></param>
+        /// <param name="parentObjectType"></param>
+        /// <param name="childObjectType"></param>
+        /// <param name="relationType"></param>
+        public Relation(int parentId, int childId, Guid parentObjectType, Guid childObjectType, IRelationType relationType)
+        {
+            _parentId = parentId;
+            _childId = childId;
+            _relationType = relationType;
+            ParentObjectType = parentObjectType;
+            ChildObjectType = childObjectType;
+        }
+
 
         /// <summary>
         /// Gets or sets the Parent Id of the Relation (Source)
@@ -35,6 +58,9 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _parentId, nameof(ParentId));
         }
 
+        [DataMember]
+        public Guid ParentObjectType { get; set; }
+
         /// <summary>
         /// Gets or sets the Child Id of the Relation (Destination)
         /// </summary>
@@ -45,6 +71,9 @@ namespace Umbraco.Core.Models
             set => SetPropertyValueAndDetectChanges(value, ref _childId, nameof(ChildId));
         }
 
+        [DataMember]
+        public Guid ChildObjectType { get; set; }
+
         /// <summary>
         /// Gets or sets the <see cref="RelationType"/> for the Relation
         /// </summary>

src/Umbraco.Core/Models/RelationType.cs

@@ -14,28 +14,26 @@ namespace Umbraco.Core.Models
         private string _name;
         private string _alias;
         private bool _isBidrectional;
-        private Guid _parentObjectType;
-        private Guid _childObjectType;
+        private Guid? _parentObjectType;
+        private Guid? _childObjectType;
 
-        public RelationType(Guid childObjectType, Guid parentObjectType, string alias)
+        //TODO: Should we put back the broken ctors with obsolete attributes?
+
+        public RelationType(string alias, string name)
+            : this(name, alias, false, null, null)
         {
-            if (alias == null) throw new ArgumentNullException(nameof(alias));
-            if (string.IsNullOrWhiteSpace(alias)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(alias));
+        }
 
-            _childObjectType = childObjectType;
-            _parentObjectType = parentObjectType;
+        public RelationType(string name, string alias, bool isBidrectional, Guid? parentObjectType, Guid? childObjectType)
+        {
+            _name = name;
             _alias = alias;
-            Name = _alias;
+            _isBidrectional = isBidrectional;
+            _parentObjectType = parentObjectType;
+            _childObjectType = childObjectType;
         }
 
-        public RelationType(Guid childObjectType, Guid parentObjectType, string alias, string name)
-            : this(childObjectType, parentObjectType, alias)
-        {
-            if (name == null) throw new ArgumentNullException(nameof(name));
-            if (string.IsNullOrWhiteSpace(name)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(name));
 
-            Name = name;
-        }
 
         /// <summary>
         /// Gets or sets the Name of the RelationType
@@ -72,7 +70,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
         [DataMember]
-        public Guid ParentObjectType
+        public Guid? ParentObjectType
         {
             get => _parentObjectType;
             set => SetPropertyValueAndDetectChanges(value, ref _parentObjectType, nameof(ParentObjectType));
@@ -83,7 +81,7 @@ namespace Umbraco.Core.Models
         /// </summary>
         /// <remarks>Corresponds to the NodeObjectType in the umbracoNode table</remarks>
         [DataMember]
-        public Guid ChildObjectType
+        public Guid? ChildObjectType
         {
             get => _childObjectType;
             set => SetPropertyValueAndDetectChanges(value, ref _childObjectType, nameof(ChildObjectType));

src/Umbraco.Core/Persistence/Constants-Locks.cs

@@ -8,6 +8,11 @@ namespace Umbraco.Core
         /// </summary>
         public static class Locks
         {
+            /// <summary>
+            /// The <see cref="IMainDom"/> lock
+            /// </summary>
+            public const int MainDom = -1000;
+
             /// <summary>
             /// All servers.
             /// </summary>

src/Umbraco.Core/Persistence/Dtos/ContentVersionDto.cs

@@ -19,6 +19,7 @@ namespace Umbraco.Core.Persistence.Dtos
 
         [Column("nodeId")]
         [ForeignKey(typeof(ContentDto))]
+        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_NodeId", ForColumns = "nodeId,current")]
         public int NodeId { get; set; }
 
         [Column("versionDate")] // TODO: db rename to 'updateDate'
@@ -30,7 +31,6 @@ namespace Umbraco.Core.Persistence.Dtos
         [NullSetting(NullSetting = NullSettings.Null)]
         public int? UserId { get => _userId == 0 ? null : _userId; set => _userId = value; } //return null if zero
 
-        // TODO: we need an index on this it is used almost always in querying and sorting
         [Column("current")]
         public bool Current { get; set; }
 

src/Umbraco.Core/Persistence/Dtos/RelationDto.cs

@@ -34,5 +34,13 @@ namespace Umbraco.Core.Persistence.Dtos
         [Column("comment")]
         [Length(1000)]
         public string Comment { get; set; }
+
+        [ResultColumn]
+        [Column("parentObjectType")]
+        public Guid ParentObjectType { get; set; }
+
+        [ResultColumn]
+        [Column("childObjectType")]
+        public Guid ChildObjectType { get; set; }
     }
 }

src/Umbraco.Core/Persistence/Dtos/RelationTypeDto.cs

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Persistence.Dtos
     [ExplicitColumns]
     internal class RelationTypeDto
     {
-        public const int NodeIdSeed = 4;
+        public const int NodeIdSeed = 10;
 
         [Column("id")]
         [PrimaryKeyColumn(IdentitySeed = NodeIdSeed)]
@@ -23,17 +23,20 @@ namespace Umbraco.Core.Persistence.Dtos
         public bool Dual { get; set; }
 
         [Column("parentObjectType")]
-        public Guid ParentObjectType { get; set; }
+        [NullSetting(NullSetting = NullSettings.Null)]
+        public Guid? ParentObjectType { get; set; }
 
         [Column("childObjectType")]
-        public Guid ChildObjectType { get; set; }
+        [NullSetting(NullSetting = NullSettings.Null)]
+        public Guid? ChildObjectType { get; set; }
 
         [Column("name")]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
         [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRelationType_name")]
         public string Name { get; set; }
 
         [Column("alias")]
-        [NullSetting(NullSetting = NullSettings.Null)]
+        [NullSetting(NullSetting = NullSettings.NotNull)]
         [Length(100)]
         [Index(IndexTypes.UniqueNonClustered, Name = "IX_umbracoRelationType_alias")]
         public string Alias { get; set; }

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

@@ -1,17 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.RegularExpressions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Repositories;
+using Umbraco.Core.PropertyEditors;
 
 namespace Umbraco.Core.Persistence.Factories
 {
     internal class ContentBaseFactory
     {
-        private static readonly Regex MediaPathPattern = new Regex(@"(/media/.+?)(?:['""]|$)", RegexOptions.Compiled);
-
         /// <summary>
         /// Builds an IContent item from a dto and content type.
         /// </summary>
@@ -189,7 +187,7 @@ namespace Umbraco.Core.Persistence.Factories
         /// <summary>
         /// Builds a dto from an IMedia item.
         /// </summary>
-        public static MediaDto BuildDto(IMedia entity)
+        public static MediaDto BuildDto(PropertyEditorCollection propertyEditors, IMedia entity)
         {
             var contentDto = BuildContentDto(entity, Constants.ObjectTypes.Media);
 
@@ -197,7 +195,7 @@ namespace Umbraco.Core.Persistence.Factories
             {
                 NodeId = entity.Id,
                 ContentDto = contentDto,
-                MediaVersionDto = BuildMediaVersionDto(entity, contentDto)
+                MediaVersionDto = BuildMediaVersionDto(propertyEditors, entity, contentDto)
             };
 
             return dto;
@@ -291,12 +289,20 @@ namespace Umbraco.Core.Persistence.Factories
             return dto;
         }
 
-        private static MediaVersionDto BuildMediaVersionDto(IMedia entity, ContentDto contentDto)
+        private static MediaVersionDto BuildMediaVersionDto(PropertyEditorCollection propertyEditors, IMedia entity, ContentDto contentDto)
         {
             // try to get a path from the string being stored for media
             // TODO: only considering umbracoFile
 
-            TryMatch(entity.GetValue<string>("umbracoFile"), out var path);
+            string path = null;
+
+            if (entity.Properties.TryGetValue(Constants.Conventions.Media.File, out var property)
+                && propertyEditors.TryGet(property.PropertyType.PropertyEditorAlias, out var editor)
+                && editor is IDataEditorWithMediaPath dataEditor)
+            {
+                var value = property.GetValue();
+                path = dataEditor.GetMediaPath(value);
+            }
 
             var dto = new MediaVersionDto
             {
@@ -308,22 +314,5 @@ namespace Umbraco.Core.Persistence.Factories
 
             return dto;
         }
-
-        // TODO: this should NOT be here?!
-        // more dark magic ;-(
-        internal static bool TryMatch(string text, out string path)
-        {
-            // In v8 we should allow exposing this via the property editor in a much nicer way so that the property editor
-            // can tell us directly what any URL is for a given property if it contains an asset
-
-            path = null;
-            if (string.IsNullOrWhiteSpace(text)) return false;
-
-            var m = MediaPathPattern.Match(text);
-            if (!m.Success || m.Groups.Count != 2) return false;
-
-            path = m.Groups[1].Value;
-            return true;
-        }
     }
 }

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

@@ -3,20 +3,11 @@ using Umbraco.Core.Persistence.Dtos;
 
 namespace Umbraco.Core.Persistence.Factories
 {
-    internal class RelationFactory
+    internal static class RelationFactory
     {
-        private readonly IRelationType _relationType;
-
-        public RelationFactory(IRelationType relationType)
+        public static IRelation BuildEntity(RelationDto dto, IRelationType relationType)
         {
-            _relationType = relationType;
-        }
-
-        #region Implementation of IEntityFactory<Relation,RelationDto>
-
-        public IRelation BuildEntity(RelationDto dto)
-        {
-            var entity = new Relation(dto.ParentId, dto.ChildId, _relationType);
+            var entity = new Relation(dto.ParentId, dto.ChildId, dto.ParentObjectType, dto.ChildObjectType, relationType);
 
             try
             {
@@ -37,7 +28,7 @@ namespace Umbraco.Core.Persistence.Factories
             }
         }
 
-        public RelationDto BuildDto(IRelation entity)
+        public static RelationDto BuildDto(IRelation entity)
         {
             var dto = new RelationDto
             {
@@ -54,6 +45,5 @@ namespace Umbraco.Core.Persistence.Factories
             return dto;
         }
 
-        #endregion
     }
 }

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

@@ -9,7 +9,7 @@ namespace Umbraco.Core.Persistence.Factories
 
         public static IRelationType BuildEntity(RelationTypeDto dto)
         {
-            var entity = new RelationType(dto.ChildObjectType, dto.ParentObjectType, dto.Alias);
+            var entity = new RelationType(dto.Name, dto.Alias, dto.Dual, dto.ChildObjectType, dto.ParentObjectType);
 
             try
             {
@@ -17,8 +17,6 @@ namespace Umbraco.Core.Persistence.Factories
 
                 entity.Id = dto.Id;
                 entity.Key = dto.UniqueId;
-                entity.IsBidirectional = dto.Dual;
-                entity.Name = dto.Name;
 
                 // reset dirty initial properties (U4-1946)
                 entity.ResetDirtyProperties(false);

src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs

@@ -14,7 +14,21 @@ namespace Umbraco.Core.Persistence
     /// </summary>
     public static partial class NPocoDatabaseExtensions
     {
-        // TODO: review NPoco native InsertBulk to replace the code below
+        /// <summary>
+        /// Configures NPoco's SqlBulkCopyHelper to use the correct SqlConnection and SqlTransaction instances from the underlying RetryDbConnection and ProfiledDbTransaction
+        /// </summary>
+        /// <remarks>
+        /// This is required to use NPoco's own <see cref="Database.InsertBulk{T}(IEnumerable{T})" /> method because we use wrapped DbConnection and DbTransaction instances.
+        /// NPoco's InsertBulk method only caters for efficient bulk inserting records for Sql Server, it does not cater for bulk inserting of records for
+        /// any other database type and in which case will just insert records one at a time.
+        /// NPoco's InsertBulk method also deals with updating the passed in entity's PK/ID once it's inserted whereas our own BulkInsertRecords methods
+        /// do not handle this scenario.
+        /// </remarks>
+        public static void ConfigureNPocoBulkExtensions()
+        {
+            SqlBulkCopyHelper.SqlConnectionResolver = dbConn => GetTypedConnection<SqlConnection>(dbConn);
+            SqlBulkCopyHelper.SqlTransactionResolver = dbTran => GetTypedTransaction<SqlTransaction>(dbTran);
+        }
 
         /// <summary>
         /// Bulk-inserts records within a transaction.
@@ -235,7 +249,7 @@ namespace Umbraco.Core.Persistence
                     //we need to add column mappings here because otherwise columns will be matched by their order and if the order of them are different in the DB compared
                     //to the order in which they are declared in the model then this will not work, so instead we will add column mappings by name so that this explicitly uses
                     //the names instead of their ordering.
-                    foreach(var col in bulkReader.ColumnMappings)
+                    foreach (var col in bulkReader.ColumnMappings)
                     {
                         copy.ColumnMappings.Add(col.DestinationColumn, col.DestinationColumn);
                     }

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

@@ -26,5 +26,10 @@ namespace Umbraco.Core.Persistence.Repositories
         /// <param name="contentPath"></param>
         /// <returns></returns>
         bool HasContainerInPath(string contentPath);
+
+        /// <summary>
+        /// Returns true or false depending on whether content nodes have been created based on the provided content type id.
+        /// </summary>
+        bool HasContentNodes(int id);
     }
 }

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

@@ -1,4 +1,5 @@
-using System;
+using NPoco;
+using System;
 using System.Collections.Generic;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
@@ -15,10 +16,22 @@ namespace Umbraco.Core.Persistence.Repositories
         IEntitySlim Get(int id, Guid objectTypeId);
         IEntitySlim Get(Guid key, Guid objectTypeId);
 
-        IEnumerable<IEntitySlim> GetAll(Guid objectType, params int[] ids);
+        IEnumerable<IEntitySlim> GetAll(Guid objectType, params int[] ids);        
         IEnumerable<IEntitySlim> GetAll(Guid objectType, params Guid[] keys);
 
+        /// <summary>
+        /// Gets entities for a query
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
         IEnumerable<IEntitySlim> GetByQuery(IQuery<IUmbracoEntity> query);
+
+        /// <summary>
+        /// Gets entities for a query and a specific object type allowing the query to be slightly more optimized
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="objectType"></param>
+        /// <returns></returns>
         IEnumerable<IEntitySlim> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectType);
 
         UmbracoObjectTypes GetObjectType(int id);
@@ -30,7 +43,41 @@ namespace Umbraco.Core.Persistence.Repositories
         bool Exists(int id);
         bool Exists(Guid key);
 
+        /// <summary>
+        /// Gets paged entities for a query and a subset of object types
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="objectTypes"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="filter"></param>
+        /// <param name="ordering"></param>
+        /// <param name="sqlCustomization">
+        /// A callback providing the ability to customize the generated SQL used to retrieve entities
+        /// </param>
+        /// <returns>
+        /// A collection of mixed entity types which would be of type <see cref="IEntitySlim"/>, <see cref="IDocumentEntitySlim"/>, <see cref="IMediaEntitySlim"/>,
+        /// <see cref="IMemberEntitySlim"/>
+        /// </returns>
+        IEnumerable<IEntitySlim> GetPagedResultsByQuery(
+            IQuery<IUmbracoEntity> query, Guid[] objectTypes, long pageIndex, int pageSize, out long totalRecords,
+            IQuery<IUmbracoEntity> filter, Ordering ordering, Action<Sql<ISqlContext>> sqlCustomization = null);
+
+        /// <summary>
+        /// Gets paged entities for a query and a specific object type
+        /// </summary>
+        /// <param name="query"></param>
+        /// <param name="objectType"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalRecords"></param>
+        /// <param name="filter"></param>
+        /// <param name="ordering"></param>
+        /// <returns></returns>
         IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
             IQuery<IUmbracoEntity> filter, Ordering ordering);
+
+        
     }
 }

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

@@ -1,9 +1,33 @@
-using Umbraco.Core.Models;
+using System;
+using System.Collections.Generic;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Services;
 
 namespace Umbraco.Core.Persistence.Repositories
 {
     public interface IRelationRepository : IReadWriteQueryRepository<int, IRelation>
     {
+        IEnumerable<IRelation> GetPagedRelationsByQuery(IQuery<IRelation> query, long pageIndex, int pageSize, out long totalRecords, Ordering ordering);
 
+        /// <summary>
+        /// Persist multiple <see cref="IRelation"/> at once
+        /// </summary>
+        /// <param name="relations"></param>
+        void Save(IEnumerable<IRelation> relations);
+
+        /// <summary>
+        /// Deletes all relations for a parent for any specified relation type alias
+        /// </summary>
+        /// <param name="parentId"></param>
+        /// <param name="relationTypeAliases">
+        /// A list of relation types to match for deletion, if none are specified then all relations for this parent id are deleted
+        /// </param>
+        void DeleteByParent(int parentId, params string[] relationTypeAliases);
+
+        IEnumerable<IUmbracoEntity> GetPagedParentEntitiesByChildId(int childId, long pageIndex, int pageSize, out long totalRecords, params Guid[] entityTypes);
+
+        IEnumerable<IUmbracoEntity> GetPagedChildEntitiesByParentId(int parentId, long pageIndex, int pageSize, out long totalRecords, params Guid[] entityTypes);
     }
 }

src/Umbraco.Core/Persistence/Repositories/Implement/ContentRepositoryBase.cs

@@ -9,6 +9,7 @@ using Umbraco.Core.Composing;
 using Umbraco.Core.Events;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
+using Umbraco.Core.Models.Editors;
 using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
@@ -24,26 +25,48 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     internal sealed class ContentRepositoryBase
     {
         /// <summary>
+        ///
         /// This is used for unit tests ONLY
         /// </summary>
         public static bool ThrowOnWarning = false;
     }
 
     internal abstract class ContentRepositoryBase<TId, TEntity, TRepository> : NPocoRepositoryBase<TId, TEntity>, IContentRepository<TId, TEntity>
-        where TEntity : class, IUmbracoEntity
+        where TEntity : class, IContentBase
         where TRepository : class, IRepository
     {
-        protected ContentRepositoryBase(IScopeAccessor scopeAccessor, AppCaches cache, ILanguageRepository languageRepository, ILogger logger)
+        private readonly Lazy<PropertyEditorCollection> _propertyEditors;
+        private readonly DataValueReferenceFactoryCollection _dataValueReferenceFactories;
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="scopeAccessor"></param>
+        /// <param name="cache"></param>
+        /// <param name="logger"></param>
+        /// <param name="languageRepository"></param>
+        /// <param name="propertyEditors">
+        ///     Lazy property value collection - must be lazy because we have a circular dependency since some property editors require services, yet these services require property editors
+        /// </param>
+        protected ContentRepositoryBase(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger,
+            ILanguageRepository languageRepository, IRelationRepository relationRepository, IRelationTypeRepository relationTypeRepository,
+            Lazy<PropertyEditorCollection> propertyEditors, DataValueReferenceFactoryCollection dataValueReferenceFactories)
             : base(scopeAccessor, cache, logger)
         {
             LanguageRepository = languageRepository;
+            RelationRepository = relationRepository;
+            RelationTypeRepository = relationTypeRepository;
+            _propertyEditors = propertyEditors;
+            _dataValueReferenceFactories = dataValueReferenceFactories;
         }
 
         protected abstract TRepository This { get; }
 
         protected ILanguageRepository LanguageRepository { get; }
+        protected IRelationRepository RelationRepository { get; }
+        protected IRelationTypeRepository RelationTypeRepository { get; }
 
-        protected PropertyEditorCollection PropertyEditors => Current.PropertyEditors; // TODO: inject
+        protected PropertyEditorCollection PropertyEditors => _propertyEditors.Value;
 
         #region Versions
 
@@ -797,5 +820,56 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         }
 
         #endregion
+
+        protected void PersistRelations(TEntity entity)
+        {
+            // Get all references from our core built in DataEditors/Property Editors
+            // Along with seeing if deverlopers want to collect additional references from the DataValueReferenceFactories collection
+            var trackedRelations = new List<UmbracoEntityReference>();
+            trackedRelations.AddRange(_dataValueReferenceFactories.GetAllReferences(entity.Properties, PropertyEditors));
+
+            //First delete all auto-relations for this entity
+            RelationRepository.DeleteByParent(entity.Id, Constants.Conventions.RelationTypes.AutomaticRelationTypes);
+
+            if (trackedRelations.Count == 0) return;
+
+            trackedRelations = trackedRelations.Distinct().ToList();
+            var udiToGuids = trackedRelations.Select(x => x.Udi as GuidUdi)
+                .ToDictionary(x => (Udi)x, x => x.Guid);
+
+            //lookup in the DB all INT ids for the GUIDs and chuck into a dictionary
+            var keyToIds = Database.Fetch<NodeIdKey>(Sql().Select<NodeDto>(x => x.NodeId, x => x.UniqueId).From<NodeDto>().WhereIn<NodeDto>(x => x.UniqueId, udiToGuids.Values))
+                .ToDictionary(x => x.UniqueId, x => x.NodeId);
+
+            var allRelationTypes = RelationTypeRepository.GetMany(Array.Empty<int>())
+                .ToDictionary(x => x.Alias, x => x);
+
+            var toSave = trackedRelations.Select(rel =>
+                {
+                    if (!allRelationTypes.TryGetValue(rel.RelationTypeAlias, out var relationType))
+                        throw new InvalidOperationException($"The relation type {rel.RelationTypeAlias} does not exist");
+
+                    if (!udiToGuids.TryGetValue(rel.Udi, out var guid))
+                        return null; // This shouldn't happen!
+
+                    if (!keyToIds.TryGetValue(guid, out var id))
+                        return null; // This shouldn't happen!
+
+                    return new Relation(entity.Id, id, relationType);
+                }).WhereNotNull();
+
+            // Save bulk relations
+            RelationRepository.Save(toSave);
+
+        }
+
+        private class NodeIdKey
+        {
+            [Column("id")]
+            public int NodeId { get; set; }
+
+            [Column("uniqueId")]
+            public Guid UniqueId { get; set; }
+        }
     }
 }

src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs

@@ -16,7 +16,6 @@ using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
-using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
@@ -506,7 +505,7 @@ AND umbracoNode.id <> @id",
         /// <summary>
         /// Corrects the property type variations for the given entity
         /// to make sure the property type variation is compatible with the
-        /// variation set on the entity itself.        
+        /// variation set on the entity itself.
         /// </summary>
         /// <param name="entity">Entity to correct properties for</param>
         private void CorrectPropertyTypeVariations(IContentTypeComposition entity)
@@ -754,7 +753,7 @@ AND umbracoNode.id <> @id",
                 //we don't need to move the names! this is because we always keep the invariant names with the name of the default language.
 
                 //however, if we were to move names, we could do this: BUT this doesn't work with SQLCE, for that we'd have to update row by row :(
-                // if we want these SQL statements back, look into GIT history    
+                // if we want these SQL statements back, look into GIT history
             }
         }
 
@@ -1033,7 +1032,7 @@ AND umbracoNode.id <> @id",
 
             //keep track of this node/lang to mark or unmark a culture as edited
             var editedLanguageVersions = new Dictionary<(int nodeId, int? langId), bool>();
-            //keep track of which node to mark or unmark as edited 
+            //keep track of which node to mark or unmark as edited
             var editedDocument = new Dictionary<int, bool>();
             var nodeId = -1;
             var propertyTypeId = -1;
@@ -1324,6 +1323,17 @@ WHERE {Constants.DatabaseSchema.Tables.Content}.nodeId IN (@ids) AND cmsContentT
             return Database.ExecuteScalar<int>(sql) > 0;
         }
 
+        /// <summary>
+        /// Returns true or false depending on whether content nodes have been created based on the provided content type id.
+        /// </summary>
+        public bool HasContentNodes(int id)
+        {
+            var sql = new Sql(
+                $"SELECT CASE WHEN EXISTS (SELECT * FROM {Constants.DatabaseSchema.Tables.Content} WHERE contentTypeId = @id) THEN 1 ELSE 0 END",
+                new { id });
+            return Database.ExecuteScalar<int>(sql) == 1;
+        }
+
         protected override IEnumerable<string> GetDeleteClauses()
         {
             // in theory, services should have ensured that content items of the given content type

src/Umbraco.Core/Persistence/Repositories/Implement/DocumentBlueprintRepository.cs

@@ -2,6 +2,7 @@
 using Umbraco.Core.Cache;
 using Umbraco.Core.Configuration.UmbracoSettings;
 using Umbraco.Core.Logging;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
@@ -17,8 +18,10 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     /// </remarks>
     internal class DocumentBlueprintRepository : DocumentRepository, IDocumentBlueprintRepository
     {
-        public DocumentBlueprintRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, ILanguageRepository languageRepository)
-            : base(scopeAccessor, appCaches, logger, contentTypeRepository, templateRepository, tagRepository, languageRepository)
+        public DocumentBlueprintRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILogger logger,
+            IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, ILanguageRepository languageRepository, IRelationRepository relationRepository, IRelationTypeRepository relationTypeRepository,
+            Lazy<PropertyEditorCollection> propertyEditorCollection, DataValueReferenceFactoryCollection dataValueReferenceFactories)
+            : base(scopeAccessor, appCaches, logger, contentTypeRepository, templateRepository, tagRepository, languageRepository, relationRepository, relationTypeRepository, propertyEditorCollection, dataValueReferenceFactories)
         {
         }
 

src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Cache;
-using Umbraco.Core.Exceptions;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
@@ -12,6 +11,7 @@ using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
 using Umbraco.Core.Persistence.SqlSyntax;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 
@@ -30,8 +30,23 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         private readonly ContentByGuidReadRepository _contentByGuidReadRepository;
         private readonly IScopeAccessor _scopeAccessor;
 
-        public DocumentRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILogger logger, IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, ILanguageRepository languageRepository)
-            : base(scopeAccessor, appCaches, languageRepository, logger)
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="scopeAccessor"></param>
+        /// <param name="appCaches"></param>
+        /// <param name="logger"></param>
+        /// <param name="contentTypeRepository"></param>
+        /// <param name="templateRepository"></param>
+        /// <param name="tagRepository"></param>
+        /// <param name="languageRepository"></param>
+        /// <param name="propertyEditors">
+        ///     Lazy property value collection - must be lazy because we have a circular dependency since some property editors require services, yet these services require property editors
+        /// </param>
+        public DocumentRepository(IScopeAccessor scopeAccessor, AppCaches appCaches, ILogger logger,
+            IContentTypeRepository contentTypeRepository, ITemplateRepository templateRepository, ITagRepository tagRepository, ILanguageRepository languageRepository, IRelationRepository relationRepository, IRelationTypeRepository relationTypeRepository,
+            Lazy<PropertyEditorCollection> propertyEditors, DataValueReferenceFactoryCollection dataValueReferenceFactories)
+            : base(scopeAccessor, appCaches, logger, languageRepository, relationRepository, relationTypeRepository, propertyEditors, dataValueReferenceFactories)
         {
             _contentTypeRepository = contentTypeRepository ?? throw new ArgumentNullException(nameof(contentTypeRepository));
             _templateRepository = templateRepository ?? throw new ArgumentNullException(nameof(templateRepository));
@@ -229,6 +244,21 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true);
         }
 
+        // TODO: This method needs to return a readonly version of IContent! The content returned
+        // from this method does not contain all of the data required to re-persist it and if that
+        // is attempted some odd things will occur.
+        // Either we create an IContentReadOnly (which ultimately we should for vNext so we can
+        // differentiate between methods that return entities that can be re-persisted or not), or
+        // in the meantime to not break API compatibility, we can add a property to IContentBase
+        // (or go further and have it on IUmbracoEntity): "IsReadOnly" and if that is true we throw
+        // an exception if that entity is passed to a Save method.
+        // Ideally we return "Slim" versions of content for all sorts of methods here and in ContentService.
+        // Perhaps another non-breaking alternative is to have new services like IContentServiceReadOnly
+        // which can return IContentReadOnly.
+        // We have the ability with `MapDtosToContent` to reduce the amount of data looked up for a
+        // content item. Ideally for paged data that populates list views, these would be ultra slim
+        // content items, there's no reason to populate those with really anything apart from property data,
+        // but until we do something like the above, we can't do that since it would be breaking and unclear.
         public override IEnumerable<IContent> GetAllVersionsSlim(int nodeId, int skip, int take)
         {
             var sql = GetBaseQuery(QueryType.Many, false)
@@ -236,7 +266,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 .OrderByDescending<ContentVersionDto>(x => x.Current)
                 .AndByDescending<ContentVersionDto>(x => x.VersionDate);
 
-            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true, true).Skip(skip).Take(take);
+            return MapDtosToContent(Database.Fetch<DocumentDto>(sql), true,
+                // load bare minimum, need variants though since this is used to rollback with variants
+                false, false, false, true).Skip(skip).Take(take);
         }
 
         public override IContent GetVersion(int versionId)
@@ -468,6 +500,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 ClearEntityTags(entity, _tagRepository);
             }
 
+            PersistRelations(entity);
+
             entity.ResetDirtyProperties();
 
             // troubleshooting
@@ -671,6 +705,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 ClearEntityTags(entity, _tagRepository);
             }
 
+            PersistRelations(entity);
+
             // TODO: note re. tags: explicitly unpublished entities have cleared tags, but masked or trashed entities *still* have tags in the db - so what?
 
             entity.ResetDirtyProperties();
@@ -1056,7 +1092,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             return base.ApplySystemOrdering(ref sql, ordering);
         }
 
-        private IEnumerable<IContent> MapDtosToContent(List<DocumentDto> dtos, bool withCache = false, bool slim = false)
+        private IEnumerable<IContent> MapDtosToContent(List<DocumentDto> dtos,
+            bool withCache = false,
+            bool loadProperties = true,
+            bool loadTemplates = true,
+            bool loadSchedule = true,
+            bool loadVariants = true)
         {
             var temps = new List<TempContent<Content>>();
             var contentTypes = new Dictionary<int, IContentType>();
@@ -1089,7 +1130,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
                 var c = content[i] = ContentBaseFactory.BuildEntity(dto, contentType);
 
-                if (!slim)
+                if (loadTemplates)
                 {
                     // need templates
                     var templateId = dto.DocumentVersionDto.TemplateId;
@@ -1114,49 +1155,71 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                 temps.Add(temp);
             }
 
-            if (!slim)
+            Dictionary<int, ITemplate> templates = null;
+            if (loadTemplates)
             {
                 // load all required templates in 1 query, and index
-                var templates = _templateRepository.GetMany(templateIds.ToArray())
+                templates = _templateRepository.GetMany(templateIds.ToArray())
                     .ToDictionary(x => x.Id, x => x);
+            }
 
+            IDictionary<int, PropertyCollection> properties = null;
+            if (loadProperties)
+            {
                 // load all properties for all documents from database in 1 query - indexed by version id
-                var properties = GetPropertyCollections(temps);
-                var schedule = GetContentSchedule(temps.Select(x => x.Content.Id).ToArray());
+                properties = GetPropertyCollections(temps);
+            }
 
-                // assign templates and properties
-                foreach (var temp in temps)
+            var schedule = GetContentSchedule(temps.Select(x => x.Content.Id).ToArray());
+
+            // assign templates and properties
+            foreach (var temp in temps)
+            {
+                if (loadTemplates)
                 {
                     // set the template ID if it matches an existing template
                     if (temp.Template1Id.HasValue && templates.ContainsKey(temp.Template1Id.Value))
                         temp.Content.TemplateId = temp.Template1Id;
                     if (temp.Template2Id.HasValue && templates.ContainsKey(temp.Template2Id.Value))
                         temp.Content.PublishTemplateId = temp.Template2Id;
+                }
+                
 
-                    // set properties
+                // set properties
+                if (loadProperties)
+                {
                     if (properties.ContainsKey(temp.VersionId))
                         temp.Content.Properties = properties[temp.VersionId];
                     else
                         throw new InvalidOperationException($"No property data found for version: '{temp.VersionId}'.");
+                }
 
+                if (loadSchedule)
+                {
                     // load in the schedule
                     if (schedule.TryGetValue(temp.Content.Id, out var s))
                         temp.Content.ContentSchedule = s;
                 }
+
             }
 
-            // set variations, if varying
-            temps = temps.Where(x => x.ContentType.VariesByCulture()).ToList();
-            if (temps.Count > 0)
+            if (loadVariants)
             {
-                // load all variations for all documents from database, in one query
-                var contentVariations = GetContentVariations(temps);
-                var documentVariations = GetDocumentVariations(temps);
-                foreach (var temp in temps)
-                    SetVariations(temp.Content, contentVariations, documentVariations);
+                // set variations, if varying
+                temps = temps.Where(x => x.ContentType.VariesByCulture()).ToList();
+                if (temps.Count > 0)
+                {
+                    // load all variations for all documents from database, in one query
+                    var contentVariations = GetContentVariations(temps);
+                    var documentVariations = GetDocumentVariations(temps);
+                    foreach (var temp in temps)
+                        SetVariations(temp.Content, contentVariations, documentVariations);
+                }
             }
+            
 
-            foreach(var c in content)
+
+            foreach (var c in content)
                 c.ResetDirtyProperties(false); // reset dirty initial properties (U4-1946)
 
             return content;

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

@@ -35,21 +35,33 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected ISqlSyntaxProvider SqlSyntax => _scopeAccessor.AmbientScope.SqlContext.SqlSyntax;
 
         #region Repository
-
-        // get a page of entities
+        
         public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid objectType, long pageIndex, int pageSize, out long totalRecords,
             IQuery<IUmbracoEntity> filter, Ordering ordering)
         {
-            var isContent = objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint;
-            var isMedia = objectType == Constants.ObjectTypes.Media;
-            var isMember = objectType == Constants.ObjectTypes.Member;
+            return GetPagedResultsByQuery(query, new[] { objectType }, pageIndex, pageSize, out totalRecords, filter, ordering);
+        }
 
-            var sql = GetBaseWhere(isContent, isMedia, isMember, false, x =>
+        // get a page of entities
+        public IEnumerable<IEntitySlim> GetPagedResultsByQuery(IQuery<IUmbracoEntity> query, Guid[] objectTypes, long pageIndex, int pageSize, out long totalRecords,
+            IQuery<IUmbracoEntity> filter, Ordering ordering, Action<Sql<ISqlContext>> sqlCustomization = null)
+        {
+            var isContent = objectTypes.Any(objectType => objectType == Constants.ObjectTypes.Document || objectType == Constants.ObjectTypes.DocumentBlueprint);
+            var isMedia = objectTypes.Any(objectType => objectType == Constants.ObjectTypes.Media);
+            var isMember = objectTypes.Any(objectType => objectType == Constants.ObjectTypes.Member);
+
+            var sql = GetBaseWhere(isContent, isMedia, isMember, false, s =>
             {
-                if (filter == null) return;
-                foreach (var filterClause in filter.GetWhereClauses())
-                    x.Where(filterClause.Item1, filterClause.Item2);
-            }, objectType);
+                sqlCustomization?.Invoke(s);
+
+                if (filter != null)
+                {
+                    foreach (var filterClause in filter.GetWhereClauses())
+                        s.Where(filterClause.Item1, filterClause.Item2);
+                }
+                
+
+            }, objectTypes);
 
             ordering = ordering ?? Ordering.ByDefault();
 
@@ -70,35 +82,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // for content we must query for ContentEntityDto entities to produce the correct culture variant entity names
             var pageIndexToFetch = pageIndex + 1;
             IEnumerable<BaseDto> dtos;
-            if(isContent)
-            {
-                var page = Database.Page<ContentEntityDto>(pageIndexToFetch, pageSize, sql);
-                dtos = page.Items;
-                totalRecords = page.TotalItems;
-            }
-            else if (isMedia)
-            {
-                var page = Database.Page<MediaEntityDto>(pageIndexToFetch, pageSize, sql);
-                dtos = page.Items;
-                totalRecords = page.TotalItems;
-            }
-            else if (isMember)
-            {
-                var page = Database.Page<MemberEntityDto>(pageIndexToFetch, pageSize, sql);
-                dtos = page.Items;
-                totalRecords = page.TotalItems;
-            }
-            else
-            {
-                var page = Database.Page<BaseDto>(pageIndexToFetch, pageSize, sql);
-                dtos = page.Items;
-                totalRecords = page.TotalItems;
-            }
+            var page = Database.Page<GenericContentEntityDto>(pageIndexToFetch, pageSize, sql);
+            dtos = page.Items;
+            totalRecords = page.TotalItems;
 
-            var entities = dtos.Select(x => BuildEntity(isContent, isMedia, isMember, x)).ToArray();
+            var entities = dtos.Select(BuildEntity).ToArray();
 
-            if (isContent)
-                BuildVariants(entities.Cast<DocumentEntitySlim>());
+            BuildVariants(entities.OfType<DocumentEntitySlim>());
 
             return entities;
         }
@@ -107,7 +97,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             var sql = GetBaseWhere(false, false, false, false, key);
             var dto = Database.FirstOrDefault<BaseDto>(sql);
-            return dto == null ? null : BuildEntity(false, false, false, dto);
+            return dto == null ? null : BuildEntity(dto);
         }
 
 
@@ -116,7 +106,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             //isContent is going to return a 1:M result now with the variants so we need to do different things
             if (isContent)
             {
-                var cdtos = Database.Fetch<ContentEntityDto>(sql);
+                var cdtos = Database.Fetch<DocumentEntityDto>(sql);
 
                 return cdtos.Count == 0 ? null : BuildVariants(BuildDocumentEntity(cdtos[0]));
             }
@@ -127,7 +117,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             if (dto == null) return null;
 
-            var entity = BuildEntity(false, isMedia, isMember, dto);
+            var entity = BuildEntity(dto);
 
             return entity;
         }
@@ -146,7 +136,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             var sql = GetBaseWhere(false, false, false, false, id);
             var dto = Database.FirstOrDefault<BaseDto>(sql);
-            return dto == null ? null : BuildEntity(false, false, false, dto);
+            return dto == null ? null : BuildEntity(dto);
         }
 
         public IEntitySlim Get(int id, Guid objectTypeId)
@@ -178,7 +168,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             //isContent is going to return a 1:M result now with the variants so we need to do different things
             if (isContent)
             {
-                var cdtos = Database.Fetch<ContentEntityDto>(sql);
+                var cdtos = Database.Fetch<DocumentEntityDto>(sql);
 
                 return cdtos.Count == 0
                     ? Enumerable.Empty<IEntitySlim>()
@@ -189,7 +179,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
                     ? (IEnumerable<BaseDto>)Database.Fetch<MediaEntityDto>(sql)
                     : Database.Fetch<BaseDto>(sql);
 
-            var entities = dtos.Select(x => BuildEntity(false, isMedia, isMember, x)).ToArray();
+            var entities = dtos.Select(BuildEntity).ToArray();
 
             return entities;
         }
@@ -233,7 +223,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var sql = translator.Translate();
             sql = AddGroupBy(false, false, false, sql, true);
             var dtos = Database.Fetch<BaseDto>(sql);
-            return dtos.Select(x => BuildEntity(false, false, false, x)).ToList();
+            return dtos.Select(BuildEntity).ToList();
         }
 
         public IEnumerable<IEntitySlim> GetByQuery(IQuery<IUmbracoEntity> query, Guid objectType)
@@ -242,7 +232,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var isMedia = objectType == Constants.ObjectTypes.Media;
             var isMember = objectType == Constants.ObjectTypes.Member;
 
-            var sql = GetBaseWhere(isContent, isMedia, isMember, false, null, objectType);
+            var sql = GetBaseWhere(isContent, isMedia, isMember, false, null, new[] { objectType });
 
             var translator = new SqlTranslator<IUmbracoEntity>(sql, query);
             sql = translator.Translate();
@@ -356,14 +346,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         // gets the full sql for a given object type, with a given filter
         protected Sql<ISqlContext> GetFullSqlForEntityType(bool isContent, bool isMedia, bool isMember, Guid objectType, Action<Sql<ISqlContext>> filter)
         {
-            var sql = GetBaseWhere(isContent, isMedia, isMember, false, filter, objectType);
+            var sql = GetBaseWhere(isContent, isMedia, isMember, false, filter, new[] { objectType });
             return AddGroupBy(isContent, isMedia, isMember, sql, true);
         }
 
         // gets the base SELECT + FROM [+ filter] sql
         // always from the 'current' content version
         protected Sql<ISqlContext> GetBase(bool isContent, bool isMedia, bool isMember, Action<Sql<ISqlContext>> filter, bool isCount = false)
-         {
+        {
             var sql = Sql();
 
             if (isCount)
@@ -401,15 +391,15 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (isContent || isMedia || isMember)
             {
                 sql
-                    .InnerJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId && right.Current)
-                    .InnerJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
-                    .InnerJoin<ContentTypeDto>().On<ContentDto, ContentTypeDto>((left, right) => left.ContentTypeId == right.NodeId);
+                    .LeftJoin<ContentVersionDto>().On<NodeDto, ContentVersionDto>((left, right) => left.NodeId == right.NodeId && right.Current)
+                    .LeftJoin<ContentDto>().On<NodeDto, ContentDto>((left, right) => left.NodeId == right.NodeId)
+                    .LeftJoin<ContentTypeDto>().On<ContentDto, ContentTypeDto>((left, right) => left.ContentTypeId == right.NodeId);
             }
 
             if (isContent)
             {
                 sql
-                    .InnerJoin<DocumentDto>().On<NodeDto, DocumentDto>((left, right) => left.NodeId == right.NodeId);
+                    .LeftJoin<DocumentDto>().On<NodeDto, DocumentDto>((left, right) => left.NodeId == right.NodeId);
             }
 
             if (isMedia)
@@ -433,10 +423,14 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         // gets the base SELECT + FROM [+ filter] + WHERE sql
         // for a given object type, with a given filter
-        protected Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isMember, bool isCount, Action<Sql<ISqlContext>> filter, Guid objectType)
+        protected Sql<ISqlContext> GetBaseWhere(bool isContent, bool isMedia, bool isMember, bool isCount, Action<Sql<ISqlContext>> filter, Guid[] objectTypes)
         {
-            return GetBase(isContent, isMedia, isMember, filter, isCount)
-                .Where<NodeDto>(x => x.NodeObjectType == objectType);
+            var sql = GetBase(isContent, isMedia, isMember, filter, isCount);
+            if (objectTypes.Length > 0)
+            {
+                sql.WhereIn<NodeDto>(x => x.NodeObjectType, objectTypes);
+            }
+            return sql;
         }
 
         // gets the base SELECT + FROM + WHERE sql
@@ -510,8 +504,19 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             if (sql == null) throw new ArgumentNullException(nameof(sql));
             if (ordering == null) throw new ArgumentNullException(nameof(ordering));
 
-            // TODO: although this works for name, it probably doesn't work for others without an alias of some sort
-            var orderBy = ordering.OrderBy;
+            // TODO: although the default ordering string works for name, it wont work for others without a table or an alias of some sort
+            // As more things are attempted to be sorted we'll prob have to add more expressions here
+            string orderBy;
+            switch (ordering.OrderBy.ToUpperInvariant())
+            {
+                case "PATH":
+                    orderBy = SqlSyntax.GetQuotedColumn(NodeDto.TableName, "path");
+                    break;
+
+                default:
+                    orderBy = ordering.OrderBy;
+                    break;
+            }            
 
             if (ordering.Direction == Direction.Ascending)
                 sql.OrderBy(orderBy);
@@ -524,9 +529,17 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         #region Classes
 
         /// <summary>
-        /// The DTO used to fetch results for a content item with its variation info
+        /// The DTO used to fetch results for a generic content item which could be either a document, media or a member
         /// </summary>
-        private class ContentEntityDto : BaseDto
+        private class GenericContentEntityDto : DocumentEntityDto
+        {
+            public string MediaPath { get; set; }
+        }
+
+        /// <summary>
+        /// The DTO used to fetch results for a document item with its variation info
+        /// </summary>
+        private class DocumentEntityDto : BaseDto
         {
             public ContentVariation Variations { get; set; }
 
@@ -534,11 +547,17 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             public bool Edited { get; set; }
         }
 
+        /// <summary>
+        /// The DTO used to fetch results for a media item with its media path info
+        /// </summary>
         private class MediaEntityDto : BaseDto
         {
             public string MediaPath { get; set; }
         }
 
+        /// <summary>
+        /// The DTO used to fetch results for a member item
+        /// </summary>
         private class MemberEntityDto : BaseDto
         {
         }
@@ -589,13 +608,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         #region Factory
 
-        private EntitySlim BuildEntity(bool isContent, bool isMedia, bool isMember, BaseDto dto)
+        private EntitySlim BuildEntity(BaseDto dto)
         {
-            if (isContent)
+            if (dto.NodeObjectType == Constants.ObjectTypes.Document)
                 return BuildDocumentEntity(dto);
-            if (isMedia)
+            if (dto.NodeObjectType == Constants.ObjectTypes.Media)
                 return BuildMediaEntity(dto);
-            if (isMember)
+            if (dto.NodeObjectType == Constants.ObjectTypes.Member)
                 return BuildMemberEntity(dto);
 
             // EntitySlim does not track changes
@@ -650,7 +669,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             var entity = new DocumentEntitySlim();
             BuildContentEntity(entity, dto);
 
-            if (dto is ContentEntityDto contentDto)
+            if (dto is DocumentEntityDto contentDto)
             {
                 // fill in the invariant info
                 entity.Edited = contentDto.Edited;

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

@@ -12,6 +12,7 @@ using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
@@ -27,8 +28,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         private readonly ITagRepository _tagRepository;
         private readonly MediaByGuidReadRepository _mediaByGuidReadRepository;
 
-        public MediaRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IMediaTypeRepository mediaTypeRepository, ITagRepository tagRepository, ILanguageRepository languageRepository)
-            : base(scopeAccessor, cache, languageRepository, logger)
+        public MediaRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IMediaTypeRepository mediaTypeRepository, ITagRepository tagRepository, ILanguageRepository languageRepository, IRelationRepository relationRepository, IRelationTypeRepository relationTypeRepository,
+            Lazy<PropertyEditorCollection> propertyEditorCollection, DataValueReferenceFactoryCollection dataValueReferenceFactories)
+            : base(scopeAccessor, cache, logger, languageRepository, relationRepository, relationTypeRepository, propertyEditorCollection, dataValueReferenceFactories)
         {
             _mediaTypeRepository = mediaTypeRepository ?? throw new ArgumentNullException(nameof(mediaTypeRepository));
             _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
@@ -228,7 +230,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             entity.SanitizeEntityPropertiesForXmlStorage();
 
             // create the dto
-            var dto = ContentBaseFactory.BuildDto(entity);
+            var dto = ContentBaseFactory.BuildDto(PropertyEditors, entity);
 
             // derive path and level from parent
             var parent = GetParentNodeDto(entity.ParentId);
@@ -287,6 +289,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             // set tags
             SetEntityTags(entity, _tagRepository);
 
+            PersistRelations(entity);
+
             OnUowRefreshedEntity(new ScopedEntityEventArgs(AmbientScope, entity));
 
             entity.ResetDirtyProperties();
@@ -317,7 +321,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             }
 
             // create the dto
-            var dto = ContentBaseFactory.BuildDto(entity);
+            var dto = ContentBaseFactory.BuildDto(PropertyEditors, entity);
 
             // update the node dto
             var nodeDto = dto.ContentDto.NodeDto;
@@ -343,6 +347,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             SetEntityTags(entity, _tagRepository);
 
+            PersistRelations(entity);
+
             OnUowRefreshedEntity(new ScopedEntityEventArgs(AmbientScope, entity));
 
             entity.ResetDirtyProperties();
@@ -542,6 +548,6 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
             media.ResetDirtyProperties(false);
             return media;
         }
-        
+
     }
 }

src/Umbraco.Core/Persistence/Repositories/Implement/MemberRepository.cs

@@ -10,6 +10,7 @@ using Umbraco.Core.Models.Entities;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.PropertyEditors;
 using Umbraco.Core.Scoping;
 using Umbraco.Core.Services;
 using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
@@ -25,8 +26,10 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         private readonly ITagRepository _tagRepository;
         private readonly IMemberGroupRepository _memberGroupRepository;
 
-        public MemberRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger, IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, ITagRepository tagRepository, ILanguageRepository languageRepository)
-            : base(scopeAccessor, cache, languageRepository, logger)
+        public MemberRepository(IScopeAccessor scopeAccessor, AppCaches cache, ILogger logger,
+            IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, ITagRepository tagRepository, ILanguageRepository languageRepository, IRelationRepository relationRepository, IRelationTypeRepository relationTypeRepository,
+            Lazy<PropertyEditorCollection> propertyEditors, DataValueReferenceFactoryCollection dataValueReferenceFactories)
+            : base(scopeAccessor, cache, logger, languageRepository, relationRepository, relationTypeRepository, propertyEditors, dataValueReferenceFactories)
         {
             _memberTypeRepository = memberTypeRepository ?? throw new ArgumentNullException(nameof(memberTypeRepository));
             _tagRepository = tagRepository ?? throw new ArgumentNullException(nameof(tagRepository));
@@ -321,6 +324,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             SetEntityTags(entity, _tagRepository);
 
+            PersistRelations(entity);
+
             OnUowRefreshedEntity(new ScopedEntityEventArgs(AmbientScope, entity));
 
             entity.ResetDirtyProperties();
@@ -386,6 +391,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             SetEntityTags(entity, _tagRepository);
 
+            PersistRelations(entity);
+
             OnUowRefreshedEntity(new ScopedEntityEventArgs(AmbientScope, entity));
 
             entity.ResetDirtyProperties();

src/Umbraco.Core/Persistence/Repositories/Implement/RelationRepository.cs

@@ -6,10 +6,14 @@ using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.Entities;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
 using Umbraco.Core.Persistence.Factories;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.SqlSyntax;
 using Umbraco.Core.Scoping;
+using Umbraco.Core.Services;
+using static Umbraco.Core.Persistence.NPocoSqlExtensions.Statics;
 
 namespace Umbraco.Core.Persistence.Repositories.Implement
 {
@@ -19,11 +23,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
     internal class RelationRepository : NPocoRepositoryBase<int, IRelation>, IRelationRepository
     {
         private readonly IRelationTypeRepository _relationTypeRepository;
+        private readonly IEntityRepository _entityRepository;
 
-        public RelationRepository(IScopeAccessor scopeAccessor, ILogger logger, IRelationTypeRepository relationTypeRepository)
+        public RelationRepository(IScopeAccessor scopeAccessor, ILogger logger, IRelationTypeRepository relationTypeRepository, IEntityRepository entityRepository)
             : base(scopeAccessor, AppCaches.NoCache, logger)
         {
             _relationTypeRepository = relationTypeRepository;
+            _entityRepository = entityRepository;
         }
 
         #region Overrides of RepositoryBase<int,Relation>
@@ -39,10 +45,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
             var relationType = _relationTypeRepository.Get(dto.RelationType);
             if (relationType == null)
-                throw new Exception(string.Format("RelationType with Id: {0} doesn't exist", dto.RelationType));
+                throw new InvalidOperationException(string.Format("RelationType with Id: {0} doesn't exist", dto.RelationType));
 
-            var factory = new RelationFactory(relationType);
-            return DtoToEntity(dto, factory);
+            return DtoToEntity(dto, relationType);
         }
 
         protected override IEnumerable<IRelation> PerformGetAll(params int[] ids)
@@ -67,26 +72,17 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         private IEnumerable<IRelation> DtosToEntities(IEnumerable<RelationDto> dtos)
         {
-            // in most cases, the relation type will be the same for all of them,
-            // plus we've ordered the relations by type, so try to allocate as few
-            // factories as possible - bearing in mind that relation types are cached
-            RelationFactory factory = null;
-            var relationTypeId = -1;
+            //NOTE: This is N+1, BUT ALL relation types are cached so shouldn't matter
 
-            return dtos.Select(x =>
-            {
-                if (relationTypeId != x.RelationType)
-                    factory = new RelationFactory(_relationTypeRepository.Get(relationTypeId = x.RelationType));
-                return DtoToEntity(x, factory);
-            }).ToList();
+            return dtos.Select(x => DtoToEntity(x, _relationTypeRepository.Get(x.RelationType))).ToList();
         }
 
-        private static IRelation DtoToEntity(RelationDto dto, RelationFactory factory)
+        private static IRelation DtoToEntity(RelationDto dto, IRelationType relationType)
         {
-            var entity = factory.BuildEntity(dto);
+            var entity = RelationFactory.BuildEntity(dto, relationType);
 
             // reset dirty initial properties (U4-1946)
-            ((BeingDirtyBase)entity).ResetDirtyProperties(false);
+            entity.ResetDirtyProperties(false);
 
             return entity;
         }
@@ -97,14 +93,18 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
 
         protected override Sql<ISqlContext> GetBaseQuery(bool isCount)
         {
-            var sql = Sql();
+            if (isCount)
+            {
+                return Sql().SelectCount().From<RelationDto>();
+            }
 
-            sql = isCount
-                ? sql.SelectCount()
-                : sql.Select<RelationDto>();
+            var sql = Sql().Select<RelationDto>()
+                .AndSelect<NodeDto>("uchild", x => Alias(x.NodeObjectType, "childObjectType"))
+                .AndSelect<NodeDto>("uparent", x => Alias(x.NodeObjectType, "parentObjectType"))
+                .From<RelationDto>()
+                .InnerJoin<NodeDto>("uchild").On<RelationDto, NodeDto>((rel, node) => rel.ChildId == node.NodeId, aliasRight: "uchild")
+                .InnerJoin<NodeDto>("uparent").On<RelationDto, NodeDto>((rel, node) => rel.ParentId == node.NodeId, aliasRight: "uparent");
 
-            sql
-               .From<RelationDto>();
 
             return sql;
         }
@@ -136,11 +136,12 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             entity.AddingEntity();
 
-            var factory = new RelationFactory(entity.RelationType);
-            var dto = factory.BuildDto(entity);
+            var dto = RelationFactory.BuildDto(entity);
 
             var id = Convert.ToInt32(Database.Insert(dto));
+
             entity.Id = id;
+            PopulateObjectTypes(entity);
 
             entity.ResetDirtyProperties();
         }
@@ -149,13 +150,192 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         {
             entity.UpdatingEntity();
 
-            var factory = new RelationFactory(entity.RelationType);
-            var dto = factory.BuildDto(entity);
+            var dto = RelationFactory.BuildDto(entity);
             Database.Update(dto);
 
+            PopulateObjectTypes(entity);
+
             entity.ResetDirtyProperties();
         }
 
         #endregion
+
+        /// <summary>
+        /// Used for joining the entity query with relations for the paging methods
+        /// </summary>
+        /// <param name="sql"></param>
+        private void SqlJoinRelations(Sql<ISqlContext> sql)
+        {
+            // add left joins for relation tables (this joins on both child or parent, so beware that this will normally return entities for
+            // both sides of the relation type unless the IUmbracoEntity query passed in filters one side out).
+            sql.LeftJoin<RelationDto>().On<NodeDto, RelationDto>((left, right) => left.NodeId == right.ChildId || left.NodeId == right.ParentId);
+            sql.LeftJoin<RelationTypeDto>().On<RelationDto, RelationTypeDto>((left, right) => left.RelationType == right.Id);
+        }
+
+        public IEnumerable<IUmbracoEntity> GetPagedParentEntitiesByChildId(int childId, long pageIndex, int pageSize, out long totalRecords, params Guid[] entityTypes)
+        {
+            // var contentObjectTypes = new[] { Constants.ObjectTypes.Document, Constants.ObjectTypes.Media, Constants.ObjectTypes.Member }
+            // we could pass in the contentObjectTypes so that the entity repository sql is configured to do full entity lookups so that we get the full data
+            // required to populate content, media or members, else we get the bare minimum data needed to populate an entity. BUT if we do this it
+            // means that the SQL is less efficient and returns data that is probably not needed for what we need this lookup for. For the time being we
+            // will just return the bare minimum entity data.
+
+            return _entityRepository.GetPagedResultsByQuery(Query<IUmbracoEntity>(), entityTypes, pageIndex, pageSize, out totalRecords, null, null, sql =>
+            {
+                SqlJoinRelations(sql);
+
+                sql.Where<RelationDto>(rel => rel.ChildId == childId);
+                sql.Where<RelationDto, NodeDto>((rel, node) => rel.ParentId == childId || node.NodeId != childId);
+            });
+        }
+
+        public IEnumerable<IUmbracoEntity> GetPagedChildEntitiesByParentId(int parentId, long pageIndex, int pageSize, out long totalRecords, params Guid[] entityTypes)
+        {
+            // var contentObjectTypes = new[] { Constants.ObjectTypes.Document, Constants.ObjectTypes.Media, Constants.ObjectTypes.Member }
+            // we could pass in the contentObjectTypes so that the entity repository sql is configured to do full entity lookups so that we get the full data
+            // required to populate content, media or members, else we get the bare minimum data needed to populate an entity. BUT if we do this it
+            // means that the SQL is less efficient and returns data that is probably not needed for what we need this lookup for. For the time being we
+            // will just return the bare minimum entity data.
+
+            return _entityRepository.GetPagedResultsByQuery(Query<IUmbracoEntity>(), entityTypes, pageIndex, pageSize, out totalRecords, null, null, sql =>
+            {
+                SqlJoinRelations(sql);
+
+                sql.Where<RelationDto>(rel => rel.ParentId == parentId);
+                sql.Where<RelationDto, NodeDto>((rel, node) => rel.ChildId == parentId || node.NodeId != parentId);
+            });
+        }
+
+        public void Save(IEnumerable<IRelation> relations)
+        {
+            foreach (var hasIdentityGroup in relations.GroupBy(r => r.HasIdentity))
+            {
+                if (hasIdentityGroup.Key)
+                {
+                    // Do updates, we can't really do a bulk update so this is still a 1 by 1 operation
+                    // however we can bulk populate the object types. It might be possible to bulk update
+                    // with SQL but would be pretty ugly and we're not really too worried about that for perf,
+                    // it's the bulk inserts we care about.
+                    var asArray = hasIdentityGroup.ToArray();
+                    foreach (var relation in hasIdentityGroup)
+                    {
+                        relation.UpdatingEntity();
+                        var dto = RelationFactory.BuildDto(relation);
+                        Database.Update(dto);
+                    }
+                    PopulateObjectTypes(asArray);
+                }
+                else
+                {
+                    // Do bulk inserts
+                    var entitiesAndDtos = hasIdentityGroup.ToDictionary(
+                        r =>                        // key = entity
+                        {
+                            r.AddingEntity();
+                            return r;
+                        },
+                        RelationFactory.BuildDto);  // value = DTO
+
+                    // Use NPoco's own InsertBulk command which will automatically re-populate the new Ids on the entities, our own
+                    // BulkInsertRecords does not cater for this.
+                    Database.InsertBulk(entitiesAndDtos.Values);
+
+                    // All dtos now have IDs assigned
+                    foreach (var de in entitiesAndDtos)
+                    {
+                        // re-assign ID to the entity
+                        de.Key.Id = de.Value.Id;
+                    }
+
+                    PopulateObjectTypes(entitiesAndDtos.Keys.ToArray());
+                }
+            }
+        }
+
+        public IEnumerable<IRelation> GetPagedRelationsByQuery(IQuery<IRelation> query, long pageIndex, int pageSize, out long totalRecords, Ordering ordering)
+        {
+            var sql = GetBaseQuery(false);
+
+            if (ordering == null || ordering.IsEmpty)
+                ordering = Ordering.By(SqlSyntax.GetQuotedColumn(Constants.DatabaseSchema.Tables.Relation, "id"));
+
+            var translator = new SqlTranslator<IRelation>(sql, query);
+            sql = translator.Translate();
+
+            // apply ordering
+            ApplyOrdering(ref sql, ordering);
+
+            var pageIndexToFetch = pageIndex + 1;
+            var page = Database.Page<RelationDto>(pageIndexToFetch, pageSize, sql);
+            var dtos = page.Items;
+            totalRecords = page.TotalItems;
+
+            var relTypes = _relationTypeRepository.GetMany(dtos.Select(x => x.RelationType).Distinct().ToArray())
+                .ToDictionary(x => x.Id, x => x);
+
+            var result = dtos.Select(r =>
+            {
+                if (!relTypes.TryGetValue(r.RelationType, out var relType))
+                    throw new InvalidOperationException(string.Format("RelationType with Id: {0} doesn't exist", r.RelationType));
+                return DtoToEntity(r, relType);
+            }).ToList();
+
+            return result;
+        }
+
+        
+        public void DeleteByParent(int parentId, params string[] relationTypeAliases)
+        {
+            var subQuery = Sql().Select<RelationDto>(x => x.Id)
+                .From<RelationDto>()
+                .InnerJoin<RelationTypeDto>().On<RelationDto, RelationTypeDto>(x => x.RelationType, x => x.Id)
+                .Where<RelationDto>(x => x.ParentId == parentId);
+
+            if (relationTypeAliases.Length > 0)
+            {
+                subQuery.WhereIn<RelationTypeDto>(x => x.Alias, relationTypeAliases);
+            }
+
+            Database.Execute(Sql().Delete<RelationDto>().WhereIn<RelationDto>(x => x.Id, subQuery));
+        }
+
+        /// <summary>
+        /// Used to populate the object types after insert/update
+        /// </summary>
+        /// <param name="entities"></param>
+        private void PopulateObjectTypes(params IRelation[] entities)
+        {
+            var entityIds = entities.Select(x => x.ParentId).Concat(entities.Select(y => y.ChildId)).Distinct();
+
+            var nodes = Database.Fetch<NodeDto>(Sql().Select<NodeDto>().From<NodeDto>()
+                    .WhereIn<NodeDto>(x => x.NodeId, entityIds))
+                .ToDictionary(x => x.NodeId, x => x.NodeObjectType);
+
+            foreach (var e in entities)
+            {
+                if (nodes.TryGetValue(e.ParentId, out var parentObjectType))
+                {
+                    e.ParentObjectType = parentObjectType.GetValueOrDefault();
+                }
+                if (nodes.TryGetValue(e.ChildId, out var childObjectType))
+                {
+                    e.ChildObjectType = childObjectType.GetValueOrDefault();
+                }
+            }
+        }
+
+        private void ApplyOrdering(ref Sql<ISqlContext> sql, Ordering ordering)
+        {
+            if (sql == null) throw new ArgumentNullException(nameof(sql));
+            if (ordering == null) throw new ArgumentNullException(nameof(ordering));
+
+            // TODO: although this works for name, it probably doesn't work for others without an alias of some sort
+            var orderBy = ordering.OrderBy;
+
+            if (ordering.Direction == Direction.Ascending)
+                sql.OrderBy(orderBy);
+            else
+                sql.OrderByDescending(orderBy);
+        }
     }
 }

src/Umbraco.Core/Persistence/Repositories/Implement/RelationTypeRepository.cs

@@ -134,7 +134,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected override void PersistNewItem(IRelationType entity)
         {
             entity.AddingEntity();
-            
+
+            CheckNullObjectTypeValues(entity);
+
             var dto = RelationTypeFactory.BuildDto(entity);
 
             var id = Convert.ToInt32(Database.Insert(dto));
@@ -146,7 +148,9 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         protected override void PersistUpdatedItem(IRelationType entity)
         {
             entity.UpdatingEntity();
-            
+
+            CheckNullObjectTypeValues(entity);
+
             var dto = RelationTypeFactory.BuildDto(entity);
             Database.Update(dto);
 
@@ -154,5 +158,13 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         }
 
         #endregion
+
+        private void CheckNullObjectTypeValues(IRelationType entity)
+        {
+            if (entity.ParentObjectType.HasValue && entity.ParentObjectType == Guid.Empty)
+                entity.ParentObjectType = null;
+            if (entity.ChildObjectType.HasValue && entity.ChildObjectType == Guid.Empty)
+                entity.ChildObjectType = null;
+        }
     }
 }

src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs

@@ -250,6 +250,11 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
         }
 
         public override void WriteLock(IDatabase db, params int[] lockIds)
+        {
+            WriteLock(db, TimeSpan.FromMilliseconds(1800), lockIds);
+        }
+
+        public void WriteLock(IDatabase db, TimeSpan timeout, params int[] lockIds)
         {
             // soon as we get Database, a transaction is started
 
@@ -260,7 +265,7 @@ where tbl.[name]=@0 and col.[name]=@1;", tableName, columnName)
             // *not* using a unique 'WHERE IN' query here because the *order* of lockIds is important to avoid deadlocks
             foreach (var lockId in lockIds)
             {
-                db.Execute(@"SET LOCK_TIMEOUT 1800;");
+                db.Execute($"SET LOCK_TIMEOUT {timeout.TotalMilliseconds};");
                 var i = db.Execute(@"UPDATE umbracoLock WITH (REPEATABLEREAD) SET value = (CASE WHEN (value=1) THEN -1 ELSE 1 END) WHERE id=@id", new { id = lockId });
                 if (i == 0) // ensure we are actually locking!
                     throw new ArgumentException($"LockObject with id={lockId} does not exist.");

src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs

@@ -35,6 +35,8 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         /// </remarks>
         public static Sql GetDeleteSubquery(this ISqlSyntaxProvider sqlProvider, string tableName, string columnName, Sql subQuery, WhereInType whereInType = WhereInType.In)
         {
+            //TODO: This is no longer necessary since this used to be a specific requirement for MySql!
+            // Now we can do a Delete<T> + sub query, see RelationRepository.DeleteByParent for example
 
             return
                 new Sql(string.Format(

src/Umbraco.Core/Persistence/UmbracoDatabase.cs

@@ -44,6 +44,8 @@ namespace Umbraco.Core.Persistence
             _commandRetryPolicy = commandRetryPolicy;
 
             EnableSqlTrace = EnableSqlTraceDefault;
+
+            NPocoDatabaseExtensions.ConfigureNPocoBulkExtensions();
         }
 
         /// <summary>
@@ -57,6 +59,8 @@ namespace Umbraco.Core.Persistence
             _logger = logger;
 
             EnableSqlTrace = EnableSqlTraceDefault;
+
+            NPocoDatabaseExtensions.ConfigureNPocoBulkExtensions();
         }
 
         #endregion

src/Umbraco.Core/Properties/AssemblyInfo.cs

@@ -14,6 +14,7 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo("Umbraco.Web")]
 [assembly: InternalsVisibleTo("Umbraco.Web.UI")]
 [assembly: InternalsVisibleTo("Umbraco.Examine")]
+[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder.Embedded")]
 
 [assembly: InternalsVisibleTo("Umbraco.Tests")]
 [assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")]

src/Umbraco.Core/PropertyEditors/DataEditor.cs

@@ -19,6 +19,7 @@ namespace Umbraco.Core.PropertyEditors
     public class DataEditor : IDataEditor
     {
         private IDictionary<string, object> _defaultConfiguration;
+        private IDataValueEditor _dataValueEditor;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DataEditor"/> class.
@@ -90,7 +91,7 @@ namespace Umbraco.Core.PropertyEditors
         /// simple enough for now.</para>
         /// </remarks>
         // TODO: point of that one? shouldn't we always configure?
-        public IDataValueEditor GetValueEditor() => ExplicitValueEditor ?? CreateValueEditor();
+        public IDataValueEditor GetValueEditor() => ExplicitValueEditor ?? (_dataValueEditor ?? (_dataValueEditor = CreateValueEditor()));
 
         /// <inheritdoc />
         /// <remarks>
@@ -113,7 +114,7 @@ namespace Umbraco.Core.PropertyEditors
                 return ExplicitValueEditor;
 
             var editor = CreateValueEditor();
-            ((DataValueEditor) editor).Configuration = configuration; // TODO: casting is bad
+            ((DataValueEditor)editor).Configuration = configuration; // TODO: casting is bad
             return editor;
         }
 
@@ -163,7 +164,7 @@ namespace Umbraco.Core.PropertyEditors
         protected virtual IDataValueEditor CreateValueEditor()
         {
             if (Attribute == null)
-                throw new InvalidOperationException("The editor does not specify a view.");
+                throw new InvalidOperationException($"The editor is not attributed with {nameof(DataEditorAttribute)}");
 
             return new DataValueEditor(Attribute);
         }
@@ -175,7 +176,7 @@ namespace Umbraco.Core.PropertyEditors
         {
             var editor = new ConfigurationEditor();
             // pass the default configuration if this is not a property value editor
-            if((Type & EditorType.PropertyValue) == 0)
+            if ((Type & EditorType.PropertyValue) == 0)
             {
                 editor.DefaultConfiguration = _defaultConfiguration;
             }

src/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollection.cs

@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using Umbraco.Core.Composing;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Editors;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    public class DataValueReferenceFactoryCollection : BuilderCollectionBase<IDataValueReferenceFactory>
+    {
+        public DataValueReferenceFactoryCollection(IEnumerable<IDataValueReferenceFactory> items)
+            : base(items)
+        { }
+
+        public IEnumerable<UmbracoEntityReference> GetAllReferences(PropertyCollection properties, PropertyEditorCollection propertyEditors)
+        {
+            var trackedRelations = new List<UmbracoEntityReference>();
+
+            foreach (var p in properties)
+            {
+                if (!propertyEditors.TryGet(p.PropertyType.PropertyEditorAlias, out var editor)) continue;
+
+                //TODO: Support variants/segments! This is not required for this initial prototype which is why there is a check here
+                if (!p.PropertyType.VariesByNothing()) continue;
+                var val = p.GetValue(); // get the invariant value
+
+                var valueEditor = editor.GetValueEditor();
+                if (valueEditor is IDataValueReference reference)
+                {
+                    var refs = reference.GetReferences(val);
+                    trackedRelations.AddRange(refs);
+                }                
+
+                // Loop over collection that may be add to existing property editors
+                // implementation of GetReferences in IDataValueReference.
+                // Allows developers to add support for references by a
+                // package /property editor that did not implement IDataValueReference themselves
+                foreach (var item in this)
+                {
+                    // Check if this value reference is for this datatype/editor
+                    // Then call it's GetReferences method - to see if the value stored
+                    // in the dataeditor/property has referecnes to media/content items
+                    if (item.IsForEditor(editor))
+                        trackedRelations.AddRange(item.GetDataValueReference().GetReferences(val));
+                }
+            }
+
+            return trackedRelations;
+        }
+    }
+}

src/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionBuilder.cs

@@ -0,0 +1,9 @@
+using Umbraco.Core.Composing;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    public class DataValueReferenceFactoryCollectionBuilder : OrderedCollectionBuilderBase<DataValueReferenceFactoryCollectionBuilder, DataValueReferenceFactoryCollection, IDataValueReferenceFactory>
+    {
+        protected override DataValueReferenceFactoryCollectionBuilder This => this;
+    }
+}

src/Umbraco.Core/PropertyEditors/IDataEditorWithMediaPath.cs

@@ -0,0 +1,19 @@
+namespace Umbraco.Core.PropertyEditors
+{
+    /// <summary>
+    /// Must be implemented by property editors that store media and return media paths
+    /// </summary>
+    /// <remarks>
+    /// Currently there are only 2x core editors that do this: upload and image cropper.
+    /// It would be possible for developers to know implement their own media property editors whereas previously this was not possible.
+    /// </remarks>
+    public interface IDataEditorWithMediaPath
+    {
+        /// <summary>
+        /// Returns the media path for the value stored for a property
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        string GetMediaPath(object value);
+    }
+}

src/Umbraco.Core/PropertyEditors/IDataValueEditor.cs

@@ -7,6 +7,7 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Core.PropertyEditors
 {
+
     /// <summary>
     /// Represents an editor for editing data values.
     /// </summary>
@@ -63,8 +64,26 @@ namespace Umbraco.Core.PropertyEditors
 
         // TODO: / deal with this when unplugging the xml cache
         // why property vs propertyType? services should be injected! etc...
+
+        /// <summary>
+        /// Used for serializing an <see cref="IContent"/> item for packaging
+        /// </summary>
+        /// <param name="property"></param>
+        /// <param name="dataTypeService"></param>
+        /// <param name="localizationService"></param>
+        /// <param name="published"></param>
+        /// <returns></returns>
         IEnumerable<XElement> ConvertDbToXml(Property property, IDataTypeService dataTypeService, ILocalizationService localizationService, bool published);
+
+        /// <summary>
+        /// Used for serializing an <see cref="IContent"/> item for packaging
+        /// </summary>
+        /// <param name="propertyType"></param>
+        /// <param name="value"></param>
+        /// <param name="dataTypeService"></param>
+        /// <returns></returns>
         XNode ConvertDbToXml(PropertyType propertyType, object value, IDataTypeService dataTypeService);
+
         string ConvertDbToString(PropertyType propertyType, object value, IDataTypeService dataTypeService);
     }
 }

src/Umbraco.Core/PropertyEditors/IDataValueReference.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models.Editors;
+
+namespace Umbraco.Core.PropertyEditors
+{
+    /// <summary>
+    /// Resolve references from <see cref="IDataValueEditor"/> values
+    /// </summary>
+    public interface IDataValueReference
+    {
+        /// <summary>
+        /// Returns any references contained in the value
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        IEnumerable<UmbracoEntityReference> GetReferences(object value);        
+    }
+}

src/Umbraco.Core/PropertyEditors/IDataValueReferenceFactory.cs

@@ -0,0 +1,18 @@
+namespace Umbraco.Core.PropertyEditors
+{
+    public interface IDataValueReferenceFactory
+    {
+        /// <summary>
+        /// Gets a value indicating whether the DataValueReference lookup supports a datatype (data editor).
+        /// </summary>
+        /// <param name="dataType">The datatype.</param>
+        /// <returns>A value indicating whether the converter supports a datatype.</returns>
+        bool IsForEditor(IDataEditor dataEditor);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        IDataValueReference GetDataValueReference();
+    }
+}

src/Umbraco.Core/PropertyEditors/PropertyEditorCollection.cs

@@ -4,6 +4,8 @@ using Umbraco.Core.Manifest;
 
 namespace Umbraco.Core.PropertyEditors
 {
+
+
     public class PropertyEditorCollection : BuilderCollectionBase<IDataEditor>
     {
         public PropertyEditorCollection(DataEditorCollection dataEditors, ManifestParser manifestParser)
@@ -27,4 +29,4 @@ namespace Umbraco.Core.PropertyEditors
             return editor != null;
         }
     }
-}
+}

src/Umbraco.Core/Runtime/CoreInitialComposer.cs

@@ -43,7 +43,7 @@ namespace Umbraco.Core.Runtime
             // register persistence mappers - required by database factory so needs to be done here
             // means the only place the collection can be modified is in a runtime - afterwards it
             // has been frozen and it is too late
-            composition.WithCollectionBuilder<MapperCollectionBuilder>().AddCoreMappers();
+            composition.Mappers().AddCoreMappers();
 
             // register the scope provider
             composition.RegisterUnique<ScopeProvider>(); // implements both IScopeProvider and IScopeAccessor
@@ -70,11 +70,15 @@ namespace Umbraco.Core.Runtime
             composition.ManifestFilters();
 
             // properties and parameters derive from data editors
-            composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
+            composition.DataEditors()
                 .Add(() => composition.TypeLoader.GetDataEditors());
             composition.RegisterUnique<PropertyEditorCollection>();
             composition.RegisterUnique<ParameterEditorCollection>();
 
+            // Used to determine if a datatype/editor should be storing/tracking
+            // references to media item/s
+            composition.DataValueReferenceFactories();
+
             // register a server registrar, by default it's the db registrar
             composition.RegisterUnique<IServerRegistrar>(f =>
             {
@@ -101,13 +105,13 @@ namespace Umbraco.Core.Runtime
                     factory.GetInstance<IGlobalSettings>(),
                     true, new DatabaseServerMessengerOptions()));
 
-            composition.WithCollectionBuilder<CacheRefresherCollectionBuilder>()
+            composition.CacheRefreshers()
                 .Add(() => composition.TypeLoader.GetCacheRefreshers());
 
-            composition.WithCollectionBuilder<PackageActionCollectionBuilder>()
+            composition.PackageActions()
                 .Add(() => composition.TypeLoader.GetPackageActions());
 
-            composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
+            composition.PropertyValueConverters()
                 .Append(composition.TypeLoader.GetTypes<IPropertyValueConverter>());
 
             composition.RegisterUnique<IPublishedContentTypeFactory, PublishedContentTypeFactory>();
@@ -115,7 +119,7 @@ namespace Umbraco.Core.Runtime
             composition.RegisterUnique<IShortStringHelper>(factory
                 => new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(factory.GetInstance<IUmbracoSettingsSection>())));
 
-            composition.WithCollectionBuilder<UrlSegmentProviderCollectionBuilder>()
+            composition.UrlSegmentProviders()
                 .Append<DefaultUrlSegmentProvider>();
 
             composition.RegisterUnique<IMigrationBuilder>(factory => new MigrationBuilder(factory));

src/Umbraco.Core/Runtime/CoreRuntime.cs

@@ -27,6 +27,17 @@ namespace Umbraco.Core.Runtime
         private IFactory _factory;
         private RuntimeState _state;
 
+        [Obsolete("Use the ctor with all parameters instead")]
+        public CoreRuntime()
+        {
+        }
+
+        public CoreRuntime(ILogger logger, IMainDom mainDom)
+        {
+            MainDom = mainDom;
+            Logger = logger;
+        }
+
         /// <summary>
         /// Gets the logger.
         /// </summary>
@@ -45,14 +56,22 @@ namespace Umbraco.Core.Runtime
         /// <inheritdoc />
         public IRuntimeState State => _state;
 
+        public IMainDom MainDom { get; private set; }
+
         /// <inheritdoc/>
         public virtual IFactory Boot(IRegister register)
         {
             // create and register the essential services
             // ie the bare minimum required to boot
 
+#pragma warning disable CS0618 // Type or member is obsolete
             // loggers
-            var logger = Logger = GetLogger();
+            // TODO: Removes this in netcore, this is purely just backwards compat ugliness
+            var logger = GetLogger();
+            if (logger != Logger)
+                Logger = logger;
+#pragma warning restore CS0618 // Type or member is obsolete
+
             var profiler = Profiler = GetProfiler();
             var profilingLogger = ProfilingLogger = new ProfilingLogger(logger, profiler);
 
@@ -125,12 +144,16 @@ namespace Umbraco.Core.Runtime
                     Level = RuntimeLevel.Boot
                 };
 
-                // main dom
-                var mainDom = new MainDom(Logger);
+                // TODO: remove this in netcore, this is purely backwards compat hacks with the empty ctor
+                if (MainDom == null)
+                {
+                    MainDom = new MainDom(Logger, new MainDomSemaphoreLock(Logger));
+                }
+                
 
                 // create the composition
                 composition = new Composition(register, typeLoader, ProfilingLogger, _state, configs);
-                composition.RegisterEssentials(Logger, Profiler, ProfilingLogger, mainDom, appCaches, databaseFactory, typeLoader, _state);
+                composition.RegisterEssentials(Logger, Profiler, ProfilingLogger, MainDom, appCaches, databaseFactory, typeLoader, _state);
 
                 // run handlers
                 RuntimeOptions.DoRuntimeEssentials(composition, appCaches, typeLoader, databaseFactory);
@@ -140,15 +163,21 @@ namespace Umbraco.Core.Runtime
                 Compose(composition);
 
                 // acquire the main domain - if this fails then anything that should be registered with MainDom will not operate
-                AcquireMainDom(mainDom);
+                AcquireMainDom(MainDom);
 
                 // determine our runtime level
                 DetermineRuntimeLevel(databaseFactory, ProfilingLogger);
 
                 // get composers, and compose
                 var composerTypes = ResolveComposerTypes(typeLoader);
-                composition.WithCollectionBuilder<ComponentCollectionBuilder>();
-                var composers = new Composers(composition, composerTypes, ProfilingLogger);
+
+                IEnumerable<Attribute> enableDisableAttributes;
+                using (ProfilingLogger.DebugDuration<CoreRuntime>("Scanning enable/disable composer attributes"))
+                {
+                    enableDisableAttributes = typeLoader.GetAssemblyAttributes(typeof(EnableComposerAttribute), typeof(DisableComposerAttribute));
+                }   
+
+                var composers = new Composers(composition, composerTypes, enableDisableAttributes, ProfilingLogger);
                 composers.Compose();
 
                 // create the factory
@@ -157,6 +186,8 @@ namespace Umbraco.Core.Runtime
                 // create & initialize the components
                 _components = _factory.GetInstance<ComponentCollection>();
                 _components.Initialize();
+
+
             }
             catch (Exception e)
             {
@@ -218,13 +249,13 @@ namespace Umbraco.Core.Runtime
                 IOHelper.SetRootDirectory(path);
         }
 
-        private bool AcquireMainDom(MainDom mainDom)
+        private bool AcquireMainDom(IMainDom mainDom)
         {
             using (var timer = ProfilingLogger.DebugDuration<CoreRuntime>("Acquiring MainDom.", "Acquired."))
             {
                 try
                 {
-                    return mainDom.Acquire();
+                    return mainDom.IsMainDom;
                 }
                 catch
                 {
@@ -301,11 +332,9 @@ namespace Umbraco.Core.Runtime
         protected virtual IEnumerable<Type> GetComposerTypes(TypeLoader typeLoader)
             => typeLoader.GetTypes<IComposer>();
 
-        /// <summary>
-        /// Gets a logger.
-        /// </summary>
+        [Obsolete("Don't use this method, the logger should be injected into the " + nameof(CoreRuntime))]
         protected virtual ILogger GetLogger()
-            => SerilogLogger.CreateWithDefaultConfiguration();
+            => Logger ?? SerilogLogger.CreateWithDefaultConfiguration(); // TODO: Remove this in netcore, this purely just backwards compat ugliness
 
         /// <summary>
         /// Gets a profiler.

src/Umbraco.Core/Runtime/IMainDom.cs

@@ -1,5 +1,6 @@
 using System;
 
+// TODO: Can't change namespace due to breaking changes, change in netcore
 namespace Umbraco.Core
 {
     /// <summary>
@@ -14,6 +15,9 @@ namespace Umbraco.Core
         /// <summary>
         /// Gets a value indicating whether the current domain is the main domain.
         /// </summary>
+        /// <remarks>
+        /// When the first call is made to this there will generally be some logic executed to acquire a distributed lock lease.
+        /// </remarks>
         bool IsMainDom { get; }
 
         /// <summary>
@@ -35,4 +39,4 @@ namespace Umbraco.Core
         /// is guaranteed to execute before the AppDomain releases the main domain status.</remarks>
         bool Register(Action install, Action release, int weight = 100);
     }
-}
+}

src/Umbraco.Core/Runtime/IMainDomLock.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Threading.Tasks;
+
+namespace Umbraco.Core.Runtime
+{
+    /// <summary>
+    /// An application-wide distributed lock
+    /// </summary>
+    /// <remarks>
+    /// Disposing releases the lock
+    /// </remarks>
+    public interface IMainDomLock : IDisposable
+    {
+        /// <summary>
+        /// Acquires an application-wide distributed lock
+        /// </summary>
+        /// <param name="millisecondsTimeout"></param>
+        /// <returns>
+        /// An awaitable boolean value which will be false if the elapsed millsecondsTimeout value is exceeded
+        /// </returns>
+        Task<bool> AcquireLockAsync(int millisecondsTimeout);
+
+        /// <summary>
+        /// Wait on a background thread to receive a signal from another AppDomain
+        /// </summary>
+        /// <returns></returns>
+        Task ListenAsync();
+    }
+}

src/Umbraco.Core/Runtime/MainDom.cs

@@ -4,10 +4,13 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Threading;
 using System.Web.Hosting;
+using Umbraco.Core;
 using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
 
-namespace Umbraco.Core
+namespace Umbraco.Core.Runtime
 {
+
     /// <summary>
     /// Provides the full implementation of <see cref="IMainDom"/>.
     /// </summary>
@@ -15,63 +18,37 @@ namespace Umbraco.Core
     /// <para>When an AppDomain starts, it tries to acquire the main domain status.</para>
     /// <para>When an AppDomain stops (eg the application is restarting) it should release the main domain status.</para>
     /// </remarks>
-    internal class MainDom : IMainDom, IRegisteredObject
+    internal class MainDom : IMainDom, IRegisteredObject, IDisposable
     {
         #region Vars
 
         private readonly ILogger _logger;
+        private readonly IMainDomLock _mainDomLock;
 
         // our own lock for local consistency
-        private readonly object _locko = new object();
-
-        // async lock representing the main domain lock
-        private readonly AsyncLock _asyncLock;
-        private IDisposable _asyncLocker;
-
-        // event wait handle used to notify current main domain that it should
-        // release the lock because a new domain wants to be the main domain
-        private readonly EventWaitHandle _signal;
+        private object _locko = new object();
 
+        private bool _isInitialized;
         // indicates whether...
-        private volatile bool _isMainDom; // we are the main domain
+        private bool _isMainDom; // we are the main domain
         private volatile bool _signaled; // we have been signaled
 
         // actions to run before releasing the main domain
         private readonly List<KeyValuePair<int, Action>> _callbacks = new List<KeyValuePair<int, Action>>();
 
-        private const int LockTimeoutMilliseconds = 90000; // (1.5 * 60 * 1000) == 1 min 30 seconds
+        private const int LockTimeoutMilliseconds = 40000; // 40 seconds
 
         #endregion
 
         #region Ctor
 
         // initializes a new instance of MainDom
-        public MainDom(ILogger logger)
+        public MainDom(ILogger logger, IMainDomLock systemLock)
         {
+            HostingEnvironment.RegisterObject(this);
+
             _logger = logger;
-
-            var appId = string.Empty;
-            // HostingEnvironment.ApplicationID is null in unit tests, making ReplaceNonAlphanumericChars fail
-            if (HostingEnvironment.ApplicationID != null)
-                appId = HostingEnvironment.ApplicationID.ReplaceNonAlphanumericChars(string.Empty);
-
-            // combining with the physical path because if running on eg IIS Express,
-            // two sites could have the same appId even though they are different.
-            //
-            // now what could still collide is... two sites, running in two different processes
-            // and having the same appId, and running on the same app physical path
-            //
-            // we *cannot* use the process ID here because when an AppPool restarts it is
-            // a new process for the same application path
-
-            var appPath = HostingEnvironment.ApplicationPhysicalPath;
-            var hash = (appId + ":::" + appPath).GenerateHash<SHA1>();
-
-            var lockName = "UMBRACO-" + hash + "-MAINDOM-LCK";
-            _asyncLock = new AsyncLock(lockName);
-
-            var eventName = "UMBRACO-" + hash + "-MAINDOM-EVT";
-            _signal = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
+            _mainDomLock = systemLock;
         }
 
         #endregion
@@ -99,6 +76,12 @@ namespace Umbraco.Core
             lock (_locko)
             {
                 if (_signaled) return false;
+                if (_isMainDom == false)
+                {
+                    _logger.Warn<MainDom>("Register called when MainDom has not been acquired");
+                    return false;
+                }
+
                 install?.Invoke();
                 if (release != null)
                     _callbacks.Add(new KeyValuePair<int, Action>(weight, release));
@@ -118,100 +101,145 @@ namespace Umbraco.Core
                 if (_signaled) return;
                 if (_isMainDom == false) return; // probably not needed
                 _signaled = true;
-            }
 
-            try
-            {
-                _logger.Info<MainDom>("Stopping ({SignalSource})", source);
-                foreach (var callback in _callbacks.OrderBy(x => x.Key).Select(x => x.Value))
+                try
                 {
-                    try
+                    _logger.Info<MainDom>("Stopping ({SignalSource})", source);
+                    foreach (var callback in _callbacks.OrderBy(x => x.Key).Select(x => x.Value))
                     {
-                        callback(); // no timeout on callbacks
+                        try
+                        {
+                            callback(); // no timeout on callbacks
+                        }
+                        catch (Exception e)
+                        {
+                            _logger.Error<MainDom>(e, "Error while running callback");
+                            continue;
+                        }
                     }
-                    catch (Exception e)
-                    {
-                        _logger.Error<MainDom>(e, "Error while running callback, remaining callbacks will not run.");
-                        throw;
-                    }
-
+                        
+                    _logger.Debug<MainDom>("Stopped ({SignalSource})", source);
                 }
-                _logger.Debug<MainDom>("Stopped ({SignalSource})", source);
-            }
-            finally
-            {
-                // in any case...
-                _isMainDom = false;
-                _asyncLocker.Dispose();
-                _logger.Info<MainDom>("Released ({SignalSource})", source);
+                finally
+                {
+                    // in any case...
+                    _isMainDom = false;
+                    _mainDomLock.Dispose();
+                    _logger.Info<MainDom>("Released ({SignalSource})", source);
+                }
+
             }
         }
 
         // acquires the main domain
-        internal bool Acquire()
+        private bool Acquire()
         {
-            lock (_locko) // we don't want the hosting environment to interfere by signaling
+            // if signaled, too late to acquire, give up
+            // the handler is not installed so that would be the hosting environment
+            if (_signaled)
             {
-                // if signaled, too late to acquire, give up
-                // the handler is not installed so that would be the hosting environment
-                if (_signaled)
-                {
-                    _logger.Info<MainDom>("Cannot acquire (signaled).");
-                    return false;
-                }
-
-                _logger.Info<MainDom>("Acquiring.");
-
-                // signal other instances that we want the lock, then wait one the lock,
-                // which may timeout, and this is accepted - see comments below
-
-                // signal, then wait for the lock, then make sure the event is
-                // reset (maybe there was noone listening..)
-                _signal.Set();
-
-                // if more than 1 instance reach that point, one will get the lock
-                // and the other one will timeout, which is accepted
-
-                //TODO: This can throw a TimeoutException - in which case should this be in a try/finally to ensure the signal is always reset?
-                _asyncLocker = _asyncLock.Lock(LockTimeoutMilliseconds);
-                _isMainDom = true;
-
-                // we need to reset the event, because otherwise we would end up
-                // signaling ourselves and committing suicide immediately.
-                // only 1 instance can reach that point, but other instances may
-                // have started and be trying to get the lock - they will timeout,
-                // which is accepted
-
-                _signal.Reset();
-
-                //WaitOneAsync (ext method) will wait for a signal without blocking the main thread, the waiting is done on a background thread
-
-                _signal.WaitOneAsync()
-                    .ContinueWith(_ => OnSignal("signal"));
-
-                HostingEnvironment.RegisterObject(this);
-
-                _logger.Info<MainDom>("Acquired.");
-                return true;
+                _logger.Info<MainDom>("Cannot acquire (signaled).");
+                return false;
             }
+
+            _logger.Info<MainDom>("Acquiring.");
+
+            // Get the lock 
+            var acquired = _mainDomLock.AcquireLockAsync(LockTimeoutMilliseconds).GetAwaiter().GetResult();
+
+            if (!acquired)
+            {
+                _logger.Info<MainDom>("Cannot acquire (timeout).");
+
+                // In previous versions we'd let a TimeoutException be thrown
+                // and the appdomain would not start. We have the opportunity to allow it to
+                // start without having MainDom? This would mean that it couldn't write
+                // to nucache/examine and would only be ok if this was a super short lived appdomain.
+                // maybe safer to just keep throwing in this case.
+
+                throw new TimeoutException("Cannot acquire MainDom");
+                // return false;
+            }
+
+            try
+            {
+                // Listen for the signal from another AppDomain coming online to release the lock
+                _mainDomLock.ListenAsync().ContinueWith(_ => OnSignal("signal"));
+            }
+            catch (OperationCanceledException ex)
+            {
+                // the waiting task could be canceled if this appdomain is naturally shutting down, we'll just swallow this exception
+                _logger.Warn<MainDom>(ex, ex.Message);
+            }
+
+            _logger.Info<MainDom>("Acquired.");
+            return true;
         }
 
         /// <summary>
         /// Gets a value indicating whether the current domain is the main domain.
         /// </summary>
-        public bool IsMainDom => _isMainDom;
+        /// <remarks>
+        /// The lazy initializer call will only call the Acquire callback when it's not been initialized, else it will just return
+        /// the value from _isMainDom which means when we set _isMainDom to false again after being signaled, this will return false;
+        /// </remarks>
+        public bool IsMainDom => LazyInitializer.EnsureInitialized(ref _isMainDom, ref _isInitialized, ref _locko, () => Acquire());
 
         // IRegisteredObject
         void IRegisteredObject.Stop(bool immediate)
         {
-            try
+            OnSignal("environment"); // will run once
+
+            // The web app is stopping, need to wind down
+            Dispose(true);
+
+            HostingEnvironment.UnregisterObject(this);
+        }
+
+        #region IDisposable Support
+
+        // This code added to correctly implement the disposable pattern.
+
+        private bool disposedValue = false; // To detect redundant calls
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
             {
-                OnSignal("environment"); // will run once
-            }
-            finally
-            {
-                HostingEnvironment.UnregisterObject(this);
+                if (disposing)
+                {
+                    _mainDomLock.Dispose();
+                }
+
+                disposedValue = true;
             }
         }
+
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        #endregion
+
+        public static string GetMainDomId()
+        {
+            // HostingEnvironment.ApplicationID is null in unit tests, making ReplaceNonAlphanumericChars fail
+            var appId = HostingEnvironment.ApplicationID?.ReplaceNonAlphanumericChars(string.Empty) ?? string.Empty;
+
+            // combining with the physical path because if running on eg IIS Express,
+            // two sites could have the same appId even though they are different.
+            //
+            // now what could still collide is... two sites, running in two different processes
+            // and having the same appId, and running on the same app physical path
+            //
+            // we *cannot* use the process ID here because when an AppPool restarts it is
+            // a new process for the same application path
+
+            var appPath = HostingEnvironment.ApplicationPhysicalPath?.ToLowerInvariant() ?? string.Empty;
+            var hash = (appId + ":::" + appPath).GenerateHash<SHA1>();
+
+            return hash;
+        }
     }
 }

src/Umbraco.Core/Runtime/MainDomSemaphoreLock.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Umbraco.Core.Logging;
+
+namespace Umbraco.Core.Runtime
+{
+    /// <summary>
+    /// Uses a system-wide Semaphore and EventWaitHandle to synchronize the current AppDomain
+    /// </summary>
+    internal class MainDomSemaphoreLock : IMainDomLock
+    {
+        private readonly SystemLock _systemLock;
+
+        // event wait handle used to notify current main domain that it should
+        // release the lock because a new domain wants to be the main domain
+        private readonly EventWaitHandle _signal;
+        private readonly ILogger _logger;
+        private IDisposable _lockRelease;
+
+        public MainDomSemaphoreLock(ILogger logger)
+        {
+            var lockName = "UMBRACO-" + MainDom.GetMainDomId() + "-MAINDOM-LCK";
+            _systemLock = new SystemLock(lockName);
+
+            var eventName = "UMBRACO-" + MainDom.GetMainDomId() + "-MAINDOM-EVT";
+            _signal = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
+            _logger = logger;
+        }
+
+        //WaitOneAsync (ext method) will wait for a signal without blocking the main thread, the waiting is done on a background thread
+        public Task ListenAsync() => _signal.WaitOneAsync();
+
+        public Task<bool> AcquireLockAsync(int millisecondsTimeout)
+        {
+            // signal other instances that we want the lock, then wait on the lock,
+            // which may timeout, and this is accepted - see comments below
+
+            // signal, then wait for the lock, then make sure the event is
+            // reset (maybe there was noone listening..)
+            _signal.Set();
+
+            // if more than 1 instance reach that point, one will get the lock
+            // and the other one will timeout, which is accepted
+
+            //This can throw a TimeoutException - in which case should this be in a try/finally to ensure the signal is always reset.
+            try
+            {
+                _lockRelease = _systemLock.Lock(millisecondsTimeout);
+                return Task.FromResult(true);
+            }
+            catch (TimeoutException ex)
+            {
+                _logger.Error<MainDomSemaphoreLock>(ex);
+                return Task.FromResult(false);
+            }
+            finally
+            {
+                // we need to reset the event, because otherwise we would end up
+                // signaling ourselves and committing suicide immediately.
+                // only 1 instance can reach that point, but other instances may
+                // have started and be trying to get the lock - they will timeout,
+                // which is accepted
+
+                _signal.Reset();
+            }            
+        }
+
+        #region IDisposable Support
+        private bool disposedValue = false; // To detect redundant calls
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    _lockRelease?.Dispose();
+                    _signal.Close();
+                    _signal.Dispose();
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        // This code added to correctly implement the disposable pattern.
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+            Dispose(true);
+        }
+        #endregion
+    }
+}

src/Umbraco.Core/Runtime/SqlMainDomLock.cs

@@ -0,0 +1,413 @@
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Persistence;
+using Umbraco.Core.Persistence.Dtos;
+using Umbraco.Core.Persistence.Mappers;
+using Umbraco.Core.Persistence.SqlSyntax;
+
+namespace Umbraco.Core.Runtime
+{
+    internal class SqlMainDomLock : IMainDomLock
+    {
+        private string _lockId;
+        private const string MainDomKey = "Umbraco.Core.Runtime.SqlMainDom";
+        private const string UpdatedSuffix = "_updated";
+        private readonly ILogger _logger;
+        private IUmbracoDatabase _db;
+        private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
+        private SqlServerSyntaxProvider _sqlServerSyntax = new SqlServerSyntaxProvider();
+        private bool _mainDomChanging = false;
+        private readonly UmbracoDatabaseFactory _dbFactory;
+        private bool _hasError;
+        private object _locker = new object();
+
+        public SqlMainDomLock(ILogger logger)
+        {
+            // unique id for our appdomain, this is more unique than the appdomain id which is just an INT counter to its safer
+            _lockId = Guid.NewGuid().ToString();
+            _logger = logger;
+            _dbFactory = new UmbracoDatabaseFactory(
+               Constants.System.UmbracoConnectionName,
+               _logger,
+               new Lazy<IMapperCollection>(() => new Persistence.Mappers.MapperCollection(Enumerable.Empty<BaseMapper>())));
+        }
+
+        public async Task<bool> AcquireLockAsync(int millisecondsTimeout)
+        {
+            if (!(_dbFactory.SqlContext.SqlSyntax is SqlServerSyntaxProvider sqlServerSyntaxProvider))
+                throw new NotSupportedException("SqlMainDomLock is only supported for Sql Server");
+
+            _sqlServerSyntax = sqlServerSyntaxProvider;
+
+            _logger.Debug<SqlMainDomLock>("Acquiring lock...");
+
+            var db = GetDatabase();
+
+            var tempId = Guid.NewGuid().ToString();
+
+            try
+            {
+                db.BeginTransaction(IsolationLevel.ReadCommitted);
+
+                try
+                {
+                    // wait to get a write lock
+                    _sqlServerSyntax.WriteLock(db, TimeSpan.FromMilliseconds(millisecondsTimeout), Constants.Locks.MainDom);                    
+                }
+                catch (Exception ex)
+                {
+                    if (IsLockTimeoutException(ex))
+                    {
+                        _logger.Error<SqlMainDomLock>(ex, "Sql timeout occurred, could not acquire MainDom.");
+                        _hasError = true;
+                        return false;
+                    }
+
+                    // unexpected (will be caught below)
+                    throw;
+                }
+
+                var result = InsertLockRecord(tempId); //we change the row to a random Id to signal other MainDom to shutdown
+                if (result == RecordPersistenceType.Insert)
+                {
+                    // if we've inserted, then there was no MainDom so we can instantly acquire
+
+                    // TODO: see the other TODO, could we just delete the row and that would indicate that we
+                    // are MainDom? then we don't leave any orphan rows behind.
+
+                    InsertLockRecord(_lockId); // so update with our appdomain id
+                    _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
+                    return true;
+                }
+
+                // if we've updated, this means there is an active MainDom, now we need to wait to
+                // for the current MainDom to shutdown which also requires releasing our write lock
+            }
+            catch (Exception ex)
+            {
+                ResetDatabase();
+                // unexpected
+                _logger.Error<SqlMainDomLock>(ex, "Unexpected error, cannot acquire MainDom");
+                _hasError = true;
+                return false;
+            }
+            finally
+            {
+                db?.CompleteTransaction();
+            }
+
+            return await WaitForExistingAsync(tempId, millisecondsTimeout);
+        }
+
+        public Task ListenAsync()
+        {
+            if (_hasError)
+            {
+                _logger.Warn<SqlMainDomLock>("Could not acquire MainDom, listening is canceled.");
+                return Task.CompletedTask;
+            }
+
+            // Create a long running task (dedicated thread)
+            // to poll to check if we are still the MainDom registered in the DB
+            return Task.Factory.StartNew(ListeningLoop, _cancellationTokenSource.Token, TaskCreationOptions.LongRunning, TaskScheduler.Default);
+
+        }
+
+        private void ListeningLoop()
+        {
+            while (true)
+            {
+                // poll every 1 second
+                Thread.Sleep(1000);
+
+                lock (_locker)
+                {
+                    // If cancellation has been requested we will just exit. Depending on timing of the shutdown,
+                    // we will have already flagged _mainDomChanging = true, or we're shutting down faster than
+                    // the other MainDom is taking to startup. In this case the db row will just be deleted and the
+                    // new MainDom will just take over.
+                    if (_cancellationTokenSource.IsCancellationRequested)
+                        return;
+
+                    var db = GetDatabase();
+
+                    try
+                    {
+                        db.BeginTransaction(IsolationLevel.ReadCommitted);
+
+                        // get a read lock
+                        _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
+
+                        // TODO: We could in theory just check if the main dom row doesn't exist, that could indicate that
+                        // we are still the maindom. An empty value might be better because then we won't have any orphan rows
+                        // if the app is terminated. Could that work?
+
+                        if (!IsMainDomValue(_lockId))
+                        {
+                            // we are no longer main dom, another one has come online, exit
+                            _mainDomChanging = true;
+                            _logger.Debug<SqlMainDomLock>("Detected new booting application, releasing MainDom lock.");
+                            return;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        ResetDatabase();
+                        // unexpected
+                        _logger.Error<SqlMainDomLock>(ex, "Unexpected error, listening is canceled.");
+                        _hasError = true;
+                        return;
+                    }
+                    finally
+                    {
+                        db?.CompleteTransaction();
+                    }
+                }
+
+            }
+        }
+
+        private void ResetDatabase()
+        {
+            if (_db.InTransaction)
+                _db.AbortTransaction();
+            _db.Dispose();
+            _db = null;
+        }
+
+        private IUmbracoDatabase GetDatabase()
+        {
+            if (_db != null)
+                return _db;
+
+            _db = _dbFactory.CreateDatabase();
+            return _db;
+        }
+
+        /// <summary>
+        /// Wait for any existing MainDom to release so we can continue booting
+        /// </summary>
+        /// <param name="tempId"></param>
+        /// <param name="millisecondsTimeout"></param>
+        /// <returns></returns>
+        private Task<bool> WaitForExistingAsync(string tempId, int millisecondsTimeout)
+        {
+            var updatedTempId = tempId + UpdatedSuffix;
+
+            return Task.Run(() =>
+            {
+                var db = GetDatabase();
+                var watch = new Stopwatch();
+                watch.Start();
+                while(true)
+                {
+                    // poll very often, we need to take over as fast as we can
+                    Thread.Sleep(100);
+
+                    try
+                    {
+                        db.BeginTransaction(IsolationLevel.ReadCommitted);
+
+                        // get a read lock
+                        _sqlServerSyntax.ReadLock(db, Constants.Locks.MainDom);
+
+                        // the row 
+                        var mainDomRows = db.Fetch<KeyValueDto>("SELECT * FROM umbracoKeyValue WHERE [key] = @key", new { key = MainDomKey });
+
+                        if (mainDomRows.Count == 0 || mainDomRows[0].Value == updatedTempId)
+                        {
+                            // the other main dom has updated our record
+                            // Or the other maindom shutdown super fast and just deleted the record
+                            // which indicates that we
+                            // can acquire it and it has shutdown.
+
+                            _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+
+                            // so now we update the row with our appdomain id
+                            InsertLockRecord(_lockId);
+                            _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
+                            return true; 
+                        }
+                        else if (mainDomRows.Count == 1 && !mainDomRows[0].Value.StartsWith(tempId))
+                        {
+                            // in this case, the prefixed ID is different which  means
+                            // another new AppDomain has come online and is wanting to take over. In that case, we will not
+                            // acquire.
+
+                            _logger.Debug<SqlMainDomLock>("Cannot acquire, another booting application detected.");
+
+                            return false;
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        ResetDatabase();
+
+                        if (IsLockTimeoutException(ex))
+                        {
+                            _logger.Error<SqlMainDomLock>(ex, "Sql timeout occurred, waiting for existing MainDom is canceled.");
+                            _hasError = true;
+                            return false;
+                        }
+                        // unexpected
+                        _logger.Error<SqlMainDomLock>(ex, "Unexpected error, waiting for existing MainDom is canceled.");
+                        _hasError = true;
+                        return false;
+                    }
+                    finally
+                    {
+                        db?.CompleteTransaction();
+                    }
+
+                    if (watch.ElapsedMilliseconds >= millisecondsTimeout)
+                    {
+                        // if the timeout has elapsed, it either means that the other main dom is taking too long to shutdown,
+                        // or it could mean that the previous appdomain was terminated and didn't clear out the main dom SQL row
+                        // and it's just been left as an orphan row.
+                        // There's really know way of knowing unless we are constantly updating the row for the current maindom
+                        // which isn't ideal.
+                        // So... we're going to 'just' take over, if the writelock works then we'll assume we're ok
+
+                        _logger.Debug<SqlMainDomLock>("Timeout elapsed, assuming orphan row, acquiring MainDom.");
+
+                        try
+                        {
+                            db.BeginTransaction(IsolationLevel.ReadCommitted);
+
+                            _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+
+                            // so now we update the row with our appdomain id
+                            InsertLockRecord(_lockId);
+                            _logger.Debug<SqlMainDomLock>("Acquired with ID {LockId}", _lockId);
+                            return true;
+                        }
+                        catch (Exception ex)
+                        {
+                            ResetDatabase();
+
+                            if (IsLockTimeoutException(ex))
+                            {
+                                // something is wrong, we cannot acquire, not much we can do
+                                _logger.Error<SqlMainDomLock>(ex, "Sql timeout occurred, could not forcibly acquire MainDom.");
+                                _hasError = true;
+                                return false;
+                            }
+                            _logger.Error<SqlMainDomLock>(ex, "Unexpected error, could not forcibly acquire MainDom.");
+                            _hasError = true;
+                            return false;
+                        }
+                        finally
+                        {
+                            db?.CompleteTransaction();
+                        }
+                    }
+                }
+            }, _cancellationTokenSource.Token);
+        }
+
+        /// <summary>
+        /// Inserts or updates the key/value row 
+        /// </summary>
+        private RecordPersistenceType InsertLockRecord(string id)
+        {
+            var db = GetDatabase();
+            return db.InsertOrUpdate(new KeyValueDto
+            {
+                Key = MainDomKey,
+                Value = id,
+                Updated = DateTime.Now
+            });
+        }
+
+        /// <summary>
+        /// Checks if the DB row value is equals the value
+        /// </summary>
+        /// <returns></returns>
+        private bool IsMainDomValue(string val)
+        {
+            var db = GetDatabase();
+            return db.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoKeyValue WHERE [key] = @key AND [value] = @val",
+                new { key = MainDomKey, val = val }) == 1;
+        }
+
+        /// <summary>
+        /// Checks if the exception is an SQL timeout
+        /// </summary>
+        /// <param name="exception"></param>
+        /// <returns></returns>
+        private bool IsLockTimeoutException(Exception exception) => exception is SqlException sqlException && sqlException.Number == 1222;
+
+        #region IDisposable Support
+        private bool _disposedValue = false; // To detect redundant calls
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    lock (_locker)
+                    {
+                        // immediately cancel all sub-tasks, we don't want them to keep querying
+                        _cancellationTokenSource.Cancel();
+                        _cancellationTokenSource.Dispose();
+
+                        var db = GetDatabase();
+                        try
+                        {
+                            db.BeginTransaction(IsolationLevel.ReadCommitted);
+
+                            // get a write lock
+                            _sqlServerSyntax.WriteLock(db, Constants.Locks.MainDom);
+
+                            // When we are disposed, it means we have released the MainDom lock
+                            // and called all MainDom release callbacks, in this case
+                            // if another maindom is actually coming online we need
+                            // to signal to the MainDom coming online that we have shutdown.
+                            // To do that, we update the existing main dom DB record with a suffixed "_updated" string.
+                            // Otherwise, if we are just shutting down, we want to just delete the row.
+                            if (_mainDomChanging)
+                            {
+                                _logger.Debug<SqlMainDomLock>("Releasing MainDom, updating row, new application is booting.");
+                                db.Execute($"UPDATE umbracoKeyValue SET [value] = [value] + '{UpdatedSuffix}' WHERE [key] = @key", new { key = MainDomKey });
+                            }
+                            else
+                            {
+                                _logger.Debug<SqlMainDomLock>("Releasing MainDom, deleting row, application is shutting down.");
+                                db.Execute("DELETE FROM umbracoKeyValue WHERE [key] = @key", new { key = MainDomKey });
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            ResetDatabase();
+                            _logger.Error<SqlMainDomLock>(ex, "Unexpected error during dipsose.");
+                            _hasError = true;
+                        }
+                        finally
+                        {
+                            db?.CompleteTransaction();
+                            ResetDatabase();
+                        }
+                    }
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        // This code added to correctly implement the disposable pattern.
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+            Dispose(true);
+        }
+        #endregion
+
+    }
+}

src/Umbraco.Core/Scoping/IScopeProvider.cs

@@ -13,7 +13,7 @@ namespace Umbraco.Core.Scoping
     /// Provides scopes.
     /// </summary>
     public interface IScopeProvider
-    {
+    {    
         /// <summary>
         /// Creates an ambient scope.
         /// </summary>

src/Umbraco.Core/Services/IContentTypeServiceBase.cs

@@ -39,6 +39,11 @@ namespace Umbraco.Core.Services
 
         int Count();
 
+        /// <summary>
+        /// Returns true or false depending on whether content nodes have been created based on the provided content type id.
+        /// </summary>
+        bool HasContentNodes(int id);
+
         IEnumerable<TItem> GetAll(params int[] ids);
         IEnumerable<TItem> GetAll(IEnumerable<Guid> ids);
 

src/Umbraco.Core/Services/IRelationService.cs

@@ -8,136 +8,162 @@ namespace Umbraco.Core.Services
     public interface IRelationService : IService
     {
         /// <summary>
-        /// Gets a <see cref="Relation"/> by its Id
+        /// Gets a <see cref="IRelation"/> by its Id
         /// </summary>
-        /// <param name="id">Id of the <see cref="Relation"/></param>
-        /// <returns>A <see cref="Relation"/> object</returns>
+        /// <param name="id">Id of the <see cref="IRelation"/></param>
+        /// <returns>A <see cref="IRelation"/> object</returns>
         IRelation GetById(int id);
 
         /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Id
+        /// Gets a <see cref="IRelationType"/> by its Id
         /// </summary>
-        /// <param name="id">Id of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
+        /// <param name="id">Id of the <see cref="IRelationType"/></param>
+        /// <returns>A <see cref="IRelationType"/> object</returns>
         IRelationType GetRelationTypeById(int id);
 
         /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Id
+        /// Gets a <see cref="IRelationType"/> by its Id
         /// </summary>
-        /// <param name="id">Id of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
+        /// <param name="id">Id of the <see cref="IRelationType"/></param>
+        /// <returns>A <see cref="IRelationType"/> object</returns>
         IRelationType GetRelationTypeById(Guid id);
 
         /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Alias
+        /// Gets a <see cref="IRelationType"/> by its Alias
         /// </summary>
-        /// <param name="alias">Alias of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
+        /// <param name="alias">Alias of the <see cref="IRelationType"/></param>
+        /// <returns>A <see cref="IRelationType"/> object</returns>
         IRelationType GetRelationTypeByAlias(string alias);
 
         /// <summary>
-        /// Gets all <see cref="Relation"/> objects
+        /// Gets all <see cref="IRelation"/> objects
         /// </summary>
         /// <param name="ids">Optional array of integer ids to return relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetAllRelations(params int[] ids);
 
         /// <summary>
-        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>
+        /// Gets all <see cref="IRelation"/> objects by their <see cref="IRelationType"/>
         /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        IEnumerable<IRelation> GetAllRelationsByRelationType(RelationType relationType);
+        /// <param name="relationType"><see cref="IRelation"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
+        IEnumerable<IRelation> GetAllRelationsByRelationType(IRelationType relationType);
 
         /// <summary>
-        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>'s Id
+        /// Gets all <see cref="IRelation"/> objects by their <see cref="IRelationType"/>'s Id
         /// </summary>
-        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <param name="relationTypeId">Id of the <see cref="IRelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetAllRelationsByRelationType(int relationTypeId);
 
         /// <summary>
-        /// Gets all <see cref="Relation"/> objects
+        /// Gets all <see cref="IRelation"/> objects
         /// </summary>
         /// <param name="ids">Optional array of integer ids to return relationtypes for</param>
-        /// <returns>An enumerable list of <see cref="RelationType"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelationType> GetAllRelationTypes(params int[] ids);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent Id
+        /// Gets a list of <see cref="IRelation"/> objects by their parent Id
         /// </summary>
         /// <param name="id">Id of the parent to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByParentId(int id);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent entity
+        /// Gets a list of <see cref="IRelation"/> objects by their parent Id
+        /// </summary>
+        /// <param name="id">Id of the parent to retrieve relations for</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
+        IEnumerable<IRelation> GetByParentId(int id, string relationTypeAlias);
+
+        /// <summary>
+        /// Gets a list of <see cref="IRelation"/> objects by their parent entity
         /// </summary>
         /// <param name="parent">Parent Entity to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByParent(IUmbracoEntity parent);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent entity
+        /// Gets a list of <see cref="IRelation"/> objects by their parent entity
         /// </summary>
         /// <param name="parent">Parent Entity to retrieve relations for</param>
         /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByParent(IUmbracoEntity parent, string relationTypeAlias);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Id
+        /// Gets a list of <see cref="IRelation"/> objects by their child Id
         /// </summary>
         /// <param name="id">Id of the child to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByChildId(int id);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Entity
+        /// Gets a list of <see cref="IRelation"/> objects by their child Id
+        /// </summary>
+        /// <param name="id">Id of the child to retrieve relations for</param>
+        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
+        IEnumerable<IRelation> GetByChildId(int id, string relationTypeAlias);
+
+        /// <summary>
+        /// Gets a list of <see cref="IRelation"/> objects by their child Entity
         /// </summary>
         /// <param name="child">Child Entity to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByChild(IUmbracoEntity child);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Entity
+        /// Gets a list of <see cref="IRelation"/> objects by their child Entity
         /// </summary>
         /// <param name="child">Child Entity to retrieve relations for</param>
         /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByChild(IUmbracoEntity child, string relationTypeAlias);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child or parent Id.
+        /// Gets a list of <see cref="IRelation"/> objects by their child or parent Id.
         /// Using this method will get you all relations regards of it being a child or parent relation.
         /// </summary>
         /// <param name="id">Id of the child or parent to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByParentOrChildId(int id);
 
         IEnumerable<IRelation> GetByParentOrChildId(int id, string relationTypeAlias);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Name of the <see cref="RelationType"/>
+        /// Gets a list of <see cref="IRelation"/> objects by the Name of the <see cref="IRelationType"/>
         /// </summary>
-        /// <param name="relationTypeName">Name of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <param name="relationTypeName">Name of the <see cref="IRelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByRelationTypeName(string relationTypeName);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Alias of the <see cref="RelationType"/>
+        /// Gets a list of <see cref="IRelation"/> objects by the Alias of the <see cref="IRelationType"/>
         /// </summary>
-        /// <param name="relationTypeAlias">Alias of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <param name="relationTypeAlias">Alias of the <see cref="IRelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByRelationTypeAlias(string relationTypeAlias);
 
         /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Id of the <see cref="RelationType"/>
+        /// Gets a list of <see cref="IRelation"/> objects by the Id of the <see cref="IRelationType"/>
         /// </summary>
-        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <param name="relationTypeId">Id of the <see cref="IRelationType"/> to retrieve Relations for</param>
+        /// <returns>An enumerable list of <see cref="IRelation"/> objects</returns>
         IEnumerable<IRelation> GetByRelationTypeId(int relationTypeId);
 
+        /// <summary>
+        /// Gets a paged result of <see cref="IRelation"/>
+        /// </summary>
+        /// <param name="relationTypeId"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalChildren"></param>
+        /// <returns></returns>
+        IEnumerable<IRelation> GetPagedByRelationTypeId(int relationTypeId, long pageIndex, int pageSize, out long totalRecords, Ordering ordering = null);
+
         /// <summary>
         /// Gets the Child object from a Relation as an <see cref="IUmbracoEntity"/>
         /// </summary>
@@ -173,6 +199,26 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
         IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations);
 
+        /// <summary>
+        /// Returns paged parent entities for a related child id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalChildren"></param>
+        /// <returns></returns>
+        IEnumerable<IUmbracoEntity> GetPagedParentEntitiesByChildId(int id, long pageIndex, int pageSize, out long totalChildren, params UmbracoObjectTypes[] entityTypes);
+
+        /// <summary>
+        /// Returns paged child entities for a related parent id
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalChildren"></param>
+        /// <returns></returns>
+        IEnumerable<IUmbracoEntity> GetPagedChildEntitiesByParentId(int id, long pageIndex, int pageSize, out long totalChildren, params UmbracoObjectTypes[] entityTypes);
+
         /// <summary>
         /// Gets the Parent and Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
         /// </summary>
@@ -186,7 +232,7 @@ namespace Umbraco.Core.Services
         /// <param name="parentId">Id of the parent</param>
         /// <param name="childId">Id of the child</param>
         /// <param name="relationType">The type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
+        /// <returns>The created <see cref="IRelation"/></returns>
         IRelation Relate(int parentId, int childId, IRelationType relationType);
 
         /// <summary>
@@ -195,7 +241,7 @@ namespace Umbraco.Core.Services
         /// <param name="parent">Parent entity</param>
         /// <param name="child">Child entity</param>
         /// <param name="relationType">The type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
+        /// <returns>The created <see cref="IRelation"/></returns>
         IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, IRelationType relationType);
 
         /// <summary>
@@ -204,7 +250,7 @@ namespace Umbraco.Core.Services
         /// <param name="parentId">Id of the parent</param>
         /// <param name="childId">Id of the child</param>
         /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
+        /// <returns>The created <see cref="IRelation"/></returns>
         IRelation Relate(int parentId, int childId, string relationTypeAlias);
 
         /// <summary>
@@ -213,14 +259,14 @@ namespace Umbraco.Core.Services
         /// <param name="parent">Parent entity</param>
         /// <param name="child">Child entity</param>
         /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
+        /// <returns>The created <see cref="IRelation"/></returns>
         IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias);
 
         /// <summary>
-        /// Checks whether any relations exists for the passed in <see cref="RelationType"/>.
+        /// Checks whether any relations exists for the passed in <see cref="IRelationType"/>.
         /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to check for relations</param>
-        /// <returns>Returns <c>True</c> if any relations exists for the given <see cref="RelationType"/>, otherwise <c>False</c></returns>
+        /// <param name="relationType"><see cref="IRelationType"/> to check for relations</param>
+        /// <returns>Returns <c>True</c> if any relations exists for the given <see cref="IRelationType"/>, otherwise <c>False</c></returns>
         bool HasRelations(IRelationType relationType);
 
         /// <summary>
@@ -265,33 +311,35 @@ namespace Umbraco.Core.Services
         bool AreRelated(int parentId, int childId, string relationTypeAlias);
 
         /// <summary>
-        /// Saves a <see cref="Relation"/>
+        /// Saves a <see cref="IRelation"/>
         /// </summary>
         /// <param name="relation">Relation to save</param>
         void Save(IRelation relation);
 
+        void Save(IEnumerable<IRelation> relations);
+
         /// <summary>
-        /// Saves a <see cref="RelationType"/>
+        /// Saves a <see cref="IRelationType"/>
         /// </summary>
         /// <param name="relationType">RelationType to Save</param>
         void Save(IRelationType relationType);
 
         /// <summary>
-        /// Deletes a <see cref="Relation"/>
+        /// Deletes a <see cref="IRelation"/>
         /// </summary>
         /// <param name="relation">Relation to Delete</param>
         void Delete(IRelation relation);
 
         /// <summary>
-        /// Deletes a <see cref="RelationType"/>
+        /// Deletes a <see cref="IRelationType"/>
         /// </summary>
         /// <param name="relationType">RelationType to Delete</param>
         void Delete(IRelationType relationType);
 
         /// <summary>
-        /// Deletes all <see cref="Relation"/> objects based on the passed in <see cref="RelationType"/>
+        /// Deletes all <see cref="IRelation"/> objects based on the passed in <see cref="IRelationType"/>
         /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to Delete Relations for</param>
+        /// <param name="relationType"><see cref="IRelationType"/> to Delete Relations for</param>
         void DeleteRelationsOfType(IRelationType relationType);
     }
 }

src/Umbraco.Core/Services/Implement/ContentTypeServiceBaseOfTRepositoryTItemTService.cs

@@ -372,6 +372,15 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
+        public bool HasContentNodes(int id)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                scope.ReadLock(ReadLockIds);
+                return Repository.HasContentNodes(id);
+            }
+        }
+
         #endregion
 
         #region Save

src/Umbraco.Core/Services/Implement/RelationService.cs

@@ -25,11 +25,7 @@ namespace Umbraco.Core.Services.Implement
             _entityService = entityService ?? throw new ArgumentNullException(nameof(entityService));
         }
 
-        /// <summary>
-        /// Gets a <see cref="Relation"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="Relation"/></param>
-        /// <returns>A <see cref="Relation"/> object</returns>
+        /// <inheritdoc />
         public IRelation GetById(int id)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -38,11 +34,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
+        /// <inheritdoc />
         public IRelationType GetRelationTypeById(int id)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -51,11 +43,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Id
-        /// </summary>
-        /// <param name="id">Id of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
+        /// <inheritdoc />
         public IRelationType GetRelationTypeById(Guid id)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -64,25 +52,10 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets a <see cref="RelationType"/> by its Alias
-        /// </summary>
-        /// <param name="alias">Alias of the <see cref="RelationType"/></param>
-        /// <returns>A <see cref="RelationType"/> object</returns>
-        public IRelationType GetRelationTypeByAlias(string alias)
-        {
-            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
-            {
-                var query = Query<IRelationType>().Where(x => x.Alias == alias);
-                return _relationTypeRepository.Get(query).FirstOrDefault();
-            }
-        }
+        /// <inheritdoc />
+        public IRelationType GetRelationTypeByAlias(string alias) => GetRelationType(alias);
 
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects
-        /// </summary>
-        /// <param name="ids">Optional array of integer ids to return relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <inheritdoc />
         public IEnumerable<IRelation> GetAllRelations(params int[] ids)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -91,21 +64,13 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetAllRelationsByRelationType(RelationType relationType)
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetAllRelationsByRelationType(IRelationType relationType)
         {
             return GetAllRelationsByRelationType(relationType.Id);
         }
 
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects by their <see cref="RelationType"/>'s Id
-        /// </summary>
-        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <inheritdoc />
         public IEnumerable<IRelation> GetAllRelationsByRelationType(int relationTypeId)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -115,11 +80,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets all <see cref="Relation"/> objects
-        /// </summary>
-        /// <param name="ids">Optional array of integer ids to return relationtypes for</param>
-        /// <returns>An enumerable list of <see cref="RelationType"/> objects</returns>
+        /// <inheritdoc />
         public IEnumerable<IRelationType> GetAllRelationTypes(params int[] ids)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -128,82 +89,65 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent Id
-        /// </summary>
-        /// <param name="id">Id of the parent to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByParentId(int id)
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetByParentId(int id) => GetByParentId(id, null);
+
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetByParentId(int id, string relationTypeAlias)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
-                var query = Query<IRelation>().Where(x => x.ParentId == id);
-                return _relationRepository.Get(query);
+                if (relationTypeAlias.IsNullOrWhiteSpace())
+                {
+                    var qry1 = Query<IRelation>().Where(x => x.ParentId == id);
+                    return _relationRepository.Get(qry1);
+                }
+
+                var relationType = GetRelationType(relationTypeAlias);
+                if (relationType == null)
+                    return Enumerable.Empty<IRelation>();
+
+                var qry2 = Query<IRelation>().Where(x => x.ParentId == id && x.RelationTypeId == relationType.Id);
+                return _relationRepository.Get(qry2);
             }
         }
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent entity
-        /// </summary>
-        /// <param name="parent">Parent Entity to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByParent(IUmbracoEntity parent)
-        {
-            return GetByParentId(parent.Id);
-        }
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetByParent(IUmbracoEntity parent) => GetByParentId(parent.Id);
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their parent entity
-        /// </summary>
-        /// <param name="parent">Parent Entity to retrieve relations for</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByParent(IUmbracoEntity parent, string relationTypeAlias)
-        {
-            return GetByParent(parent).Where(relation => relation.RelationType.Alias == relationTypeAlias);
-        }
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetByParent(IUmbracoEntity parent, string relationTypeAlias) => GetByParentId(parent.Id, relationTypeAlias);
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Id
-        /// </summary>
-        /// <param name="id">Id of the child to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByChildId(int id)
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetByChildId(int id) => GetByChildId(id, null);
+
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetByChildId(int id, string relationTypeAlias)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
-                var query = Query<IRelation>().Where(x => x.ChildId == id);
-                return _relationRepository.Get(query);
+                if (relationTypeAlias.IsNullOrWhiteSpace())
+                {
+                    var qry1 = Query<IRelation>().Where(x => x.ChildId == id);
+                    return _relationRepository.Get(qry1);
+                }
+
+                var relationType = GetRelationType(relationTypeAlias);
+                if (relationType == null)
+                    return Enumerable.Empty<IRelation>();
+
+                var qry2 = Query<IRelation>().Where(x => x.ChildId == id && x.RelationTypeId == relationType.Id);
+                return _relationRepository.Get(qry2);
             }
         }
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Entity
-        /// </summary>
-        /// <param name="child">Child Entity to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByChild(IUmbracoEntity child)
-        {
-            return GetByChildId(child.Id);
-        }
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetByChild(IUmbracoEntity child) => GetByChildId(child.Id);
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child Entity
-        /// </summary>
-        /// <param name="child">Child Entity to retrieve relations for</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to retrieve</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
-        public IEnumerable<IRelation> GetByChild(IUmbracoEntity child, string relationTypeAlias)
-        {
-            return GetByChild(child).Where(relation => relation.RelationType.Alias == relationTypeAlias);
-        }
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetByChild(IUmbracoEntity child, string relationTypeAlias) => GetByChildId(child.Id, relationTypeAlias);
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by their child or parent Id.
-        /// Using this method will get you all relations regards of it being a child or parent relation.
-        /// </summary>
-        /// <param name="id">Id of the child or parent to retrieve relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <inheritdoc />
         public IEnumerable<IRelation> GetByParentOrChildId(int id)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -217,8 +161,7 @@ namespace Umbraco.Core.Services.Implement
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
-                var rtQuery = Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
-                var relationType = _relationTypeRepository.Get(rtQuery).FirstOrDefault();
+                var relationType = GetRelationType(relationTypeAlias);
                 if (relationType == null)
                     return Enumerable.Empty<IRelation>();
 
@@ -227,16 +170,13 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Name of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeName">Name of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <inheritdoc />
         public IEnumerable<IRelation> GetByRelationTypeName(string relationTypeName)
         {
             List<int> relationTypeIds;
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
             {
+                //This is a silly query - but i guess it's needed in case someone has more than one relation with the same Name (not alias), odd.
                 var query = Query<IRelationType>().Where(x => x.Name == relationTypeName);
                 var relationTypes = _relationTypeRepository.Get(query);
                 relationTypeIds = relationTypes.Select(x => x.Id).ToList();
@@ -247,31 +187,17 @@ namespace Umbraco.Core.Services.Implement
                 : GetRelationsByListOfTypeIds(relationTypeIds);
         }
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Alias of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeAlias">Alias of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <inheritdoc />
         public IEnumerable<IRelation> GetByRelationTypeAlias(string relationTypeAlias)
         {
-            List<int> relationTypeIds;
-            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
-            {
-                var query = Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
-                var relationTypes = _relationTypeRepository.Get(query);
-                relationTypeIds = relationTypes.Select(x => x.Id).ToList();
-            }
-
-            return relationTypeIds.Count == 0
+            var relationType = GetRelationType(relationTypeAlias);
+            
+            return relationType == null
                 ? Enumerable.Empty<IRelation>()
-                : GetRelationsByListOfTypeIds(relationTypeIds);
+                : GetRelationsByListOfTypeIds(new[] { relationType.Id });
         }
 
-        /// <summary>
-        /// Gets a list of <see cref="Relation"/> objects by the Id of the <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationTypeId">Id of the <see cref="RelationType"/> to retrieve Relations for</param>
-        /// <returns>An enumerable list of <see cref="Relation"/> objects</returns>
+        /// <inheritdoc />
         public IEnumerable<IRelation> GetByRelationTypeId(int relationTypeId)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -281,37 +207,35 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Gets the Child object from a Relation as an <see cref="IUmbracoEntity"/>
-        /// </summary>
-        /// <param name="relation">Relation to retrieve child object from</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        /// <inheritdoc />
+        public IEnumerable<IRelation> GetPagedByRelationTypeId(int relationTypeId, long pageIndex, int pageSize, out long totalRecords, Ordering ordering = null)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                var query = Query<IRelation>().Where(x => x.RelationTypeId == relationTypeId);
+                return _relationRepository.GetPagedRelationsByQuery(query, pageIndex, pageSize, out totalRecords, ordering);
+            }
+        }
+
+        /// <inheritdoc />
         public IUmbracoEntity GetChildEntityFromRelation(IRelation relation)
         {
-            var objectType = ObjectTypes.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
+            var objectType = ObjectTypes.GetUmbracoObjectType(relation.ChildObjectType);
             return _entityService.Get(relation.ChildId, objectType);
         }
 
-        /// <summary>
-        /// Gets the Parent object from a Relation as an <see cref="IUmbracoEntity"/>
-        /// </summary>
-        /// <param name="relation">Relation to retrieve parent object from</param>
-        /// <returns>An <see cref="IUmbracoEntity"/></returns>
+        /// <inheritdoc />
         public IUmbracoEntity GetParentEntityFromRelation(IRelation relation)
         {
-            var objectType = ObjectTypes.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
+            var objectType = ObjectTypes.GetUmbracoObjectType(relation.ParentObjectType);
             return _entityService.Get(relation.ParentId, objectType);
         }
 
-        /// <summary>
-        /// Gets the Parent and Child objects from a Relation as a <see cref="Tuple"/>"/> with <see cref="IUmbracoEntity"/>.
-        /// </summary>
-        /// <param name="relation">Relation to retrieve parent and child object from</param>
-        /// <returns>Returns a Tuple with Parent (item1) and Child (item2)</returns>
+        /// <inheritdoc />
         public Tuple<IUmbracoEntity, IUmbracoEntity> GetEntitiesFromRelation(IRelation relation)
         {
-            var childObjectType = ObjectTypes.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
-            var parentObjectType = ObjectTypes.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
+            var childObjectType = ObjectTypes.GetUmbracoObjectType(relation.ChildObjectType);
+            var parentObjectType = ObjectTypes.GetUmbracoObjectType(relation.ParentObjectType);
 
             var child = _entityService.Get(relation.ChildId, childObjectType);
             var parent = _entityService.Get(relation.ParentId, parentObjectType);
@@ -319,45 +243,63 @@ namespace Umbraco.Core.Services.Implement
             return new Tuple<IUmbracoEntity, IUmbracoEntity>(parent, child);
         }
 
-        /// <summary>
-        /// Gets the Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve child objects from</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
+        /// <inheritdoc />
         public IEnumerable<IUmbracoEntity> GetChildEntitiesFromRelations(IEnumerable<IRelation> relations)
         {
-            foreach (var relation in relations)
+            // Trying to avoid full N+1 lookups, so we'll group by the object type and then use the GetAll
+            // method to lookup batches of entities for each parent object type
+
+            foreach (var groupedRelations in relations.GroupBy(x => ObjectTypes.GetUmbracoObjectType(x.ChildObjectType)))
             {
-                var objectType = ObjectTypes.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
-                yield return _entityService.Get(relation.ChildId, objectType);
+                var objectType = groupedRelations.Key;
+                var ids = groupedRelations.Select(x => x.ChildId).ToArray();
+                foreach (var e in _entityService.GetAll(objectType, ids))
+                    yield return e;
             }
         }
 
-        /// <summary>
-        /// Gets the Parent objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve parent objects from</param>
-        /// <returns>An enumerable list of <see cref="IUmbracoEntity"/></returns>
+        /// <inheritdoc />
         public IEnumerable<IUmbracoEntity> GetParentEntitiesFromRelations(IEnumerable<IRelation> relations)
         {
-            foreach (var relation in relations)
+            // Trying to avoid full N+1 lookups, so we'll group by the object type and then use the GetAll
+            // method to lookup batches of entities for each parent object type
+
+            foreach (var groupedRelations in relations.GroupBy(x => ObjectTypes.GetUmbracoObjectType(x.ParentObjectType)))
             {
-                var objectType = ObjectTypes.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
-                yield return _entityService.Get(relation.ParentId, objectType);
+                var objectType = groupedRelations.Key;
+                var ids = groupedRelations.Select(x => x.ParentId).ToArray();
+                foreach (var e in _entityService.GetAll(objectType, ids))
+                    yield return e;
             }
         }
 
-        /// <summary>
-        /// Gets the Parent and Child objects from a list of Relations as a list of <see cref="IUmbracoEntity"/> objects.
-        /// </summary>
-        /// <param name="relations">List of relations to retrieve parent and child objects from</param>
-        /// <returns>An enumerable list of <see cref="Tuple"/> with <see cref="IUmbracoEntity"/></returns>
+        /// <inheritdoc />
+        public IEnumerable<IUmbracoEntity> GetPagedParentEntitiesByChildId(int id, long pageIndex, int pageSize, out long totalChildren, params UmbracoObjectTypes[] entityTypes)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                return _relationRepository.GetPagedParentEntitiesByChildId(id, pageIndex, pageSize, out totalChildren, entityTypes.Select(x => x.GetGuid()).ToArray());
+            }
+        }
+
+        /// <inheritdoc />
+        public IEnumerable<IUmbracoEntity> GetPagedChildEntitiesByParentId(int id, long pageIndex, int pageSize, out long totalChildren, params UmbracoObjectTypes[] entityTypes)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                return _relationRepository.GetPagedChildEntitiesByParentId(id, pageIndex, pageSize, out totalChildren, entityTypes.Select(x => x.GetGuid()).ToArray());
+            }
+        }
+
+        /// <inheritdoc />
         public IEnumerable<Tuple<IUmbracoEntity, IUmbracoEntity>> GetEntitiesFromRelations(IEnumerable<IRelation> relations)
         {
+            //TODO: Argh! N+1 
+
             foreach (var relation in relations)
             {
-                var childObjectType = ObjectTypes.GetUmbracoObjectType(relation.RelationType.ChildObjectType);
-                var parentObjectType = ObjectTypes.GetUmbracoObjectType(relation.RelationType.ParentObjectType);
+                var childObjectType = ObjectTypes.GetUmbracoObjectType(relation.ChildObjectType);
+                var parentObjectType = ObjectTypes.GetUmbracoObjectType(relation.ParentObjectType);
 
                 var child = _entityService.Get(relation.ChildId, childObjectType);
                 var parent = _entityService.Get(relation.ParentId, parentObjectType);
@@ -366,19 +308,15 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Relates two objects by their entity Ids.
-        /// </summary>
-        /// <param name="parentId">Id of the parent</param>
-        /// <param name="childId">Id of the child</param>
-        /// <param name="relationType">The type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
+        /// <inheritdoc />
         public IRelation Relate(int parentId, int childId, IRelationType relationType)
         {
             // Ensure that the RelationType has an identity before using it to relate two entities
             if (relationType.HasIdentity == false)
                 Save(relationType);
 
+            //TODO: We don't check if this exists first, it will throw some sort of data integrity exception if it already exists, is that ok?
+
             var relation = new Relation(parentId, childId, relationType);
 
             using (var scope = ScopeProvider.CreateScope())
@@ -398,25 +336,13 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationType">The type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
+        /// <inheritdoc />
         public IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, IRelationType relationType)
         {
             return Relate(parent.Id, child.Id, relationType);
         }
 
-        /// <summary>
-        /// Relates two objects by their entity Ids.
-        /// </summary>
-        /// <param name="parentId">Id of the parent</param>
-        /// <param name="childId">Id of the child</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
+        /// <inheritdoc />
         public IRelation Relate(int parentId, int childId, string relationTypeAlias)
         {
             var relationType = GetRelationTypeByAlias(relationTypeAlias);
@@ -426,13 +352,7 @@ namespace Umbraco.Core.Services.Implement
             return Relate(parentId, childId, relationType);
         }
 
-        /// <summary>
-        /// Relates two objects that are based on the <see cref="IUmbracoEntity"/> interface.
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>The created <see cref="Relation"/></returns>
+        /// <inheritdoc />
         public IRelation Relate(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias)
         {
             var relationType = GetRelationTypeByAlias(relationTypeAlias);
@@ -442,11 +362,7 @@ namespace Umbraco.Core.Services.Implement
             return Relate(parent.Id, child.Id, relationType);
         }
 
-        /// <summary>
-        /// Checks whether any relations exists for the passed in <see cref="RelationType"/>.
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to check for relations</param>
-        /// <returns>Returns <c>True</c> if any relations exists for the given <see cref="RelationType"/>, otherwise <c>False</c></returns>
+        /// <inheritdoc />
         public bool HasRelations(IRelationType relationType)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -456,11 +372,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Checks whether any relations exists for the passed in Id.
-        /// </summary>
-        /// <param name="id">Id of an object to check relations for</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Id, otherwise <c>False</c></returns>
+        /// <inheritdoc />
         public bool IsRelated(int id)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -470,12 +382,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parentId">Id of the Parent relation</param>
-        /// <param name="childId">Id of the Child relation</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Ids, otherwise <c>False</c></returns>
+        /// <inheritdoc />
         public bool AreRelated(int parentId, int childId)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -485,13 +392,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Checks whether two items are related with a given relation type alias
-        /// </summary>
-        /// <param name="parentId">Id of the Parent relation</param>
-        /// <param name="childId">Id of the Child relation</param>
-        /// <param name="relationTypeAlias">Alias of the relation type</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Ids and relation type, otherwise <c>False</c></returns>
+        /// <inheritdoc />
         public bool AreRelated(int parentId, int childId, string relationTypeAlias)
         {
             var relType = GetRelationTypeByAlias(relationTypeAlias);
@@ -502,13 +403,7 @@ namespace Umbraco.Core.Services.Implement
         }
 
 
-        /// <summary>
-        /// Checks whether two items are related with a given relation type
-        /// </summary>
-        /// <param name="parentId">Id of the Parent relation</param>
-        /// <param name="childId">Id of the Child relation</param>
-        /// <param name="relationType">Type of relation</param>
-        /// <returns>Returns <c>True</c> if any relations exists with the given Ids and relation type, otherwise <c>False</c></returns>
+        /// <inheritdoc />
         public bool AreRelated(int parentId, int childId, IRelationType relationType)
         {
             using (var scope = ScopeProvider.CreateScope(autoComplete: true))
@@ -518,34 +413,20 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
+        /// <inheritdoc />
         public bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child)
         {
             return AreRelated(parent.Id, child.Id);
         }
 
-        /// <summary>
-        /// Checks whether two items are related
-        /// </summary>
-        /// <param name="parent">Parent entity</param>
-        /// <param name="child">Child entity</param>
-        /// <param name="relationTypeAlias">Alias of the type of relation to create</param>
-        /// <returns>Returns <c>True</c> if any relations exist between the entities, otherwise <c>False</c></returns>
+        /// <inheritdoc />
         public bool AreRelated(IUmbracoEntity parent, IUmbracoEntity child, string relationTypeAlias)
         {
             return AreRelated(parent.Id, child.Id, relationTypeAlias);
         }
 
 
-        /// <summary>
-        /// Saves a <see cref="Relation"/>
-        /// </summary>
-        /// <param name="relation">Relation to save</param>
+        /// <inheritdoc />
         public void Save(IRelation relation)
         {
             using (var scope = ScopeProvider.CreateScope())
@@ -564,10 +445,25 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Saves a <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType">RelationType to Save</param>
+        public void Save(IEnumerable<IRelation> relations)
+        {
+            using (var scope = ScopeProvider.CreateScope())
+            {
+                var saveEventArgs = new SaveEventArgs<IRelation>(relations);
+                if (scope.Events.DispatchCancelable(SavingRelation, this, saveEventArgs))
+                {
+                    scope.Complete();
+                    return;
+                }
+
+                _relationRepository.Save(relations);
+                scope.Complete();
+                saveEventArgs.CanCancel = false;
+                scope.Events.Dispatch(SavedRelation, this, saveEventArgs);
+            }
+        }
+
+        /// <inheritdoc />
         public void Save(IRelationType relationType)
         {
             using (var scope = ScopeProvider.CreateScope())
@@ -586,10 +482,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Deletes a <see cref="Relation"/>
-        /// </summary>
-        /// <param name="relation">Relation to Delete</param>
+        /// <inheritdoc />
         public void Delete(IRelation relation)
         {
             using (var scope = ScopeProvider.CreateScope())
@@ -608,10 +501,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Deletes a <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType">RelationType to Delete</param>
+        /// <inheritdoc />
         public void Delete(IRelationType relationType)
         {
             using (var scope = ScopeProvider.CreateScope())
@@ -630,10 +520,7 @@ namespace Umbraco.Core.Services.Implement
             }
         }
 
-        /// <summary>
-        /// Deletes all <see cref="Relation"/> objects based on the passed in <see cref="RelationType"/>
-        /// </summary>
-        /// <param name="relationType"><see cref="RelationType"/> to Delete Relations for</param>
+        /// <inheritdoc />
         public void DeleteRelationsOfType(IRelationType relationType)
         {
             var relations = new List<IRelation>();
@@ -642,6 +529,8 @@ namespace Umbraco.Core.Services.Implement
                 var query = Query<IRelation>().Where(x => x.RelationTypeId == relationType.Id);
                 relations.AddRange(_relationRepository.Get(query).ToList());
 
+                //TODO: N+1, we should be able to do this in a single call
+
                 foreach (var relation in relations)
                     _relationRepository.Delete(relation);
 
@@ -653,6 +542,15 @@ namespace Umbraco.Core.Services.Implement
 
         #region Private Methods
 
+        private IRelationType GetRelationType(string relationTypeAlias)
+        {
+            using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                var query = Query<IRelationType>().Where(x => x.Alias == relationTypeAlias);
+                return _relationTypeRepository.Get(query).FirstOrDefault();
+            }
+        }
+
         private IEnumerable<IRelation> GetRelationsByListOfTypeIds(IEnumerable<int> relationTypeIds)
         {
             var relations = new List<IRelation>();

src/Umbraco.Core/Services/UserServiceExtensions.cs

@@ -104,5 +104,17 @@ namespace Umbraco.Core.Services
 
             return found;
         }
+
+        /// <summary>
+        /// Gets the concrete assigned permissions for the provided user and node
+        /// </summary>
+        /// <param name="userService"></param>
+        /// <param name="user"></param>
+        /// <param name="nodeId"></param>
+        internal static string[] GetAssignedPermissions(this IUserService userService, IUser user, int nodeId)
+        {
+            var permissionCollection = userService.GetPermissions(user, nodeId);
+            return permissionCollection.SelectMany(c => c.AssignedPermissions).Distinct().ToArray();
+        }
     }
 }

src/Umbraco.Core/SystemLock.cs

@@ -21,18 +21,18 @@ namespace Umbraco.Core
     // been closed, the Semaphore system object is destroyed - so in any case
     // an iisreset should clean up everything
     //
-    internal class AsyncLock
+    internal class SystemLock
     {
         private readonly SemaphoreSlim _semaphore;
         private readonly Semaphore _semaphore2;
         private readonly IDisposable _releaser;
         private readonly Task<IDisposable> _releaserTask;
 
-        public AsyncLock()
-            : this (null)
+        public SystemLock()
+            : this(null)
         { }
 
-        public AsyncLock(string name)
+        public SystemLock(string name)
         {
             // WaitOne() waits until count > 0 then decrements count
             // Release() increments count
@@ -67,35 +67,6 @@ namespace Umbraco.Core
                 : new NamedSemaphoreReleaser(_semaphore2);
         }
 
-        //NOTE: We don't use the "Async" part of this lock at all
-        //TODO: Remove this and rename this class something like SystemWideLock, then we can re-instate this logic if we ever need an Async lock again
-
-        //public Task<IDisposable> LockAsync()
-        //{
-        //    var wait = _semaphore != null
-        //        ? _semaphore.WaitAsync()
-        //        : _semaphore2.WaitOneAsync();
-
-        //    return wait.IsCompleted
-        //        ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-        //        : wait.ContinueWith((_, state) => (((AsyncLock) state).CreateReleaser()),
-        //            this, CancellationToken.None,
-        //            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        //}
-
-        //public Task<IDisposable> LockAsync(int millisecondsTimeout)
-        //{
-        //    var wait = _semaphore != null
-        //        ? _semaphore.WaitAsync(millisecondsTimeout)
-        //        : _semaphore2.WaitOneAsync(millisecondsTimeout);
-
-        //    return wait.IsCompleted
-        //        ? _releaserTask ?? Task.FromResult(CreateReleaser()) // anonymous vs named
-        //        : wait.ContinueWith((_, state) => (((AsyncLock)state).CreateReleaser()),
-        //            this, CancellationToken.None,
-        //            TaskContinuationOptions.ExecuteSynchronously, TaskScheduler.Default);
-        //}
-
         public IDisposable Lock()
         {
             if (_semaphore != null)
@@ -121,14 +92,18 @@ namespace Umbraco.Core
         private class NamedSemaphoreReleaser : CriticalFinalizerObject, IDisposable
         {
             private readonly Semaphore _semaphore;
-            private GCHandle _handle;
 
             internal NamedSemaphoreReleaser(Semaphore semaphore)
             {
                 _semaphore = semaphore;
-                _handle = GCHandle.Alloc(_semaphore);
             }
 
+            #region IDisposable Support
+
+            // This code added to correctly implement the disposable pattern.
+
+            private bool disposedValue = false; // To detect redundant calls
+
             public void Dispose()
             {
                 Dispose(true);
@@ -137,10 +112,22 @@ namespace Umbraco.Core
 
             private void Dispose(bool disposing)
             {
-                // critical
-                _handle.Free();
-                _semaphore.Release();
-                _semaphore.Dispose();
+                if (!disposedValue)
+                {
+                    try
+                    {
+                        _semaphore.Release();
+                    }
+                    finally
+                    {
+                        try
+                        {
+                            _semaphore.Dispose();
+                        }
+                        catch { }
+                    }
+                    disposedValue = true;
+                }
             }
 
             // we WANT to release the semaphore because it's a system object, ie a critical
@@ -171,6 +158,9 @@ namespace Umbraco.Core
                     // we do NOT want the finalizer to throw - never ever
                 }
             }
+
+            #endregion
+
         }
 
         private class SemaphoreSlimReleaser : IDisposable

src/Umbraco.Core/Udi.cs

@@ -233,7 +233,7 @@ namespace Umbraco.Core
                 // just pick every service connectors - just making sure that not two of them
                 // would register the same entity type, with different udi types (would not make
                 // much sense anyways).
-                var connectors = Current.TypeLoader.GetTypes<IServiceConnector>();
+                var connectors = Current.HasFactory ? (Current.TypeLoader?.GetTypes<IServiceConnector>() ?? Enumerable.Empty<Type>()) : Enumerable.Empty<Type>();
                 var result = new Dictionary<string, UdiType>();
                 foreach (var connector in connectors)
                 {
@@ -368,7 +368,7 @@ namespace Umbraco.Core
             return (udi1 == udi2) == false;
         }
 
-        private class UnknownTypeUdi : Udi
+        internal class UnknownTypeUdi : Udi
         {
             private UnknownTypeUdi()
                 : base("unknown", "umb://unknown/")

src/Umbraco.Core/Umbraco.Core.csproj

@@ -128,7 +128,12 @@
     </Compile>
     -->
     <Compile Include="AssemblyExtensions.cs" />
-    <Compile Include="AsyncLock.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_6_0\AddMainDomLock.cs" />
+    <Compile Include="Runtime\IMainDomLock.cs" />
+    <Compile Include="Runtime\MainDomSemaphoreLock.cs" />
+    <Compile Include="Runtime\SqlMainDomLock.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_6_0\MissingContentVersionsIndexes.cs" />
+    <Compile Include="SystemLock.cs" />
     <Compile Include="Attempt.cs" />
     <Compile Include="AttemptOfTResult.cs" />
     <Compile Include="AttemptOfTResultTStatus.cs" />
@@ -251,6 +256,9 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\RichTextPreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\DataTypes\DropDownFlexiblePreValueMigrator.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\MergeDateAndDateTimePropertyEditor.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_6_0\AddNewRelationTypes.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_6_0\UpdateRelationTypeTable.cs" />
+    <Compile Include="Models\Editors\UmbracoEntityReference.cs" />
     <Compile Include="Models\ContentEditing\ContentAppBadge.cs" />
     <Compile Include="Models\ContentEditing\ContentAppBadgeType.cs" />
     <Compile Include="Models\Entities\EntityExtensions.cs" />
@@ -276,10 +284,16 @@
     <Compile Include="Models\Entities\MediaEntitySlim.cs" />
     <Compile Include="Models\PagedResult.cs" />
     <Compile Include="Models\Entities\MemberEntitySlim.cs" />
+    <Compile Include="Models\MediaTypeExtensions.cs" />
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContentType.cs" />
     <Compile Include="Models\PublishedContent\IPublishedPropertyType.cs" />
     <Compile Include="PropertyEditors\ConfigurationFieldsExtensions.cs" />
+    <Compile Include="PropertyEditors\DataValueReferenceFactoryCollection.cs" />
+    <Compile Include="PropertyEditors\DataValueReferenceFactoryCollectionBuilder.cs" />
+    <Compile Include="PropertyEditors\IDataValueReference.cs" />
+    <Compile Include="PropertyEditors\IDataValueReferenceFactory.cs" />
+    <Compile Include="PropertyEditors\IDataEditorWithMediaPath.cs" />
     <Compile Include="PropertyEditors\IIgnoreUserStartNodesConfig.cs" />
     <Compile Include="PublishedContentExtensions.cs" />
     <Compile Include="Models\PublishedContent\UrlMode.cs" />
@@ -351,6 +365,7 @@
     <Compile Include="Configuration\UmbracoSettings\ITourSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IUmbracoSettingsSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\IWebRoutingSection.cs" />
+    <Compile Include="Configuration\UmbracoSettings\IKeepAliveSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\LoggingElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\NotificationsElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\RequestHandlerElement.cs" />
@@ -360,6 +375,7 @@
     <Compile Include="Configuration\UmbracoSettings\UmbracoSettingsSection.cs" />
     <Compile Include="Configuration\UmbracoSettings\UrlReplacingElement.cs" />
     <Compile Include="Configuration\UmbracoSettings\WebRoutingElement.cs" />
+    <Compile Include="Configuration\UmbracoSettings\KeepAliveElement.cs" />
     <Compile Include="Configuration\UmbracoVersion.cs" />
     <Compile Include="Constants-Applications.cs" />
     <Compile Include="Constants-Conventions.cs" />
@@ -398,7 +414,7 @@
     <Compile Include="Events\ExportedMemberEventArgs.cs" />
     <Compile Include="Events\RolesEventArgs.cs" />
     <Compile Include="Events\UserGroupWithUsers.cs" />
-    <Compile Include="IMainDom.cs" />
+    <Compile Include="Runtime\IMainDom.cs" />
     <Compile Include="IO\IFileSystems.cs" />
     <Compile Include="IO\IMediaFileSystem.cs" />
     <Compile Include="GuidUtils.cs" />
@@ -729,7 +745,7 @@
     <Compile Include="Logging\ProfilingLogger.cs" />
     <Compile Include="Logging\VoidProfiler.cs" />
     <Compile Include="Macros\MacroErrorBehaviour.cs" />
-    <Compile Include="MainDom.cs" />
+    <Compile Include="Runtime\MainDom.cs" />
     <Compile Include="Manifest\ManifestParser.cs" />
     <Compile Include="Manifest\ValueValidatorConverter.cs" />
     <Compile Include="Manifest\ManifestWatcher.cs" />
@@ -1526,7 +1542,7 @@
     <Compile Include="TypeExtensions.cs" />
     <Compile Include="Udi.cs" />
     <Compile Include="UdiDefinitionAttribute.cs" />
-    <Compile Include="UdiEntityType.cs" />
+    <Compile Include="Contants-UdiEntityType.cs" />
     <Compile Include="UdiGetterExtensions.cs" />
     <Compile Include="UdiRange.cs" />
     <Compile Include="UdiType.cs" />

src/Umbraco.Examine/MediaIndexPopulator.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// Performs the data lookups required to rebuild a media index
     /// </summary>
-    public class MediaIndexPopulator : IndexPopulator<UmbracoContentIndex>
+    public class MediaIndexPopulator : IndexPopulator<IUmbracoContentIndex>
     {
         private readonly int? _parentId;
         private readonly IMediaService _mediaService;
@@ -69,6 +69,6 @@ namespace Umbraco.Examine
                 pageIndex++;
             } while (media.Length == pageSize);
         }
-        
+
     }
 }

src/Umbraco.Examine/Umbraco.Examine.csproj

@@ -49,7 +49,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.1" />
+    <PackageReference Include="Examine" Version="1.0.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub">
       <Version>1.0.0-beta2-19324-01</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -112,4 +112,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

src/Umbraco.ModelsBuilder.Embedded/ApiVersion.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Reflection;
+using Semver;
+
+namespace Umbraco.ModelsBuilder.Embedded
+{
+    /// <summary>
+    /// Manages API version handshake between client and server.
+    /// </summary>
+    public class ApiVersion
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ApiVersion"/> class.
+        /// </summary>
+        /// <param name="executingVersion">The currently executing version.</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        internal ApiVersion(SemVersion executingVersion)
+        {
+            Version = executingVersion ?? throw new ArgumentNullException(nameof(executingVersion));
+        }
+
+        private static SemVersion CurrentAssemblyVersion
+            => SemVersion.Parse(Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion);
+
+        /// <summary>
+        /// Gets the currently executing API version.
+        /// </summary>
+        public static ApiVersion Current { get; }
+            = new ApiVersion(CurrentAssemblyVersion);
+
+        /// <summary>
+        /// Gets the executing version of the API.
+        /// </summary>
+        public SemVersion Version { get; }
+    }
+}

src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidator.cs

@@ -0,0 +1,17 @@
+using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
+{
+    /// <summary>
+    /// Used to validate the aliases for the content type when MB is enabled to ensure that
+    /// no illegal aliases are used
+    /// </summary>
+    // ReSharper disable once UnusedMember.Global - This is typed scanned
+    public class ContentTypeModelValidator : ContentTypeModelValidatorBase<DocumentTypeSave, PropertyTypeBasic>
+    {
+        public ContentTypeModelValidator(IModelsBuilderConfig config) : base(config)
+        {
+        }
+    }
+}

src/Umbraco.ModelsBuilder.Embedded/BackOffice/ContentTypeModelValidatorBase.cs

@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
+using Umbraco.Web.Editors;
+using Umbraco.Web.Models.ContentEditing;
+
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
+{
+    public abstract class ContentTypeModelValidatorBase<TModel, TProperty> : EditorValidator<TModel>
+        where TModel : ContentTypeSave<TProperty>
+        where TProperty : PropertyTypeBasic
+    {
+        private readonly IModelsBuilderConfig _config;
+
+        public ContentTypeModelValidatorBase(IModelsBuilderConfig config)
+        {
+            _config = config;
+        }
+
+        protected override IEnumerable<ValidationResult> Validate(TModel model)
+        {
+            //don't do anything if we're not enabled
+            if (!_config.Enable) yield break;
+
+            var properties = model.Groups.SelectMany(x => x.Properties)
+                .Where(x => x.Inherited == false)
+                .ToArray();
+
+            foreach (var prop in properties)
+            {
+                var propertyGroup = model.Groups.Single(x => x.Properties.Contains(prop));
+
+                if (model.Alias.ToLowerInvariant() == prop.Alias.ToLowerInvariant())
+                    yield return new ValidationResult(string.Format("With Models Builder enabled, you can't have a property with a the alias \"{0}\" when the content type alias is also \"{0}\".", prop.Alias), new[]
+                    {
+                        $"Groups[{model.Groups.IndexOf(propertyGroup)}].Properties[{propertyGroup.Properties.IndexOf(prop)}].Alias"
+                    });
+
+                //we need to return the field name with an index so it's wired up correctly
+                var groupIndex = model.Groups.IndexOf(propertyGroup);
+                var propertyIndex = propertyGroup.Properties.IndexOf(prop);
+
+                var validationResult = ValidateProperty(prop, groupIndex, propertyIndex);
+                if (validationResult != null)
+                    yield return validationResult;
+            }
+        }
+
+        private ValidationResult ValidateProperty(PropertyTypeBasic property, int groupIndex, int propertyIndex)
+        {
+            //don't let them match any properties or methods in IPublishedContent
+            //TODO: There are probably more!
+            var reservedProperties = typeof(IPublishedContent).GetProperties().Select(x => x.Name).ToArray();
+            var reservedMethods = typeof(IPublishedContent).GetMethods().Select(x => x.Name).ToArray();
+
+            var alias = property.Alias;
+
+            if (reservedProperties.InvariantContains(alias) || reservedMethods.InvariantContains(alias))
+                return new ValidationResult(
+                    $"The alias {alias} is a reserved term and cannot be used", new[]
+                    {
+                        $"Groups[{groupIndex}].Properties[{propertyIndex}].Alias"
+                    });
+
+            return null;
+        }
+    }
+}

src/Umbraco.ModelsBuilder.Embedded/BackOffice/DashboardReport.cs

@@ -0,0 +1,61 @@
+using System.Text;
+using Umbraco.ModelsBuilder.Embedded.Configuration;
+
+namespace Umbraco.ModelsBuilder.Embedded.BackOffice
+{
+    internal class DashboardReport
+    {
+        private readonly IModelsBuilderConfig _config;
+        private readonly OutOfDateModelsStatus _outOfDateModels;
+        private readonly ModelsGenerationError _mbErrors;
+
+        public DashboardReport(IModelsBuilderConfig config, OutOfDateModelsStatus outOfDateModels, ModelsGenerationError mbErrors)
+        {
+            _config = config;
+            _outOfDateModels = outOfDateModels;
+            _mbErrors = mbErrors;
+        }
+
+        public bool CanGenerate() => _config.ModelsMode.SupportsExplicitGeneration();
+
+        public bool AreModelsOutOfDate() => _outOfDateModels.IsOutOfDate;
+
+        public string LastError() => _mbErrors.GetLastError();
+
+        public string Text()
+        {
+            if (!_config.Enable)
+                return "Version: " + ApiVersion.Current.Version + "<br />&nbsp;<br />ModelsBuilder is disabled<br />(the .Enable key is missing, or its value is not 'true').";
+
+            var sb = new StringBuilder();
+
+            sb.Append("Version: ");
+            sb.Append(ApiVersion.Current.Version);
+            sb.Append("<br />&nbsp;<br />");
+
+            sb.Append("ModelsBuilder is enabled, with the following configuration:");
+
+            sb.Append("<ul>");
+
+            sb.Append("<li>The <strong>models factory</strong> is ");
+            sb.Append(_config.EnableFactory || _config.ModelsMode == ModelsMode.PureLive
+                ? "enabled"
+                : "not enabled. Umbraco will <em>not</em> use models");
+            sb.Append(".</li>");
+
+            sb.Append(_config.ModelsMode != ModelsMode.Nothing
+                ? $"<li><strong>{_config.ModelsMode} models</strong> are enabled.</li>"
+                : "<li>No models mode is specified: models will <em>not</em> be generated.</li>");
+
+            sb.Append($"<li>Models namespace is {_config.ModelsNamespace}.</li>");
+
+            sb.Append("<li>Tracking of <strong>out-of-date models</strong> is ");
+            sb.Append(_config.FlagOutOfDateModels ? "enabled" : "not enabled");
+            sb.Append(".</li>");
+
+            sb.Append("</ul>");
+
+            return sb.ToString();
+        }
+    }
+}